[libgap-sage] 03/03: Imported Debian patch 4.8.7+3+20160327g69a66f0+dsx-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Jul 22 16:02:55 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 81eb6b10beae6c992a3714a8c145306ececeacb5
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Jul 22 19:12:24 2017 +0400
Imported Debian patch 4.8.7+3+20160327g69a66f0+dsx-1
---
debian/adhoc/examples/Makefile | 9 ++-
debian/changelog | 16 ++++++
debian/control | 6 +-
debian/copyright | 14 ++---
.../debianization-fix-perl_transition.patch | 65 ++++++++++++++++++++++
debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch | 8 +--
.../gap-ds-upstream-upstream-env-tmpdir.patch | 8 +--
.../gap-ds-upstream-upstream-fix-buffering.patch | 20 -------
debian/patches/series | 2 +-
.../patches/upstream-hacking-upgrade-version.patch | 4 +-
...eam-source-lintian-spelling-error-silence.patch | 10 ++--
debian/tests/control | 2 +-
12 files changed, 114 insertions(+), 50 deletions(-)
diff --git a/debian/adhoc/examples/Makefile b/debian/adhoc/examples/Makefile
index 9c0d645..532bbf5 100644
--- a/debian/adhoc/examples/Makefile
+++ b/debian/adhoc/examples/Makefile
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Science Team
-# copyright: 2016 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2016-2017 Jerome Benoit <calculus at rezozer.net>
# distributed under the terms and conditions of GPL version 2 or later
#
@@ -32,8 +32,11 @@ all: build
build: $(PROGRAMS)
-check: build
- @$(foreach eg, $(PROGRAMS), echo "*** $(eg) ***" ; ./$(eg) ; )
+check: $(foreach eg, $(PROGRAMS), check-$(eg))
+
+check-%: build
+ @echo "*** $(subst check-,,$@) ***"
+ ./$(subst check-,,$@)
clean:
$(RM) $(PROGRAMS)
diff --git a/debian/changelog b/debian/changelog
index 94b16f4..96cfe71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libgap-sage (4.8.7+3+20160327g69a66f0+dsx-1) unstable; urgency=medium
+
+ * New GAP upstream minor/patch release (Closes: #869160).
+ * Debianization:
+ - debian/copyright, refresh;
+ - debian/control, update;
+ - debian/patches/*:
+ - d/p/gap-ds-upstream-upstream-fix-buffering.patch, discarded;
+ - d/p/debianization-fix-perl_transition.patch, introduce,
+ - refresh;
+ - debian/tests/control, adjust Depends field;
+ - debian/adhoc/examples/Makefile, harden;
+ - refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 22 Jul 2017 15:11:06 +0000
+
libgap-sage (4.8.6+3+20160327g69a66f0+dsx-2) unstable; urgency=medium
* Bug fix release (See: #844789) / Debianization:
diff --git a/debian/control b/debian/control
index 21bd22d..1859f20 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ 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), gnulib, dh-autoreconf, libtool, python-ply,
- gap (>= 4r8p6), gap (<< 4r8p7),
+ debhelper (>= 9), dh-autoreconf, libtool, python-ply,
+ gap (>= 4r8p7), gap (<< 4r8p8),
libgmp-dev
Build-Depends-Indep:
Standards-Version: 3.9.8
@@ -19,7 +19,7 @@ Architecture: any
Multi-Arch: same
Pre-Depends: ${misc:Pre-Depends}
Depends:
- gap (>= 4r8p6), gap (<< 4r8p7),
+ gap (>= 4r8p7), gap (<< 4r8p8),
${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/copyright b/debian/copyright
index 1596a39..6713001 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,14 +17,14 @@ Comment:
Files: *
Copyright:
- 2011-2016 Volker Braun <vbraun.name at gmail.com>
+ 2011-2017 Volker Braun <vbraun.name at gmail.com>
License: GPL-2+
Files: gapcore/*
Copyright:
1996 Lehrstuhl D für Mathematik, RWTH Aachen, Germany
1998 School Math and Comp. Sci., University of St Andrews, Scotland
- 2002-2016 The GAP Group
+ 2002-2017 The GAP Group
License: GPL-2+
Comment:
This folder contains the upstream GAP-core material that is needed to build
@@ -34,7 +34,7 @@ Comment:
Files:
pkgextra/doc/libGAP.pdf
Copyright:
- 2013-2016 Volker Braun <vbraun.name at gmail.com>
+ 2013-2017 Volker Braun <vbraun.name at gmail.com>
License: GPL-2+
Comment:
This PDF document is part of the material provided by the upstream maintainer.
@@ -46,7 +46,7 @@ Comment:
Files:
pkgextra/GitChangeLog
Copyright:
- 2016 Jerome Benoit <calculus at rezozer.net>
+ 2016-2017 Jerome Benoit <calculus at rezozer.net>
License: public-domain
This file is public domain and come with NO WARRANTY of any kind.
Comment:
@@ -56,15 +56,15 @@ Comment:
Files: debian/*
Copyright:
- 2016 Jerome Benoit <calculus at rezozer.net>
+ 2016-2017 Jerome Benoit <calculus at rezozer.net>
License: GPL-2+
Files: debian/patches/gap-ds-upstream-*.patch
Copyright:
- 2013-2016 Bill Allombert <ballombe at debian.org>
+ 2013-2017 Bill Allombert <ballombe at debian.org>
License: GPL-2+
Comment:
- Patches imported as-is by hand from the GAP Debian material version 4r8p6-1 .
+ Patches imported as-is by hand from the GAP Debian material version 4r8p7-1 .
License: GPL-2+
This package is free software: you can redistribute it and/or modify
diff --git a/debian/patches/debianization-fix-perl_transition.patch b/debian/patches/debianization-fix-perl_transition.patch
new file mode 100644
index 0000000..1516813
--- /dev/null
+++ b/debian/patches/debianization-fix-perl_transition.patch
@@ -0,0 +1,65 @@
+Description: debianization: fix/workaround: perl 5.26 transition
+ Provide ld-version-script.m4 as distributed by the gnulib package:
+ due to the underway perl 5.26 transition gnulib cannot be installed
+ even so only a m4 script file is needed, hence the patch.
+Origin: vendor, Debian
+Forwarded: not-needed
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2017-07-22
+
+--- /dev/null
++++ b/m4/ld-version-script.m4
+@@ -0,0 +1,53 @@
++# ld-version-script.m4 serial 3
++dnl Copyright (C) 2008-2014 Free Software Foundation, Inc.
++dnl This file is free software; the Free Software Foundation
++dnl gives unlimited permission to copy and/or distribute it,
++dnl with or without modifications, as long as this notice is preserved.
++
++dnl From Simon Josefsson
++
++# FIXME: The test below returns a false positive for mingw
++# cross-compiles, 'local:' statements does not reduce number of
++# exported symbols in a DLL. Use --disable-ld-version-script to work
++# around the problem.
++
++# gl_LD_VERSION_SCRIPT
++# --------------------
++# Check if LD supports linker scripts, and define automake conditional
++# HAVE_LD_VERSION_SCRIPT if so.
++AC_DEFUN([gl_LD_VERSION_SCRIPT],
++[
++ AC_ARG_ENABLE([ld-version-script],
++ AS_HELP_STRING([--enable-ld-version-script],
++ [enable linker version script (default is enabled when possible)]),
++ [have_ld_version_script=$enableval], [])
++ if test -z "$have_ld_version_script"; then
++ AC_MSG_CHECKING([if LD -Wl,--version-script works])
++ save_LDFLAGS="$LDFLAGS"
++ LDFLAGS="$LDFLAGS -Wl,--version-script=conftest.map"
++ cat > conftest.map <<EOF
++foo
++EOF
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
++ [accepts_syntax_errors=yes], [accepts_syntax_errors=no])
++ if test "$accepts_syntax_errors" = no; then
++ cat > conftest.map <<EOF
++VERS_1 {
++ global: sym;
++};
++
++VERS_2 {
++ global: sym;
++} VERS_1;
++EOF
++ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
++ [have_ld_version_script=yes], [have_ld_version_script=no])
++ else
++ have_ld_version_script=no
++ fi
++ rm -f conftest.map
++ LDFLAGS="$save_LDFLAGS"
++ AC_MSG_RESULT($have_ld_version_script)
++ fi
++ AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes")
++])
diff --git a/debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch b/debian/patches/gap-ds-upstream-fix-MY_CLOCK.patch
index 86d0909..80f3474 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: 2016-06-11
+Last-Update: 2017-07-22
Comment:
- Imported as-is by hand from GAP Debian material version 4r8p6-1.
+ Imported as-is by hand from GAP Debian material version 4r8p7-1.
---- a/gapcore/gap4r8p6/src/sysfiles.c
-+++ b/gapcore/gap4r8p6/src/sysfiles.c
+--- a/gapcore/gap4r8p7/src/sysfiles.c
++++ b/gapcore/gap4r8p7/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 83ed6cd..a823d06 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: 2013-12-30
+Last-Update: 2017-07-22
Comment:
- Imported as-is by hand from GAP Debian material version 4r8p6-1.
+ Imported as-is by hand from GAP Debian material version 4r8p7-1.
---- a/gapcore/gap4r8p6/src/sysfiles.c
-+++ b/gapcore/gap4r8p6/src/sysfiles.c
+--- a/gapcore/gap4r8p7/src/sysfiles.c
++++ b/gapcore/gap4r8p7/src/sysfiles.c
@@ -3992,7 +3992,13 @@
{
static char name[1024];
diff --git a/debian/patches/gap-ds-upstream-upstream-fix-buffering.patch b/debian/patches/gap-ds-upstream-upstream-fix-buffering.patch
deleted file mode 100644
index 7e40194..0000000
--- a/debian/patches/gap-ds-upstream-upstream-fix-buffering.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Fix buffering of first file.
- Buffering of the first read file was disabled.
-Author: Christopher Jefferson
-Last-Update: 2016-12-14
-Comment:
- Imported as-is by hand from GAP Debian material version 4r8p6-2.
-
-Index: gap-4r8p6/src/sysfiles.c
-===================================================================
---- a/gapcore/gap4r8p6/src/sysfiles.c
-+++ b/gapcore/gap4r8p6/src/sysfiles.c
-@@ -2332,7 +2332,7 @@ Int HasAvailableBytes( UInt fid )
- syBuf[fid].fp == -1)
- return -1;
-
-- if (syBuf[fid].bufno > 0)
-+ if (syBuf[fid].bufno >= 0)
- {
- bufno = syBuf[fid].bufno;
- if (syBuffers[bufno].bufstart < syBuffers[bufno].buflen)
diff --git a/debian/patches/series b/debian/patches/series
index 9b2b9e3..ea0f41f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-gap-ds-upstream-upstream-fix-buffering.patch
gap-ds-upstream-fix-MY_CLOCK.patch
gap-ds-upstream-upstream-env-tmpdir.patch
upstream-source-lintian-spelling-error-silence.patch
@@ -11,3 +10,4 @@ upstream-autotoolization-test-systemwide.patch
upstream-hacking-upgrade-version.patch
debianization.patch
debianization-pkgconfig.patch
+debianization-fix-perl_transition.patch
diff --git a/debian/patches/upstream-hacking-upgrade-version.patch b/debian/patches/upstream-hacking-upgrade-version.patch
index 38d3926..7d176b5 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: 2016-11-18
+Last-Update: 2017-07-22
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ Last-Update: 2016-11-18
# 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.6], [sage-devel at googlegroups.com])
++AC_INIT([libGAP], [4.8.7], [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 6e09ee7..f7ed1b6 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: 2016-11-18
+Last-Update: 2017-07-22
--- a/README
+++ b/README
@@ -82,8 +82,8 @@ Last-Update: 2016-11-18
Usage
---- a/gapcore/gap4r8p6/src/saveload.c
-+++ b/gapcore/gap4r8p6/src/saveload.c
+--- a/gapcore/gap4r8p7/src/saveload.c
++++ b/gapcore/gap4r8p7/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: 2016-11-18
else
Pr("Reference to bag number %d\n",x>>2,0L);
}
---- a/gapcore/gap4r8p6/src/lists.c
-+++ b/gapcore/gap4r8p6/src/lists.c
+--- a/gapcore/gap4r8p7/src/lists.c
++++ b/gapcore/gap4r8p7/src/lists.c
@@ -1976,7 +1976,7 @@
}
if ( LEN_LIST( poss ) != LEN_LIST( obj ) ) {
diff --git a/debian/tests/control b/debian/tests/control
index 7a1844c..e37fcf6 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,2 +1,2 @@
Tests: build-examples
-Depends: libgap-sage-doc, libgap-sage-dev, pkg-config, build-essential
+Depends: libgap-sage-doc, gap-small-groups, libgap-sage-dev, pkg-config, build-essential
--
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