[gap-io] 04/06: Refresh Debian patch 4.4.1+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sun Sep 28 02:33:42 UTC 2014
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 208bb30a4cac682383cc996df6138f887e8f73ff
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sun Sep 28 01:56:42 2014 +0200
Refresh Debian patch 4.4.1+ds-1
---
debian/changelog | 11 +++++++---
debian/copyright | 14 ++++++------
debian/gap-io.doc-base | 6 ++++--
debian/makedoc.g | 6 ++++++
debian/patches/debianization.patch | 44 ++++++++++++++++++++++----------------
debian/repack | 6 ++++--
debian/rules | 8 +++++++
debian/watch | 2 +-
8 files changed, 64 insertions(+), 33 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e608e18..d9b1f3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,18 @@ gap-io (4.4.1+ds-1) unstable; urgency=medium
* New upstream version.
* Debianization:
- - debian/control, Standards Version 3.9.6 bump (no change);
+ - debian/{copyright,watch,patches/,gap-io.doc-base}, refresh;
+ - debian/repack, refine;
+ - debian/control:
+ - Standards Version, bump to 3.9.6 (no change);
- debian/rules:
- hardening support, clean up;
- multiarch support, correct;
- - debian/patches/, refresh.
+ - package-contains-timestamped-gzip lintian complain, resolve
+ (issue reported to the uptream maintainers);
+ - debian/makedoc.g, reintroduce (to workaround reported bug #763128).
- -- Jerome Benoit <calculus at rezozer.net> Sat, 27 Sep 2014 23:10:02 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Sun, 28 Sep 2014 02:07:48 +0000
gap-io (4.3.1+ds-1) unstable; urgency=medium
diff --git a/debian/copyright b/debian/copyright
index 6fd6c41..4a5be47 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,18 +1,20 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
Upstream-Name: io package for GAP
-Upstream-Contact: Max Neunhoeffer <m.neunhoeffer at triagens.de>
+Upstream-Contact:
+ Max Neunhoeffer <max at 9hoeffer.de>
+ Max Horn <max.horn at math.uni-giessen.de>
Source: http://www.gap-system.org/Packages/io.html
-X-Source: https://neunhoef.github.io/io/
-X-Source-Downloaded-From: https://github.com/neunhoef/io/releases
-X-Upstream-Vcs: git clone https://github.com/neunhoef/io.git
-X-Upstream-Bugs: https://github.com/neunhoef/io/issues
+X-Source: https://gap-system.github.io/io/
+X-Source-Downloaded-From: https://github.com/gap-system/io/releases
+X-Upstream-Vcs: git clone https://github.com/gap-system/io
+X-Upstream-Bugs: https://github.com/gap-system/io/issues
Comment:
The upstream source tarball is repacked to drop off the regenarated
material, mainly the documentation, to gain substantial weight.
Files: *
Copyright:
- 2006-2014 Max Neunhoeffer <m.neunhoeffer at triagens.de>
+ 2006-2014 Max Neunhoeffer <max at 9hoeffer.de>
License: GPL-3+
Files: debian/*
diff --git a/debian/gap-io.doc-base b/debian/gap-io.doc-base
index 4b16ca5..04e91ea 100644
--- a/debian/gap-io.doc-base
+++ b/debian/gap-io.doc-base
@@ -1,6 +1,8 @@
Document: gap-io
-Title: Bindings for low level C library I/O routines
-Author: Max Neunhöffer
+Title: io: Bindings for low level C library I/O routines
+Author:
+ Max Neunhöffer
+ Max Horn
Abstract:
The purpose of this package is to allow efficient and flexible
Input/Output operations from GAP. This is achieved by providing
diff --git a/debian/makedoc.g b/debian/makedoc.g
new file mode 100644
index 0000000..f7fd5d7
--- /dev/null
+++ b/debian/makedoc.g
@@ -0,0 +1,6 @@
+# debian/makedoc.g -- GAP script
+PACKAGE:="io";
+SetPackagePath(PACKAGE,".");
+MakeGAPDocDoc("doc",PACKAGE,[],PACKAGE);
+CopyHTMLStyleFiles("doc");
+GAPDocManualLab(PACKAGE);
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 7403c44..a46de70 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,13 +4,25 @@ Description: debianization
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-09-24
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,8 @@
+ 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
+ AM_PROG_AR
--- a/Makefile.am
+++ b/Makefile.am
-@@ -1,32 +1,21 @@
+@@ -1,36 +1,21 @@
ACLOCAL_AMFLAGS = -I m4
-BINARCHDIR = bin/$(GAPARCH)
--GAPINSTALLLIB = $(abs_top_srcdir)/$(BINARCHDIR)/io.so
+-GAPINSTALLLIB = $(BINARCHDIR)/io.so
+CGAP=/usr/bin/gap
-lib_LTLIBRARIES = io.la
@@ -26,35 +38,29 @@ Last-Update: 2014-09-24
-io_la_LDFLAGS += -no-undefined -version-info 0:0:0 -Wl,$(GAPROOT)/bin/$(GAPARCH)/gap.dll
-endif
-
--all-local: io.la
+-all-local: $(GAPINSTALLLIB)
+-
+-$(GAPINSTALLLIB): io.la
- $(mkdir_p) $(top_srcdir)/$(BINARCHDIR)
-if SYS_IS_CYGWIN
- cp .libs/io.dll $(GAPINSTALLLIB)
-else
- cp .libs/io.so $(GAPINSTALLLIB)
-endif
-- @echo "SUCCESS!"
+io_la_LDFLAGS = -module -avoid-version -Wl,--version-script,debian/io.map
-+
+
+-clean-local:
+- rm -f $(GAPINSTALLLIB)
+all-local: doc
distclean-local:
- rm -rf bin/*
(cd doc ; ./clean)
- doc: doc/manual.six
-
- doc/manual.six: doc/*.xml PackageInfo.g
+-doc:
- ($(GAPROOT)/bin/gap.sh -A makedoc.g)
-+ 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
++doc: doc/manual.six
- AC_PROG_CC
+-.PHONY: doc
++doc/manual.six: doc/*.xml PackageInfo.g
++ cat debian/makedoc.g | $(CGAP) -A -q -T > /dev/null
diff --git a/debian/repack b/debian/repack
index ca856de..86516d8 100755
--- a/debian/repack
+++ b/debian/repack
@@ -25,8 +25,8 @@ fi
UPSTREAM_VERSION="$2"
UPSTREAM_TARBALLZZ="$3"
-DEBIAN_SUFFIX="+ds"
-##DEBIAN_SUFFIX="+ds1"
+##DEBIAN_SUFFIX="+ds"
+DEBIAN_SUFFIX="+ds1"
####DEBIAN_ENCAPSULATEDFOLDERNAME="${PACKAGE_NAME}-usrc"
DEBIAN_UVERSION=${UPSTREAM_VERSION}${DEBIAN_SUFFIX}
@@ -60,6 +60,8 @@ cd "${UPSTREAM_ROOTFOLDER}"
####. "${REPACK_WORKING_FOLDER}/debian/repack.local"
## wipe out
+rm --verbose --force -- test/test.c
+rmdir --verbose --ignore-fail-on-non-empty -- test
rm --verbose --force -- .mailmap
rm --verbose --force -- configure_like_gap
####rm --verbose --force -- makefile.basic
diff --git a/debian/rules b/debian/rules
index a45d895..6a6f888 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,6 +24,14 @@ override_dh_link:
/usr/share/gap/pkg/io/doc /usr/share/doc/gap-io/doc \
/usr/share/gap/pkg/io/example /usr/share/doc/gap-io/example
+override_dh_compress:
+ ## https://wiki.debian.org/ReproducibleBuilds/TimestampInGzipHeaders
+ if [ -f debian/gap-io/usr/share/gap/pkg/io/tst/test.txt.gz ]; then \
+ gunzip debian/gap-io/usr/share/gap/pkg/io/tst/test.txt.gz && \
+ gzip --no-name debian/gap-io/usr/share/gap/pkg/io/tst/test.txt ; \
+ fi
+ dh_compress
+
override_dh_installchangelogs:
dh_installchangelogs --keep CHANGES
diff --git a/debian/watch b/debian/watch
index a08816f..3f37e45 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
opts=dversionmangle=s/\+ds[\d]?// \
-https://github.com/neunhoef/io/releases .*/io-(\d\S*)\.tar\.bz2 \
+https://github.com/gap-system/io/releases .*/io-(\d\S*)\.tar\.bz2 \
debian bash debian/repack
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-io.git
More information about the debian-science-commits
mailing list