[libcmis] 25/40: Imported Debian patch 0.5.0-4

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libcmis.

commit 91376542d27ae3f037d8ca8a7a8a75f5ca54cb99
Author: Rene Engelhard <rene at debian.org>
Date:   Fri Sep 18 13:24:01 2015 +0200

    Imported Debian patch 0.5.0-4
---
 debian/changelog                        | 13 +++++++++++++
 debian/control                          |  4 ++--
 debian/libcmis-0.5-5.postinst.debhelper |  5 -----
 debian/libcmis-0.5-5.postrm.debhelper   |  5 -----
 debian/libcmis-0.5-5.substvars          |  2 --
 debian/rules                            | 15 ++++++++-------
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 64b89aa..440561d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+libcmis (0.5.0-4) unstable; urgency=medium
+
+  * add missed build-dependency on docbook-xml; use docbook2x(-man)
+    instead of docbook-to-man (closes: #798632)
+  * merge package cleanup patch (closes: #798633)
+    - Bump the standards version.
+    - Remove cruft in the debian directory.
+    - Enable parallel builds.
+    - Stop building with -O0 on armhf.
+    - Really use dpkg-buildflags. 
+
+ -- Rene Engelhard <rene at debian.org>  Fri, 18 Sep 2015 13:24:01 +0200
+
 libcmis (0.5.0-3) unstable; urgency=medium
 
   * libstdc++6 transition: rename libcmis-0.5-5 to libcmis-0.5-5v5.
diff --git a/debian/control b/debian/control
index 54524b1..58f2927 100644
--- a/debian/control
+++ b/debian/control
@@ -1,8 +1,8 @@
 Source: libcmis
 Priority: optional
 Maintainer: Rene Engelhard <rene at debian.org>
-BuIld-Depends: debhelper (>= 8.0.0), autotools-dev, libxml2-dev, libboost-dev, libboost-program-options-dev, libcurl4-gnutls-dev, libcppunit-dev (= 1.13.2-2.1), docbook-to-man, libboost-date-time-dev, dpkg-dev (>= 1.16.1), pkg-config, dh-autoreconf
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 8.0.0), autotools-dev, libxml2-dev, libboost-dev, libboost-program-options-dev, libcurl4-gnutls-dev, libcppunit-dev (= 1.13.2-2.1), docbook2x, libboost-date-time-dev, dpkg-dev (>= 1.16.1), pkg-config, dh-autoreconf, docbook-xml
+Standards-Version: 3.9.6
 Section: libs
 Homepage: http://libcmis.sourceforge.net/
 
diff --git a/debian/libcmis-0.5-5.postinst.debhelper b/debian/libcmis-0.5-5.postinst.debhelper
deleted file mode 100644
index 3d89d3e..0000000
--- a/debian/libcmis-0.5-5.postinst.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "configure" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libcmis-0.5-5.postrm.debhelper b/debian/libcmis-0.5-5.postrm.debhelper
deleted file mode 100644
index 7f44047..0000000
--- a/debian/libcmis-0.5-5.postrm.debhelper
+++ /dev/null
@@ -1,5 +0,0 @@
-# Automatically added by dh_makeshlibs
-if [ "$1" = "remove" ]; then
-	ldconfig
-fi
-# End automatically added section
diff --git a/debian/libcmis-0.5-5.substvars b/debian/libcmis-0.5-5.substvars
deleted file mode 100644
index 23f10bb..0000000
--- a/debian/libcmis-0.5-5.substvars
+++ /dev/null
@@ -1,2 +0,0 @@
-shlibs:Depends=libboost-date-time1.55.0, libc6 (>= 2.14), libcmis-0.5-5, libcurl3-gnutls (>= 7.16.2), libgcc1 (>= 1:4.1.1), libstdc++6 (>= 4.9), libxml2 (>= 2.7.4)
-misc:Depends=
diff --git a/debian/rules b/debian/rules
index 0644059..9899421 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,18 +11,19 @@
 
 include /usr/share/dpkg/architecture.mk
 
+DPKG_EXPORT_BUILDFLAGS=1
 include /usr/share/dpkg/buildflags.mk
 
-ifneq (,$(findstring arm,$(DEB_HOST_ARCH)))
-	CXXFLAGS += -O0
-	export CXXFLAGS
+COMMA = ,
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
 %:
-	dh $@  --with autoreconf
+	dh $@  --parallel --with autoreconf
 
 override_dh_clean:
-	rm -f libcmis-0.4.pc
+	rm -f libcmis-0.5.pc
 	rm -f cmis-client.1
 	dh_clean
 
@@ -34,10 +35,10 @@ else
 endif
 
 override_dh_auto_build:
-	$(MAKE)
+	$(MAKE) $(NJOBS)
 
 override_dh_auto_test:
-	$(MAKE) check
+	$(MAKE) $(NJOBS) check
 
 override_dh_auto_install:
 	dh_auto_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libcmis.git