[gap-guava] 01/01: Imported Debian patch 3.12+ds1-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-guava.

commit 81e9573a4a312fecf31807605e544ee647ea223b
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Wed Sep 24 03:59:57 2014 +0200

    Imported Debian patch 3.12+ds1-2
---
 debian/changelog                   | 9 +++++++++
 debian/control                     | 2 +-
 debian/patches/debianization.patch | 8 ++++----
 debian/rules                       | 4 ++--
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index edcf8b2..93355cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gap-guava (3.12+ds1-2) unstable; urgency=medium
+
+  * Debianization:
+    - debian/control, Standards Version 3.9.6 bump (no change);
+    - debian/{rules,patches/debianization.patch},
+      multiarch support correction.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 24 Sep 2014 02:17:15 +0000
+
 gap-guava (3.12+ds1-1) unstable; urgency=medium
 
   * New upstream version (Closes: #493694).
diff --git a/debian/control b/debian/control
index e2ad98d..919c9de 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends:
  debhelper (>= 9), autoconf, automake,
  gap (>=4r7p5), gap-dev (>=4r7p5), gap-gapdoc,
  texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 Homepage: http://www.gap-system.org/Packages/guava.html
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/gap-guava.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gap-guava.git
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 488bc79..32ea889 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,12 +2,12 @@ Description: debianization
  Meant to maintain a minimal debian/rules, to fix annoying
  warnings, to address Debian specific stuff in general.
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-09-06
+Last-Update: 2014-09-24
 
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -1,21 +1,26 @@
-+DEB_BUILD_GNU_TYPE=@DEB_BUILD_GNU_TYPE@
++DEB_BUILD_MULTIARCH=@DEB_BUILD_MULTIARCH@
  GAPPATH=@GAPPATH@
  GAPARCH=@GAPARCH@
 +CGAP    = /usr/bin/gap
@@ -17,7 +17,7 @@ Last-Update: 2014-09-06
  SRCDIR  = ./src/leon
  CJSRCDIR= ./src/ctjhai
 -BINDIR = bin/$(GAPARCH)
-+LIBDIR=/usr/lib/$(DEB_BUILD_GNU_TYPE)
++LIBDIR=/usr/lib/$(DEB_BUILD_MULTIARCH)
 +BINDIR=$(LIBDIR)/gap/pkg/guava/bin
  #GAP_PATH=../..
  #PKG_PATH=.
@@ -83,7 +83,7 @@ Last-Update: 2014-09-06
  rm -f Makefile Makefile$CONFIGSUFFIX
  . $GAPPATH/sysinfo.gap$CONFIGSUFFIX
  sed \
-+    -e 's|@DEB_BUILD_GNU_TYPE@|'$(dpkg-architecture -qDEB_BUILD_GNU_TYPE)'|g' \
++    -e 's/@DEB_BUILD_MULTIARCH@/'$(dpkg-architecture -qDEB_BUILD_MULTIARCH)'/g' \
      -e 's|@GAPPATH@|'$GAPPATH'|g' \
      -e 's/@GAPARCH@/'$GAParch'/g' \
    Makefile.in > Makefile$CONFIGSUFFIX
diff --git a/debian/rules b/debian/rules
index b60ca46..cd93f38 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 CGAP=/usr/bin/gap
 
-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);' | $(CGAP) -A -q -T)
 
 default:
@@ -19,7 +19,7 @@ override_dh_link:
 		/usr/lib/gap/pkg/guava/bin /usr/share/gap/pkg/guava/bin \
 		/usr/share/gap/pkg/guava/doc /usr/share/doc/gap-guava/doc
 	dh_link -p gap-guava-bin \
-		/usr/lib/$(DEB_BUILD_GNU_TYPE)/gap/pkg/guava/bin /usr/lib/gap/pkg/guava/bin/$(DEB_BUILD_GAP_INFO_ARCH)
+		/usr/lib/$(DEB_BUILD_MULTIARCH)/gap/pkg/guava/bin /usr/lib/gap/pkg/guava/bin/$(DEB_BUILD_GAP_INFO_ARCH)
 
 override_dh_installchangelogs:
 	dh_installchangelogs --keep CHANGES.guava

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