[gap-io] 01/01: Refined 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 tag debian/4.3.1+ds-2
in repository gap-io.

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

    Refined Debian patch 4.3.1+ds-2
---
 debian/changelog                   |  6 ++++--
 debian/control                     |  3 ++-
 debian/patches/debianization.patch | 17 ++++++++++++++---
 debian/rules                       |  6 ++----
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed18c9a..4fb4faa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,10 +3,12 @@ gap-io (4.3.1+ds-2) unstable; urgency=medium
   * Debianization:
     - debian/control, Standards Version 3.9.6 bump (no change);
     - debian/rules:
+      - hardening support, clean up;
       - multiarch support, correct;
-      - hardened dh_auto_clean.
+      - hardened dh_auto_clean;
+    - debian/patches/, refresh.
 
- -- Jerome Benoit <calculus at rezozer.net>  Wed, 24 Sep 2014 00:38:36 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Wed, 24 Sep 2014 01:20:10 +0000
 
 gap-io (4.3.1+ds-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index da74f09..338e001 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Jerome Benoit <calculus at rezozer.net>
 Build-Depends:
- debhelper (>= 9), autotools-dev, libtool, dh-autoreconf, autoconf-archive,
+ debhelper (>= 9), quilt, 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.6
@@ -15,6 +15,7 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gap-io.
 Package: gap-io
 Provides: gap-pkg-io
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}, gap (>=4r7p5)
 Description: low level C library IO bindings for GAP
  GAP is a system for computational discrete algebra with particular
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index aa455fd..7403c44 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,7 +2,7 @@ Description: debianization
  Meant to maintain a minimal debian/rules, to fix warnings,
  to address Debian specific stuff in general.
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-07-05
+Last-Update: 2014-09-24
 
 --- a/Makefile.am
 +++ b/Makefile.am
@@ -11,7 +11,7 @@ Last-Update: 2014-07-05
  
 -BINARCHDIR = bin/$(GAPARCH)
 -GAPINSTALLLIB = $(abs_top_srcdir)/$(BINARCHDIR)/io.so
-+GAP=/usr/bin/gap
++CGAP=/usr/bin/gap
  
 -lib_LTLIBRARIES = io.la
 +gapiolibdir=$(libdir)/gap/pkg/io/bin
@@ -46,4 +46,15 @@ Last-Update: 2014-07-05
  
  doc/manual.six: doc/*.xml PackageInfo.g
 -	($(GAPROOT)/bin/gap.sh -A makedoc.g)
-+	cat makedoc.g | $(GAP) -A -q -T
++	cat makedoc.g | $(CGAP) -A -q -T > /dev/null
+--- a/configure.ac
++++ b/configure.ac
+@@ -6,7 +6,7 @@
+ AC_CONFIG_MACRO_DIR([m4])
+ AC_CONFIG_AUX_DIR([cnf])
+ AM_INIT_AUTOMAKE([1.11 -Wall foreign subdir-objects])
+-AM_SILENT_RULES([yes])
++AM_SILENT_RULES([no])
+ AM_MAINTAINER_MODE
+ 
+ AC_PROG_CC
diff --git a/debian/rules b/debian/rules
index aa9f6d4..ee7fb3f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,9 @@
 #!/usr/bin/make -f
 
-GAP = /usr/bin/gap
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+CGAP = /usr/bin/gap
 
 DEB_BUILD_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
-DEB_BUILD_GAP_INFO_ARCH ?= $(shell echo 'Print(GAPInfo.Architecture);' | $(GAP) -A -q -T)
+DEB_BUILD_GAP_INFO_ARCH ?= $(shell echo 'Print(GAPInfo.Architecture);' | $(CGAP) -A -q -T)
 
 default:
 	@uscan --no-conf --dehs --report || true

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