[pcl] 01/01: Merged from the last version of master

[Leopold Palomo-Avellaneda]

This is an automated email from the git hooks/post-receive script.

lepalom-guest pushed a commit to branch debian-robotics
in repository pcl.

commit bf3868f896c5a7d18fd4ae7b1d4ca86c2f985144
Merge: 969dcf1 cbf8585
Author: Leopold Palomo-Avellaneda <leo at alaxarxa.net>
Date:   Mon Dec 1 17:39:20 2014 +0100

    Merged from the last version of master

 debian/changelog                                   |  46 +++++++-
 debian/control                                     |  39 ++++---
 debian/libpcl-dev.install                          |   3 +-
 ...es-for-OpenNI-and-OpenNI2-were-wrong-in-c.patch |  82 ++++++++++++++
 ...penni-dev-and-openni2-dev-in-PCLConfig.cm.patch |  53 +++++++++
 .../patches/0003-Always-build-libpcl_apps.so.patch | 118 +++++++++++++++++++++
 .../0004-Correct-PCL_ROOT-in-PCLConfig.cmake.patch |  27 +++++
 debian/patches/series                              |   4 +
 debian/rules                                       |   2 +-
 9 files changed, 351 insertions(+), 23 deletions(-)

diff --cc debian/changelog
index c9f7be6,e77ba10..626ee7c
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,6 -1,44 +1,50 @@@
- pcl (1.7.2-1.drp70+1) wheezy-robotics; urgency=low
++pcl (1.7.2-6.drp70+1) wheezy-robotics; urgency=medium
++
 +  * Rebuild for drp.
 +
++ -- Leopold Palomo-Avellaneda <leo at alaxarxa.net>  Mon, 01 Dec 2014 16:41:22 +0100
++
+ pcl (1.7.2-6) unstable; urgency=medium
+ 
+   * Remove --parallel from dh to fix build on i386 buildd.
+ 
+  -- Jochen Sprickerhof <git at jochen.sprickerhof.de>  Mon, 01 Dec 2014 10:46:10 +0100
+ 
+ pcl (1.7.2-5) unstable; urgency=medium
+ 
+   [Leopold Palomo-Avellaneda]
+   * Reverted Multi-arch field for libpcl-apps1.7.
+ 
+  -- Leopold Palomo-Avellaneda <leo at alaxarxa.net>  Thu, 27 Nov 2014 18:14:40 +0100
+ 
+ pcl (1.7.2-4) unstable; urgency=medium
+ 
+   [Leopold Palomo-Avellaneda]
+   * Added missing Multi-arch field for libpcl-apps1.7.
+   * Removing Multi-Arch of libpcl-dev. Closes: #770503
+ 
+  -- Leopold Palomo-Avellaneda <leo at alaxarxa.net>  Mon, 24 Nov 2014 12:27:06 +0100
+ 
+ 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 at alaxarxa.net>  Tue, 11 Nov 2014 15:34:43 +0100
+ 
+ pcl (1.7.2-2) unstable; urgency=medium
+ 
+   [Leopold Palomo-Avellaneda]
+   * Change install place for cmake files. Closes: #766685
+   * Added dh-exec (>=0.3) dependecy.
+ 
+  -- Leopold Palomo-Avellaneda <leo at alaxarxa.net>  Sun, 26 Oct 2014 09:46:18 +0100
+ 
+ pcl (1.7.2-1) unstable; urgency=medium
+ 
    [Thomas Moulard]
    * Initial debianization.
  
diff --cc debian/control
index db6a981,dc6aa65..5f57e71
--- a/debian/control
+++ b/debian/control
@@@ -9,24 -9,23 +9,24 @@@ Build-Depends: debhelper (>= 9), dh-exe
                 cmake,
                 doxygen,
                 doxygen-latex,
-                python-sphinx,
-                libboost-system-dev,
-                libboost-filesystem-dev,
-                libboost-thread-dev,
-                libboost-date-time-dev,
-                libboost-iostreams-dev,
 +               libboost-chrono-dev,
-                libeigen3-dev,
-                libflann-dev,
-                libvtk5-dev,
-                libqhull-dev,
-                libopenni-dev,
-                libqt4-opengl-dev,
-                libusb-1.0-0-dev,
-                freeglut3-dev,
-                libxmu-dev,
-                libxi-dev,
-                libvtk5-qt4-dev
+ 	       python-sphinx,
+ 	       libboost-system-dev,
+ 	       libboost-filesystem-dev,
+ 	       libboost-thread-dev, 
+ 	       libboost-date-time-dev,
+ 	       libboost-iostreams-dev,
+ 	       libeigen3-dev,
+ 	       libflann-dev,
+ 	       libvtk5-dev,
+ 	       libqhull-dev,
+ 	       libopenni-dev [i386 amd64],
+ 	       libqt4-opengl-dev,
+ 	       libusb-1.0-0-dev,
+ 	       freeglut3-dev, 
+ 	       libxmu-dev,
+ 	       libxi-dev,
+ 	       libvtk5-qt4-dev
  Standards-Version: 3.9.6
  Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/pcl.git
  Vcs-Git: git://anonscm.debian.org/debian-science/packages/pcl.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pcl.git