From a8b5527054bd2aa68f30b9b6d233e3ee8f853978 Mon Sep 17 00:00:00 2001
From: "Isaac I.Y. Saito" <130s@users.noreply.github.com>
Date: Wed, 10 Jan 2018 13:23:10 -0800
Subject: [PATCH] [IKL] Merge openni_{camera, launch} into a single repo.
 (#16710)

* [IKL] Merge openni_{camera, launch} into a single repo.
Following the decision in https://github.com/ros-drivers/openni_launch/issues/30

* [IKL] openni_camera version adjust to release repo.

* [openni_camera][lunar] Disable source test.
As https://github.com/ros-drivers/openni_camera/pull/56#issuecomment-340273982, test might always fail on GitHub for UNSTABLE, which makes the maintenance harder.
---
 indigo/distribution.yaml  | 20 ++++----------------
 kinetic/distribution.yaml | 20 ++++----------------
 lunar/distribution.yaml   | 22 ++++------------------
 3 files changed, 12 insertions(+), 50 deletions(-)

diff --git a/indigo/distribution.yaml b/indigo/distribution.yaml
index 2786f2069ee07..147f9231d3d2f 100644
--- a/indigo/distribution.yaml
+++ b/indigo/distribution.yaml
@@ -8639,30 +8639,18 @@ repositories:
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     release:
+      packages:
+      - openni_camera
+      - openni_launch
       tags:
         release: release/indigo/{package}/{version}
       url: https://github.com/ros-gbp/openni_camera-release.git
-      version: 1.9.5-0
+      version: 1.10.0-0
     source:
       type: git
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     status: maintained
-  openni_launch:
-    doc:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    release:
-      tags:
-        release: release/indigo/{package}/{version}
-      url: https://github.com/ros-gbp/openni_launch-release.git
-      version: 1.9.8-0
-    source:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    status: maintained
   openrave_planning:
     release:
       packages:
diff --git a/kinetic/distribution.yaml b/kinetic/distribution.yaml
index 0e994e060e1f5..52ebde20e0e46 100644
--- a/kinetic/distribution.yaml
+++ b/kinetic/distribution.yaml
@@ -5939,30 +5939,18 @@ repositories:
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     release:
+      packages:
+      - openni_camera
+      - openni_launch
       tags:
         release: release/kinetic/{package}/{version}
       url: https://github.com/ros-gbp/openni_camera-release.git
-      version: 1.9.5-0
+      version: 1.10.0-0
     source:
       type: git
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     status: maintained
-  openni_launch:
-    doc:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    release:
-      tags:
-        release: release/kinetic/{package}/{version}
-      url: https://github.com/ros-gbp/openni_launch-release.git
-      version: 1.9.8-0
-    source:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    status: maintained
   openrtm_aist:
     doc:
       type: git
diff --git a/lunar/distribution.yaml b/lunar/distribution.yaml
index 40966a6298c59..91ddaefce5f6f 100644
--- a/lunar/distribution.yaml
+++ b/lunar/distribution.yaml
@@ -2138,32 +2138,18 @@ repositories:
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     release:
+      packages:
+      - openni_camera
+      - openni_launch
       tags:
         release: release/lunar/{package}/{version}
       url: https://github.com/ros-gbp/openni_camera-release.git
-      version: 1.9.5-0
+      version: 1.10.0-0
     source:
-      test_pull_requests: true
       type: git
       url: https://github.com/ros-drivers/openni_camera.git
       version: indigo-devel
     status: maintained
-  openni_launch:
-    doc:
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    release:
-      tags:
-        release: release/lunar/{package}/{version}
-      url: https://github.com/ros-gbp/openni_launch-release.git
-      version: 1.9.8-0
-    source:
-      test_pull_requests: true
-      type: git
-      url: https://github.com/ros-drivers/openni_launch.git
-      version: indigo-devel
-    status: maintained
   openslam_gmapping:
     release:
       tags: