diff -Nru pcl-1.7.2/debian/changelog pcl-1.7.2/debian/changelog --- pcl-1.7.2/debian/changelog 2015-02-25 22:12:56.000000000 +0000 +++ pcl-1.7.2/debian/changelog 2015-06-17 14:59:01.000000000 +0000 @@ -1,3 +1,12 @@ +pcl (1.7.2-8) trusty; urgency=medium + + * Appy ggc-min-expand+disable-WITH_DOCS.diff (Closes: #780582), Thanks Dejan + Latinovic. + * Update architectures on libopenni-dev dependency + * Upload to deb-rob PPA. + + -- Jochen Sprickerhof Wed, 17 Jun 2015 16:58:45 +0200 + pcl (1.7.2-7) unstable; urgency=medium * Added patch to solve sometimes FTBFS. Patch proposed by diff -Nru pcl-1.7.2/debian/control pcl-1.7.2/debian/control --- pcl-1.7.2/debian/control 2014-12-01 22:34:46.000000000 +0000 +++ pcl-1.7.2/debian/control 2015-06-09 16:40:44.000000000 +0000 @@ -7,8 +7,6 @@ Priority: extra Build-Depends: debhelper (>= 9), dh-exec (>=0.3), cmake, - doxygen, - doxygen-latex, python-sphinx, libboost-system-dev, libboost-filesystem-dev, @@ -19,13 +17,15 @@ libflann-dev, libvtk5-dev, libqhull-dev, - libopenni-dev [i386 amd64], + libopenni-dev [amd64 arm64 armel armhf i386 powerpc ppc64el], libqt4-opengl-dev, libusb-1.0-0-dev, freeglut3-dev, libxmu-dev, libxi-dev, libvtk5-qt4-dev +Build-Depends-Indep: doxygen, + doxygen-latex 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 @@ -39,7 +39,7 @@ libflann-dev, libvtk5-dev, libqhull-dev, - libopenni-dev [i386 amd64], + libopenni-dev [amd64 arm64 armel armhf i386 powerpc ppc64el], libpcl1.7 (= ${binary:Version}), ${misc:Depends} Suggests: libpcl-doc diff -Nru pcl-1.7.2/debian/rules pcl-1.7.2/debian/rules --- pcl-1.7.2/debian/rules 2014-12-01 15:32:27.000000000 +0000 +++ pcl-1.7.2/debian/rules 2015-06-09 16:40:44.000000000 +0000 @@ -11,6 +11,13 @@ CFLAGS+=$(CPPFLAGS) CXXFLAGS+=$(CPPFLAGS) +DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH) +ifneq (,$(filter $(DEB_BUILD_ARCH),mips mipsel)) + CXXFLAGS+=--param ggc-min-expand=20 +endif + +BUILD_DOC = $(if $(shell dh_listpackages | grep libpcl-doc),-DWITH_DOCS=ON) + # Multiarch. DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) @@ -32,7 +39,7 @@ -DBUILD_tools=ON -DBUILD_tracking=ON -DBUILD_visualization=ON \ -DBUILD_apps_cloud_composer=OFF -DBUILD_apps_modeler=ON \ -DBUILD_apps_point_cloud_editor=ON -DBUILD_apps_in_hand_scanner=ON \ - -DWITH_DOCS=ON + $(BUILD_DOC) override_dh_install: mkdir -p debian/tmp/usr/share/doc/libpcl1.7-dbg && cp debian/README.Debug debian/tmp/usr/share/doc/libpcl1.7-dbg/