[libgap-sage] 03/03: Imported Debian patch 4.8.8+3+20160327g69a66f0+dsx-1

Jerome Benoit calculus-guest at moszumanska.debian.org
Tue Sep 19 13:15:52 UTC 2017


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

calculus-guest pushed a commit to branch master
in repository libgap-sage.

commit 67c230ef23797df9f5d68110858bd0d6921b04de
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Sep 19 17:11:16 2017 +0400

    Imported Debian patch 4.8.8+3+20160327g69a66f0+dsx-1
---
 debian/changelog                                           | 14 ++++++++++++++
 debian/compat                                              |  2 +-
 debian/control                                             |  8 ++++----
 debian/get-orig-source.sh                                  |  2 +-
 debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch          |  6 +++---
 debian/patches/gap-ds-upstream-upstream-env-tmpdir.patch   |  6 +++---
 debian/patches/upstream-hacking-upgrade-version.patch      |  4 ++--
 .../upstream-source-lintian-spelling-error-silence.patch   | 10 +++++-----
 debian/rules                                               |  3 ++-
 9 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 96cfe71..00e411b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+libgap-sage (4.8.8+3+20160327g69a66f0+dsx-1) unstable; urgency=medium
+
+  * New GAP upstream minor/patch release.
+  * Debianization:
+    - debian/control:
+      - debhelper, bump to 10;
+      - Standards Version, bump to 4.1.0 (no change);
+    - debian/rules, use pkg-info.mk ;
+    - debian/patches/*:
+      - refresh;
+    - debian/get-orig-source.sh, refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net>  Tue, 19 Sep 2017 13:04:26 +0000
+
 libgap-sage (4.8.7+3+20160327g69a66f0+dsx-1) unstable; urgency=medium
 
   * New GAP upstream minor/patch release (Closes: #869160).
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 1859f20..e82ae10 100644
--- a/debian/control
+++ b/debian/control
@@ -4,11 +4,11 @@ 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), dh-autoreconf, libtool, python-ply,
- gap (>= 4r8p7), gap (<< 4r8p8),
+ debhelper (>= 10), libtool, python-ply,
+ gap (>= 4r8p8), gap (<< 4r8p9),
  libgmp-dev
 Build-Depends-Indep:
-Standards-Version: 3.9.8
+Standards-Version: 4.1.0
 Homepage: https://bitbucket.org/vbraun/libgap
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/libgap-sage.git
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/libgap-sage.git
@@ -19,7 +19,7 @@ Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Depends:
- gap (>= 4r8p7), gap (<< 4r8p8),
+ gap (>= 4r8p8), gap (<< 4r8p9),
  ${shlibs:Depends}, ${misc:Depends}
 Description: GAP kernel as a C shared library -- lib
  GAP is a system for computational group theory. LibGAP contains a shared
diff --git a/debian/get-orig-source.sh b/debian/get-orig-source.sh
index 16ebdf3..a142417 100755
--- a/debian/get-orig-source.sh
+++ b/debian/get-orig-source.sh
@@ -46,7 +46,7 @@ if [ ! -e debian/changelog ]; then
 fi
 
 UPSTREAM_REPO="https://bitbucket.org/vbraun/libgap"
-UPSTREAM_GAPCORE_REPO="http://www.gap-system.org/pub/gap/gap${UPSTREAM_GAP_VERSION_MAJOR}core"
+UPSTREAM_GAPCORE_REPO="https://www.gap-system.org/pub/gap/gap${UPSTREAM_GAP_VERSION_MAJOR}core"
 
 DEBIAN_SUFFIX="+${UPSTREAM_COMMIT_EPOCH}+dsx"
 
diff --git a/debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch b/debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch
index 80f3474..e553dca 100644
--- a/debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch
+++ b/debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch
@@ -1,11 +1,11 @@
 Description: TMPDIR honouring
 Origin: vendor, Debian
-Last-Update: 2017-07-22
+Last-Update: 2017-09-19
 Comment:
  Imported as-is by hand from GAP Debian material version 4r8p7-1.
 
---- a/gapcore/gap4r8p7/src/sysfiles.c
-+++ b/gapcore/gap4r8p7/src/sysfiles.c
+--- a/gapcore/gap4r8p8/src/sysfiles.c
++++ b/gapcore/gap4r8p8/src/sysfiles.c
 @@ -1392,7 +1392,11 @@
  #if SYS_IS_CYGWIN32
  #define MY_CLOCK CLOCK_REALTIME
diff --git a/debian/patches/gap-ds-upstream-upstream-env-tmpdir.patch b/debian/patches/gap-ds-upstream-upstream-env-tmpdir.patch
index a823d06..0d8a1f3 100644
--- a/debian/patches/gap-ds-upstream-upstream-env-tmpdir.patch
+++ b/debian/patches/gap-ds-upstream-upstream-env-tmpdir.patch
@@ -1,12 +1,12 @@
 Description: TMPDIR honouring
 Origin: vendor, Debian
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-07-22
+Last-Update: 2017-09-19
 Comment:
  Imported as-is by hand from GAP Debian material version 4r8p7-1.
 
---- a/gapcore/gap4r8p7/src/sysfiles.c
-+++ b/gapcore/gap4r8p7/src/sysfiles.c
+--- a/gapcore/gap4r8p8/src/sysfiles.c
++++ b/gapcore/gap4r8p8/src/sysfiles.c
 @@ -3992,7 +3992,13 @@
  {
    static char name[1024];
diff --git a/debian/patches/upstream-hacking-upgrade-version.patch b/debian/patches/upstream-hacking-upgrade-version.patch
index 7d176b5..30e828b 100644
--- a/debian/patches/upstream-hacking-upgrade-version.patch
+++ b/debian/patches/upstream-hacking-upgrade-version.patch
@@ -4,7 +4,7 @@ Description: hacking: version upgrade
 Origin: vendor, Debian
 Forwarded: not-needed
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-07-22
+Last-Update: 2017-09-19
 
 --- a/configure.ac
 +++ b/configure.ac
@@ -13,7 +13,7 @@ Last-Update: 2017-07-22
  
  # Note: the version number must match the GAP version number
 -AC_INIT([libGAP], [4.8.3], [sage-devel at googlegroups.com])
-+AC_INIT([libGAP], [4.8.7], [sage-devel at googlegroups.com])
++AC_INIT([libGAP], [4.8.8], [sage-devel at googlegroups.com])
  
  AC_CANONICAL_TARGET
  AM_INIT_AUTOMAKE
diff --git a/debian/patches/upstream-source-lintian-spelling-error-silence.patch b/debian/patches/upstream-source-lintian-spelling-error-silence.patch
index f7ed1b6..9fff658 100644
--- a/debian/patches/upstream-source-lintian-spelling-error-silence.patch
+++ b/debian/patches/upstream-source-lintian-spelling-error-silence.patch
@@ -5,7 +5,7 @@ Origin: vendor, Debian
 Forwarded: https://bitbucket.org/vbraun/libgap/pull-requests/5
 Comment: spelling-error-in-binary
 Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-07-22
+Last-Update: 2017-09-19
 
 --- a/README
 +++ b/README
@@ -82,8 +82,8 @@ Last-Update: 2017-07-22
  
  
  Usage
---- a/gapcore/gap4r8p7/src/saveload.c
-+++ b/gapcore/gap4r8p7/src/saveload.c
+--- a/gapcore/gap4r8p8/src/saveload.c
++++ b/gapcore/gap4r8p8/src/saveload.c
 @@ -924,7 +924,7 @@
    if ((x & 3) == 1)
      Pr("Immediate  integer %d\n", INT_INTOBJ((Obj)x),0L);
@@ -93,8 +93,8 @@ Last-Update: 2017-07-22
    else
      Pr("Reference to bag number %d\n",x>>2,0L);
  }
---- a/gapcore/gap4r8p7/src/lists.c
-+++ b/gapcore/gap4r8p7/src/lists.c
+--- a/gapcore/gap4r8p8/src/lists.c
++++ b/gapcore/gap4r8p8/src/lists.c
 @@ -1976,7 +1976,7 @@
                  }
                  if ( LEN_LIST( poss ) != LEN_LIST( obj ) ) {
diff --git a/debian/rules b/debian/rules
index 6d842af..fb0a9c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
 
 CGAP = /usr/bin/gap
 
 export DEB_BUILD_MAINT_OPTIONS=hardening=+all
 
-DEB_PKG_VERSION := $(shell dpkg-parsechangelog -S Version)
+DEB_PKG_VERSION := $(DEB_VERSION)
 DEB_PKG_DOTVERSION :=   $(word 1,$(subst +, ,$(DEB_PKG_VERSION)))
 DEB_PKG_VERSION_NANO := $(word 2,$(subst +, ,$(DEB_PKG_VERSION)))
 UPS_PKG_GIT_EPOCH :=    $(word 3,$(subst +, ,$(DEB_PKG_VERSION)))

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



More information about the debian-science-commits mailing list