[libwpg] 01/05: Import Debian patch 0.3.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 libwpg.

commit 27159eac19677d581c5b848b075350631a7f6248
Author: Rene Engelhard <rene at debian.org>
Date:   Thu Jul 7 16:19:22 2016 +0200

    Import Debian patch 0.3.1-2
---
 debian/changelog | 11 +++++++++++
 debian/control   |  5 +++--
 debian/rules     | 55 ++++++++++++++++++++++++++++++++++++++-----------------
 3 files changed, 52 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c991874..d9a38ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+libwpg (0.3.1-2) unstable; urgency=medium
+
+  * s/Works text documents files/WordPerfect Graphics/ (closes: #780959) 
+  * add build-{arch,indep} (closes: #022046), build docs only in build-indep
+    and move doxygen to B-D-I.
+  * "update" the packaging
+    - Enable parallel builds.
+    - Honor nocheck in DEB_BUILD_OPTIONS. 
+
+ -- Rene Engelhard <rene at debian.org>  Thu, 07 Jul 2016 16:19:22 +0200
+
 libwpg (0.3.1-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/control b/debian/control
index 39ef52c..441cf96 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: libwpg
 Priority: optional
 Maintainer: Rene Engelhard <rene at debian.org>
-Build-Depends: debhelper (>= 5), libwpd-dev (>= 0.10), librevenge-dev, doxygen, pkg-config, dh-autoreconf
+Build-Depends: debhelper (>= 5), libwpd-dev (>= 0.10), librevenge-dev, pkg-config, dh-autoreconf
+Build-Depends-Indep: doxygen
 Build-Conflicts: automake1.9
 Standards-Version: 3.7.2
 Section: libs
@@ -39,7 +40,7 @@ Description: Tools from libwpg for converting WP Graphics to Raw/SVG
  software, such as WordPerfect(tm) and Presentations(tm).
  .
  This package contains some little programs using libwps to convert
- Works text document files into Raw and SVG files.
+ WordPerfect Graphics into Raw and SVG files.
 
 Package: libwpg-doc
 Section: doc
diff --git a/debian/rules b/debian/rules
index 591000d..211cdbd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,6 +17,10 @@ else
 	CFLAGS += -O2
 endif
 
+ifneq (,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+  NJOBS := -j $(subst parallel=,,$(filter parallel=%,$(subst $(COMMA), ,$(DEB_BUILD_OPTIONS))))
+endif
+
 # shared library versions, option 1
 #version=2.0.5
 #major=2
@@ -26,27 +30,40 @@ version=`ls src/.libs/lib*.so.* | \
 major=`ls src/.libs/lib*.so.* | \
  awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
-configure: configure-stamp
-configure-stamp:
+CONFIGURE_FLAGS += --prefix=/usr --enable-static --disable-silent-rules
+
+build: build-arch build-indep
+
+build-arch: build-arch-stamp
+build-arch-stamp:
 	dh_testdir
-	dh_autoreconf
-	./configure --prefix=/usr --enable-static
-	touch configure-stamp
 
+	dh_autoreconf && \
+	./configure $(CONFIGURE_FLAGS) --without-docs
+	$(MAKE) $(NJOBS)
+ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
+	cd src/test; $(MAKE) check
+endif
+
+	touch $@
 
-build: build-stamp
-build-stamp: configure-stamp 
+build-indep: build-indep-stamp
+build-indep-stamp:
 	dh_testdir
 
-	$(MAKE) V=1
-	cd src/test; $(MAKE) V=1 check
+	# 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 $(CONFIGURE_FLAGS)
+	$(MAKE)
 
 	touch $@
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp configure-stamp
+	rm -f build-*-stamp
 
 	[ ! -f Makefile ] || $(MAKE) distclean
 	dh_autoreconf_clean
@@ -54,7 +71,7 @@ clean:
 
 	dh_clean 
 
-install: build
+install:
 	dh_testdir
 	dh_testroot
 	dh_prep 
@@ -62,13 +79,17 @@ install: build
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
         # fix path and remove unwanted files
-	cd debian/tmp/usr/share/doc && \
-		mv libwpg libwpg-doc
-	dh_install --sourcedir=debian/tmp
+	if [ -d debian/tmp/usr/share/doc ]; then \
+		mv debian/tmp/usr/share/doc/libwpg \
+			debian/tmp/usr/share/doc/libwpg-doc && \
+		dh_install --sourcedir=debian/tmp; \
+	else \
+		dh_install -Nlibwpg-doc --sourcedir=debian/tmp; \
+	fi
 	# unneeded
 	rm -f debian/libwpg-tools/usr/bin/wpg2svgbatch*
 
-binary-indep: build install
+binary-indep: build-indep install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog -i
@@ -84,7 +105,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
@@ -103,4 +124,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/libwpg.git