[libwps] 01/07: Import Debian patch 0.4.3-2

[Rene Engelhard]

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

rene pushed a commit to branch master
in repository libwps.

commit 16b6c1378519263dc52b5bb34cc229a4627fb4a4
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jul 7 17:03:49 2016 +0200

    Import Debian patch 0.4.3-2
---
 debian/changelog |  7 +++++++
 debian/control   |  3 ++-
 debian/rules     | 57 ++++++++++++++++++++++++++++++++++++--------------------
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9f6ebaa..d5c35ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libwps (0.4.3-2) unstable; urgency=medium
+
+  * add build-{arch,indep} (closes: #8220457), build docs only in build-indep
+    and move doxygen to B-D-I.
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 07 Jul 2016 17:03:49 +0200
+
 libwps (0.4.3-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 05bc04b..7aeff7e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libwps
 Priority: optional
 Maintainer: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 5), librevenge-dev, doxygen, autotools-dev, libcppunit-dev, pkg-config, dh-autoreconf, libboost-dev
+Build-Depends: debhelper (>= 5), librevenge-dev, autotools-dev, libcppunit-dev, pkg-config, dh-autoreconf, libboost-dev
+Build-Depends-Indep: doxygen
 Section: libs
 
 Package: libwps-dev
diff --git a/debian/rules b/debian/rules
index 72f788d..0dfceb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,29 +24,41 @@ major=2
 #major=`ls src/.libs/lib*.so.* | \
 # awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-configure: configure-stamp
-configure-stamp:
-	dh_testdir
-	dh_autoreconf
+CONFIGURE_FLAGS += --prefix=/usr --enable-static --disable-werror --disable-silent-rules
 
-	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \
-	     ./configure --prefix=/usr --enable-static --disable-werror
-	touch configure-stamp
 
+build: build-arch build-indep
 
-build: build-stamp
-build-stamp: configure-stamp 
+build-arch: build-arch-stamp
+build-arch-stamp:
 	dh_testdir
 
-	$(MAKE) $(NJOBS) V=1
-	cd src/test; $(MAKE) V=1 check
+	dh_autoreconf && \
+	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \
+	     ./configure $(CONFIGURE_FLAGS) --without-docs
+	$(MAKE) $(NJOBS)
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	cd src/test; $(MAKE) check
+endif
 
 	touch $@
 
+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 && \
+	$(shell DEB_CFLAGS_MAINT_APPEND=-Wall dpkg-buildflags --export=cmdline) \
+	     ./configure $(CONFIGURE_FLAGS)
+	$(MAKE)
+
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-*--stamp
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_autoreconf_clean
@@ -58,17 +70,22 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	if [ -x /usr/bin/dh_prep ]; then dh_prep; else dh_clean -k; fi
+	dh_prep
 	dh_installdirs
 
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
         # fix path and remove unwanted files
-	cd debian/tmp/usr/share/doc && \
-		mv libwps libwps-doc
-	dh_install --sourcedir=debian/tmp
-
-binary-indep: build install
+	if [ -d debian/tmp/usr/share/doc ]; then \
+		mv debian/tmp/usr/share/doc/libwps \
+			debian/tmp/usr/share/doc/libwps-doc && \
+		dh_install --sourcedir=debian/tmp; \
+	else \
+		dh_install -Nlibwps-doc --sourcedir=debian/tmp; \
+	fi
+		
+
+binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog -i
@@ -83,7 +100,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
@@ -102,4 +119,4 @@ binary-arch: build install
 	dh_builddeb -a
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure

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