[gap-io] 01/01: Imported Debian patch 4.3.1+ds-2

[Jerome Benoit]

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

calculus-guest pushed a commit to branch master
in repository gap-io.

commit e5892614ab8d40c78a347ad2767e6a6b90e5f9e2
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Wed Sep 24 02:38:30 2014 +0200

    Imported Debian patch 4.3.1+ds-2
---
 debian/changelog | 10 ++++++++++
 debian/control   |  2 +-
 debian/rules     | 10 ++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f024055..ed18c9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gap-io (4.3.1+ds-2) unstable; urgency=medium
+
+  * Debianization:
+    - debian/control, Standards Version 3.9.6 bump (no change);
+    - debian/rules:
+      - multiarch support, correct;
+      - hardened dh_auto_clean.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 24 Sep 2014 00:38:36 +0000
+
 gap-io (4.3.1+ds-1) unstable; urgency=medium
 
   * New upstream version.
diff --git a/debian/control b/debian/control
index 7d12881..da74f09 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 9), autotools-dev, libtool, dh-autoreconf, autoconf-archive,
  gap (>=4r7p5), gap-dev (>=4r7p5), gap-gapdoc, libgmp-dev,
  texlive-latex-extra, texlive-fonts-recommended
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.gap-system.org/Packages/io.html
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/gap-io.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gap-io.git
diff --git a/debian/rules b/debian/rules
index 59c2308..aa9f6d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@ GAP = /usr/bin/gap
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
 DEB_BUILD_GAP_INFO_ARCH ?= $(shell echo 'Print(GAPInfo.Architecture);' | $(GAP) -A -q -T)
 
 default:
@@ -21,7 +21,7 @@ override_dh_auto_install:
 
 override_dh_link:
 	dh_link -p gap-io \
-		/usr/lib/$(DEB_BUILD_GNU_TYPE)/gap/pkg/io/bin /usr/lib/gap/pkg/io/bin/$(DEB_BUILD_GAP_INFO_ARCH) \
+		/usr/lib/$(DEB_BUILD_MULTIARCH)/gap/pkg/io/bin /usr/lib/gap/pkg/io/bin/$(DEB_BUILD_GAP_INFO_ARCH) \
 		/usr/lib/gap/pkg/io/bin /usr/share/gap/pkg/io/bin \
 		/usr/share/gap/pkg/io/doc /usr/share/doc/gap-io/doc \
 		/usr/share/gap/pkg/io/example /usr/share/doc/gap-io/example
@@ -29,5 +29,11 @@ override_dh_link:
 override_dh_installchangelogs:
 	dh_installchangelogs --keep CHANGES
 
+override_dh_auto_clean:
+	QUILT_PATCHES=debian/patches quilt pop -q -a -R || test $$? -le 2
+	QUILT_PATCHES=debian/patches quilt push -q -a
+	dh_auto_clean
+	QUILT_PATCHES=debian/patches quilt pop -q -a -R || test $$? = 2
+
 get-orig-source:
 	uscan --no-conf --download-current-version --verbose

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-io.git