[libwpd] 01/07: Import Debian patch 0.10.1-2

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libwpd.

commit 991c3e6f51132150f0b04bfabc5dc3770e45fa48
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jul 7 15:19:46 2016 +0200

    Import Debian patch 0.10.1-2
---
 debian/changelog | 12 ++++++++++++
 debian/control   |  5 +++--
 debian/rules     | 58 +++++++++++++++++++++++++++++++++++++-------------------
 3 files changed, 54 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bbe8639..9790c39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+libwpd (0.10.1-2) unstable; urgency=medium
+
+  * add build-{arch,indep} (closes: #822045), build docs only in build-indep
+    and move doxygen to B-D-I.
+  * apply parts of "update the packaging" patch from #814869
+    - Bump the standards version.
+    - Enable parallel builds.
+    - Honor nocheck in DEB_BUILD_OPTIONS.
+    - debian/rules: Cleanup unused macros, don't run configure on install.
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 07 Jul 2016 15:19:46 +0200
+
 libwpd (0.10.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 61745f7..847571f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,9 @@ Section: devel
 Priority: optional
 Maintainer: Rene Engelhard <rene at debian.org>
 Uploaders: Masayuki Hatta (mhatta) <mhatta at debian.org>
-Build-Depends: debhelper (>= 9), doxygen, libcppunit-dev, dh-autoreconf, zlib1g-dev, pkg-config, dpkg-dev (>= 1.16.1), librevenge-dev
-Standards-Version: 3.7.2
+Build-Depends: debhelper (>= 9), libcppunit-dev, dh-autoreconf, zlib1g-dev, pkg-config, dpkg-dev (>= 1.16.1), librevenge-dev
+Build-Depends-Indep: doxygen
+Standards-Version: 3.9.7
 
 Package: libwpd-dev
 Section: libdevel
diff --git a/debian/rules b/debian/rules
index 14902c2..83f5e1f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,33 +9,49 @@
 include /usr/share/dpkg/architecture.mk
 include /usr/share/dpkg/buildflags.mk
 
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
 endif
 
 #DEBHELPER_OPTIONS = -N libwpd-tools
 
-config.status:
+CONFIGURE_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
+        --disable-werror --enable-static --disable-silent-rules
+
+
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp:
 	dh_testdir
-	# Add here commands to configure the package.
+
 	dh_autoreconf && \
-	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
-	--disable-werror --enable-static --disable-silent-rules
+	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFIGURE_FLAGS) --without-docs
+	$(MAKE) $(NJOBS)
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	cd src/test; $(MAKE) check
+endif
 
+	touch build-arch-stamp
 
-build: build-stamp
-build-stamp:  config.status
+build-indep: build-indep-stamp
+build-indep-stamp:
 	dh_testdir
 
+	# There apparently is no way to build *only* the docs, so do it
+	# completely. If we already ran build-arch (full build) this only
+	# builds the docs *in addition*
+	if [ ! -f debian/autoreconf.after ]; then dh_autoreconf; fi && \
+	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" CXXFLAGS="$(CXXFLAGS)" LDFLAGS="$(LDFLAGS)" $(CONFIGURE_FLAGS)
 	$(MAKE)
-	cd src/test; $(MAKE) check
+	
+	touch build-indep-stamp
 
-	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp 
+	rm -f build-*-stamp 
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_autoreconf_clean
@@ -46,7 +62,7 @@ clean:
 
 	dh_clean
 
-install: build
+install:
 	dh_testdir
 	dh_testroot
 	dh_prep
@@ -54,11 +70,15 @@ install: build
 
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	# fix path and remove unwanted files
-	cd debian/tmp/usr/share/doc && \
-		mv libwpd libwpd-doc
-	dh_install --sourcedir=debian/tmp
-
-binary-indep: build install
+	if [ -d debian/tmp/usr/share/doc ]; then \
+		mv debian/tmp/usr/share/doc/libwpd \
+			debian/tmp/usr/share/doc/libwpd-doc && \
+		dh_install --sourcedir=debian/tmp; \
+	else \
+		dh_install -Nlibwpd-doc --sourcedir=debian/tmp; \
+	fi
+	
+binary-indep: build-indep install
 	dh_testdir -i
 	dh_testroot -i
 	dh_installchangelogs ChangeLog -i
@@ -70,7 +90,7 @@ binary-indep: build install
 	dh_md5sums -i
 	dh_builddeb -i
 
-binary-arch: build install
+binary-arch: build-arch install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog -a $(DEBHELPER_OPTIONS)
@@ -92,4 +112,4 @@ binary-arch: build install
 	dh_builddeb -a $(DEBHELPER_OPTIONS)
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install 

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