Please find the debdiff attached. Cheers Jochen
diff -Nru pcl-1.7.2/debian/changelog pcl-1.7.2/debian/changelog
--- pcl-1.7.2/debian/changelog 2014-10-26 09:46:32.000000000 +0100
+++ pcl-1.7.2/debian/changelog 2014-11-18 14:41:54.000000000 +0100
@@ -1,3 +1,13 @@
+pcl (1.7.2-3) unstable; urgency=medium
+
+ [ Jochen Sprickerhof ]
+ * Change openni-dev to libopenni, Closes: #768953
+ * Build without OpenNI when it's not available. It opens
+ the number of architectures where it could be built. Closes: #769883
+ * Fix PCLConfig.cmake (patch taken from Fedora). Closes: #770029
+
+ -- Leopold Palomo-Avellaneda <leo@alaxarxa.net> Tue, 11 Nov 2014 15:34:43 +0100
+
pcl (1.7.2-2) unstable; urgency=medium
[Leopold Palomo-Avellaneda]
diff -Nru pcl-1.7.2/debian/control pcl-1.7.2/debian/control
--- pcl-1.7.2/debian/control 2014-10-25 11:39:25.000000000 +0200
+++ pcl-1.7.2/debian/control 2014-11-11 15:29:20.000000000 +0100
@@ -19,7 +19,7 @@
libflann-dev,
libvtk5-dev,
libqhull-dev,
- libopenni-dev,
+ libopenni-dev [i386 amd64],
libqt4-opengl-dev,
libusb-1.0-0-dev,
freeglut3-dev,
@@ -39,7 +39,7 @@
libflann-dev,
libvtk5-dev,
libqhull-dev,
- libopenni-dev,
+ libopenni-dev [i386 amd64],
libpcl1.7 (= ${binary:Version}),
${misc:Depends}
Suggests: libpcl-doc
diff -Nru pcl-1.7.2/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch pcl-1.7.2/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch
--- pcl-1.7.2/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch 1970-01-01 01:00:00.000000000 +0100
+++ pcl-1.7.2/debian/patches/0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch 2014-11-11 15:29:20.000000000 +0100
@@ -0,0 +1,82 @@
+From 881e4cf919a86ebc58ab80b51ac5d154f3b8f82e Mon Sep 17 00:00:00 2001
+From: Emmanuel Durand <emmanueldurand@gmail.com>
+Date: Thu, 25 Sep 2014 16:11:47 -0400
+Subject: [PATCH 1/3] Package names for OpenNI and OpenNI2 were wrong in cmake
+ modules and in output pkgconfig file
+
+---
+ cmake/Modules/FindOpenNI.cmake | 4 ++--
+ cmake/Modules/FindOpenNI2.cmake | 4 ++--
+ io/CMakeLists.txt | 4 ++--
+ visualization/CMakeLists.txt | 4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/cmake/Modules/FindOpenNI.cmake b/cmake/Modules/FindOpenNI.cmake
+index cb537be..9f772a4 100644
+--- a/cmake/Modules/FindOpenNI.cmake
++++ b/cmake/Modules/FindOpenNI.cmake
+@@ -35,9 +35,9 @@ if(NOT WIN32)
+ endif(NOT WIN32)
+
+ if(${CMAKE_VERSION} VERSION_LESS 2.8.2)
+- pkg_check_modules(PC_OPENNI openni-dev)
++ pkg_check_modules(PC_OPENNI libopenni)
+ else()
+- pkg_check_modules(PC_OPENNI QUIET openni-dev)
++ pkg_check_modules(PC_OPENNI QUIET libopenni)
+ endif()
+
+ set(OPENNI_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER})
+diff --git a/cmake/Modules/FindOpenNI2.cmake b/cmake/Modules/FindOpenNI2.cmake
+index 036e4e0..713099a 100644
+--- a/cmake/Modules/FindOpenNI2.cmake
++++ b/cmake/Modules/FindOpenNI2.cmake
+@@ -35,9 +35,9 @@ if(NOT WIN32)
+ endif(NOT WIN32)
+
+ if(${CMAKE_VERSION} VERSION_LESS 2.8.2)
+- pkg_check_modules(PC_OPENNI2 openni2-dev)
++ pkg_check_modules(PC_OPENNI2 libopenni2)
+ else()
+- pkg_check_modules(PC_OPENNI2 QUIET openni2-dev)
++ pkg_check_modules(PC_OPENNI2 QUIET libopenni2)
+ endif()
+
+ set(OPENNI2_DEFINITIONS ${PC_OPENNI_CFLAGS_OTHER})
+diff --git a/io/CMakeLists.txt b/io/CMakeLists.txt
+index 347f658..6106349 100644
+--- a/io/CMakeLists.txt
++++ b/io/CMakeLists.txt
+@@ -329,10 +329,10 @@ if(build)
+ set(EXT_DEPS eigen3)
+
+ if(OPENNI_FOUND)
+- list(APPEND EXT_DEPS openni-dev)
++ list(APPEND EXT_DEPS libopenni)
+ endif(OPENNI_FOUND)
+ if(OPENNI2_FOUND)
+- list(APPEND EXT_DEPS openni2-dev)
++ list(APPEND EXT_DEPS libopenni2)
+ endif(OPENNI2_FOUND)
+
+ PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}"
+diff --git a/visualization/CMakeLists.txt b/visualization/CMakeLists.txt
+index d7becc5..746a693 100644
+--- a/visualization/CMakeLists.txt
++++ b/visualization/CMakeLists.txt
+@@ -154,10 +154,10 @@ if(build)
+
+ set(EXT_DEPS "")
+ if(OPENNI_FOUND)
+- list(APPEND EXT_DEPS openni-dev)
++ list(APPEND EXT_DEPS libopenni)
+ endif(OPENNI_FOUND)
+ if(OPENNI2_FOUND)
+- list(APPEND EXT_DEPS openni2-dev)
++ list(APPEND EXT_DEPS libopenni2)
+ endif(OPENNI2_FOUND)
+ PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}"
+ "${SUBSYS_DEPS}" "${EXT_DEPS}" "" "" "")
+--
+2.1.3
+
diff -Nru pcl-1.7.2/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch pcl-1.7.2/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch
--- pcl-1.7.2/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch 1970-01-01 01:00:00.000000000 +0100
+++ pcl-1.7.2/debian/patches/0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch 2014-11-11 15:29:20.000000000 +0100
@@ -0,0 +1,53 @@
+From 2f94cf21bead8bbb84211d3a182fd30d390df157 Mon Sep 17 00:00:00 2001
+From: Emmanuel Durand <emmanueldurand@gmail.com>
+Date: Fri, 26 Sep 2014 08:59:46 -0400
+Subject: [PATCH 2/3] Corrected openni-dev and openni2-dev in
+ PCLConfig.cmake.in
+
+---
+ PCLConfig.cmake.in | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
+index 65ea688..5f5b07f 100644
+--- a/PCLConfig.cmake.in
++++ b/PCLConfig.cmake.in
+@@ -174,7 +174,7 @@ macro(find_qhull)
+ endif(QHULL_FOUND)
+ endmacro(find_qhull)
+
+-#remove this as soon as openni-dev is shipped with FindOpenni.cmake
++#remove this as soon as libopenni is shipped with FindOpenni.cmake
+ macro(find_openni)
+ if(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON"))
+ set(OPENNI_INCLUDE_DIRS_HINT "@OPENNI_INCLUDE_DIRS@")
+@@ -182,7 +182,7 @@ macro(find_openni)
+ endif(NOT OPENNI_ROOT AND ("@HAVE_OPENNI@" STREQUAL "ON"))
+
+ if(PKG_CONFIG_FOUND)
+- pkg_check_modules(PC_OPENNI openni-dev)
++ pkg_check_modules(PC_OPENNI libopenni)
+ endif(PKG_CONFIG_FOUND)
+ find_path(OPENNI_INCLUDE_DIRS XnStatus.h
+ HINTS ${PC_OPENNI_INCLUDEDIR} ${PC_OPENNI_INCLUDE_DIRS}
+@@ -210,7 +210,7 @@ macro(find_openni)
+ endif(OPENNI_FOUND)
+ endmacro(find_openni)
+
+-#remove this as soon as openni2-dev is shipped with FindOpenni2.cmake
++#remove this as soon as libopenni2 is shipped with FindOpenni2.cmake
+ macro(find_openni2)
+ if(NOT OPENNI2_ROOT AND ("ON" STREQUAL "ON"))
+ get_filename_component(OPENNI2_LIBRARY_HINT "OPENNI_LIBRARY-NOTFOUND" PATH)
+@@ -222,7 +222,7 @@ macro(find_openni2)
+ endif(WIN32 AND CMAKE_SIZEOF_VOID_P EQUAL 8)
+
+ if(PKG_CONFIG_FOUND)
+- pkg_check_modules(PC_OPENNI2 openni2-dev)
++ pkg_check_modules(PC_OPENNI2 libopenni2)
+ endif(PKG_CONFIG_FOUND)
+
+ find_path(OPENNI2_INCLUDE_DIRS OpenNI.h
+--
+2.1.3
+
diff -Nru pcl-1.7.2/debian/patches/0003-Always-build-libpcl_apps.so.patch pcl-1.7.2/debian/patches/0003-Always-build-libpcl_apps.so.patch
--- pcl-1.7.2/debian/patches/0003-Always-build-libpcl_apps.so.patch 1970-01-01 01:00:00.000000000 +0100
+++ pcl-1.7.2/debian/patches/0003-Always-build-libpcl_apps.so.patch 2014-11-11 15:29:20.000000000 +0100
@@ -0,0 +1,118 @@
+From 6247f993fde67cb79bc6e9a4556de07ce0d031c6 Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Tue, 11 Nov 2014 11:38:43 +0100
+Subject: [PATCH 3/3] Always build libpcl_apps.so
+
+- Remove superfluous checks for VTK and OpenNI in apps
+---
+ apps/CMakeLists.txt | 61 +++++++++++++++++++----------------------------------
+ 1 file changed, 22 insertions(+), 39 deletions(-)
+
+diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt
+index 93b11e9..4f7e658 100644
+--- a/apps/CMakeLists.txt
++++ b/apps/CMakeLists.txt
+@@ -2,25 +2,6 @@ set(SUBSYS_NAME apps)
+ set(SUBSYS_DESC "Application examples/samples that show how PCL works")
+ set(SUBSYS_DEPS common geometry io filters sample_consensus segmentation visualization kdtree features surface octree registration keypoints tracking search recognition)
+
+-# Find VTK
+-if(NOT VTK_FOUND)
+- set(DEFAULT FALSE)
+- set(REASON "VTK was not found.")
+-else(NOT VTK_FOUND)
+- set(DEFAULT TRUE)
+- set(REASON)
+- include("${VTK_USE_FILE}")
+-endif(NOT VTK_FOUND)
+-
+-# OpenNI found?
+-if(NOT OPENNI_FOUND)
+- set(DEFAULT FALSE)
+- set(REASON "OpenNI was not found.")
+-else(NOT OPENNI_FOUND)
+- set(DEFAULT TRUE)
+- set(REASON)
+-endif(NOT OPENNI_FOUND)
+-
+ set(DEFAULT FALSE)
+ PCL_SUBSYS_OPTION(build "${SUBSYS_NAME}" "${SUBSYS_DESC}" ${DEFAULT} "${REASON}")
+ PCL_SUBSYS_DEPEND(build "${SUBSYS_NAME}" DEPS ${SUBSYS_DEPS} OPT_DEPS openni vtk)
+@@ -47,6 +28,12 @@ if(build)
+ endif(LIBUSB_1_FOUND)
+
+ if (VTK_FOUND)
++
++ include("${VTK_USE_FILE}")
++
++ set(incs "include/pcl/${SUBSYS_NAME}/render_views_tesselated_sphere.h")
++ set(srcs "src/render_views_tesselated_sphere.cpp")
++
+ PCL_ADD_EXECUTABLE(pcl_ppf_object_recognition "${SUBSYS_NAME}" src/ppf_object_recognition.cpp)
+ target_link_libraries(pcl_ppf_object_recognition pcl_common pcl_io pcl_filters pcl_features pcl_registration pcl_visualization pcl_sample_consensus pcl_segmentation)
+
+@@ -162,11 +149,6 @@ if(build)
+
+ endif ()
+
+- set(incs
+- include/pcl/${SUBSYS_NAME}/render_views_tesselated_sphere.h
+- include/pcl/${SUBSYS_NAME}/timer.h)
+- set(srcs src/render_views_tesselated_sphere.cpp)
+-
+ if (QHULL_FOUND)
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_openni_3d_convex_hull "${SUBSYS_NAME}" src/openni_3d_convex_hull.cpp)
+ target_link_libraries(pcl_openni_3d_convex_hull pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_features pcl_surface)
+@@ -177,10 +159,6 @@ if(build)
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_openni_tracking "${SUBSYS_NAME}" src/openni_tracking.cpp)
+ target_link_libraries(pcl_openni_tracking pcl_common pcl_io pcl_surface pcl_visualization pcl_filters pcl_features pcl_segmentation pcl_tracking pcl_search)
+
+- set(incs "include/pcl/${SUBSYS_NAME}/dominant_plane_segmentation.h" ${incs})
+- set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/dominant_plane_segmentation.hpp")
+- set(srcs src/dominant_plane_segmentation.cpp ${srcs})
+-
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_openni_planar_convex_hull "${SUBSYS_NAME}" src/openni_planar_convex_hull.cpp)
+ target_link_libraries(pcl_openni_planar_convex_hull pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_surface)
+
+@@ -189,17 +167,6 @@ if(build)
+
+ endif() # QHULL_FOUND
+
+- # Install include files
+- PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
+- PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
+-
+- set(LIB_NAME "pcl_${SUBSYS_NAME}")
+- PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${impl_incs} ${incs})
+- target_link_libraries("${LIB_NAME}" pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_surface pcl_features pcl_sample_consensus pcl_search)
+-
+- PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "" "" "" "" "")
+-
+-
+ PCL_ADD_EXECUTABLE_OPT_BUNDLE(pcl_ni_agast "${SUBSYS_NAME}" src/ni_agast.cpp)
+ target_link_libraries(pcl_ni_agast pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_sample_consensus pcl_features pcl_keypoints pcl_surface pcl_search)
+
+@@ -231,4 +198,20 @@ if(build)
+ add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/${subdir}")
+ endforeach(subdir)
+
++ set(incs
++ "include/pcl/${SUBSYS_NAME}/dominant_plane_segmentation.h"
++ "include/pcl/${SUBSYS_NAME}/timer.h"
++ ${incs}
++ )
++ set(impl_incs "include/pcl/${SUBSYS_NAME}/impl/dominant_plane_segmentation.hpp")
++ set(srcs "src/dominant_plane_segmentation.cpp" ${srcs})
++
++ set(LIB_NAME "pcl_${SUBSYS_NAME}")
++ PCL_ADD_LIBRARY("${LIB_NAME}" "${SUBSYS_NAME}" ${srcs} ${impl_incs} ${incs})
++ target_link_libraries("${LIB_NAME}" pcl_common pcl_io pcl_filters pcl_visualization pcl_segmentation pcl_surface pcl_features pcl_sample_consensus pcl_search)
++ PCL_MAKE_PKGCONFIG("${LIB_NAME}" "${SUBSYS_NAME}" "${SUBSYS_DESC}" "" "" "" "" "")
++ # Install include files
++ PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}" ${incs})
++ PCL_ADD_INCLUDES("${SUBSYS_NAME}" "${SUBSYS_NAME}/impl" ${impl_incs})
++
+ endif(build)
+--
+2.1.3
+
diff -Nru pcl-1.7.2/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch pcl-1.7.2/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
--- pcl-1.7.2/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch 1970-01-01 01:00:00.000000000 +0100
+++ pcl-1.7.2/debian/patches/0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch 2014-11-13 12:17:48.000000000 +0100
@@ -0,0 +1,27 @@
+From 66f767e9928f068a5a63308a7cfed52495ae420e Mon Sep 17 00:00:00 2001
+From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
+Date: Thu, 13 Nov 2014 10:50:53 +0100
+Subject: [PATCH 4/4] Correct PCL_ROOT in PCLConfig.cmake
+
+Taken from http://pkgs.fedoraproject.org/cgit/pcl.git/tree/pcl-1.7.1-fedora.patch
+---
+ PCLConfig.cmake.in | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/PCLConfig.cmake.in b/PCLConfig.cmake.in
+index 5f5b07f..0dee8fb 100644
+--- a/PCLConfig.cmake.in
++++ b/PCLConfig.cmake.in
+@@ -531,8 +531,7 @@ if(WIN32 AND NOT MINGW)
+ get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+ else(WIN32 AND NOT MINGW)
+ # PCLConfig.cmake is installed to PCL_ROOT/share/pcl-x.y
+- get_filename_component(PCL_ROOT "${PCL_DIR}" PATH)
+- get_filename_component(PCL_ROOT "${PCL_ROOT}" PATH)
++ set(PCL_ROOT "@CMAKE_INSTALL_PREFIX@")
+ endif(WIN32 AND NOT MINGW)
+
+ # check whether PCLConfig.cmake is found into a PCL installation or in a build tree
+--
+2.1.3
+
diff -Nru pcl-1.7.2/debian/patches/series pcl-1.7.2/debian/patches/series
--- pcl-1.7.2/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ pcl-1.7.2/debian/patches/series 2014-11-13 12:17:48.000000000 +0100
@@ -0,0 +1,4 @@
+0001-Package-names-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch
+0002-Corrected-openni-dev-and-openni2-dev-in-PCLConfig.cm.patch
+0003-Always-build-libpcl_apps.so.patch
+0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch
Attachment:
signature.asc
Description: Digital signature