[gap-io] 01/05: debianization: Files-Excluded machinery migration

Jerome Benoit calculus-guest at moszumanska.debian.org
Tue Jan 19 21:54:52 UTC 2016


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 4cfd73e0a6160d035e5dec6942410c66bf4f2532
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Tue Jan 19 10:14:26 2016 +0100

    debianization: Files-Excluded machinery migration
---
 debian/changelog |  13 ++++++
 debian/copyright |  38 +++++++++++++++-
 debian/repack    | 134 -------------------------------------------------------
 debian/rules     |   2 +-
 debian/watch     |   5 +--
 5 files changed, 53 insertions(+), 139 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1c3d794..13a687a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+gap-io (4.4.4+ds-3) UNRELEASED; urgency=medium
+
+  * Debianization:
+    - debian/copyright:
+      - repack by using the Files-Excluded machinery instead of the ad-hoc
+        script debian/repack;
+      - refresh;
+    - debian/repack, discard (see above);
+    - debian/watch:
+      - revisit (see above).
+
+ -- Jerome Benoit <calculus at rezozer.net>  Tue, 19 Jan 2016 09:09:40 +0000
+
 gap-io (4.4.4+ds-2) unstable; urgency=medium
 
   * Upload to unstable.
diff --git a/debian/copyright b/debian/copyright
index 4a5be47..4922ae4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,6 +11,42 @@ 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-Excluded:
+ .travis.yml
+ .mailmap
+ test/test.c
+ configure_like_gap
+ m4/lt~obsolete.m4
+ m4/ltsugar.m4
+ m4/ltoptions.m4
+ m4/ltversion.m4
+ m4/libtool.m4
+ cnf/ltmain.sh
+ cnf/pkgconfig.h.in
+ cnf/compile
+ cnf/ar-lib
+ cnf/missing
+ cnf/depcomp
+ cnf/install-sh
+ cnf/config.guess
+ cnf/config.sub
+ aclocal.m4
+ configure
+ Makefile.in
+ doc/chap*.txt
+ doc/chap*.html
+ doc/chooser.html
+ doc/manual.pdf
+ doc/manual.six
+ doc/lefttoc.css
+ doc/manual.css
+ doc/manual.js
+ doc/nocolorprompt.css
+ doc/ragged.css
+ doc/rainbow.js
+ doc/times.css
+ doc/toggless.css
+ doc/toggless.js
 
 Files: *
 Copyright:
@@ -19,7 +55,7 @@ License: GPL-3+
 
 Files: debian/*
 Copyright:
- 2014 Jerome Benoit <calculus at rezozer.net>
+ 2014-2016 Jerome Benoit <calculus at rezozer.net>
 License: GPL-3+
 
 License: GPL-3+
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index 19a8393..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash
-
-PACKAGE_NAME=gap-io
-
-set -e
-set -u
-
-usage() {
-	echo "Usage: repack --upstream-version <ver> <downloaded file>"
-	exit 1
-	}
-
-if [ "$#" != "3" ]; then
-	usage
-fi
-if [ "$1" != "--upstream-version" ]; then
-	usage
-fi
-if [ ! -f "$3" ]; then
-	if [ -n "$3" ]; then
-		echo "$3 doesn't exist"
-	fi
-	usage
-fi
-UPSTREAM_VERSION="$2"
-UPSTREAM_TARBALLZZ="$3"
-
-DEBIAN_SUFFIX="+ds"
-##DEBIAN_SUFFIX="+ds1"
-####DEBIAN_ENCAPSULATEDFOLDERNAME="${PACKAGE_NAME}-usrc"
-
-DEBIAN_UVERSION=${UPSTREAM_VERSION}${DEBIAN_SUFFIX}
-DEBIAN_ROOTFOLDERNAME="${PACKAGE_NAME}-${DEBIAN_UVERSION}.orig"
-DEBIAN_TARBALLXZ="$(dirname $UPSTREAM_TARBALLZZ)/${PACKAGE_NAME}_${DEBIAN_UVERSION}.orig.tar.xz"
-
-REPACK_TMPDIR=`mktemp -d ./repackXXXXXX`
-REPACK_TMPDIR=$(readlink -f "$REPACK_TMPDIR")
-trap "/bin/rm -rf \"$REPACK_TMPDIR\"" QUIT INT EXIT
-
-message() {
-	echo
-	echo "-- -- $1"
-	echo
-	}
-
-message "Repackaging $UPSTREAM_TARBALLZZ"
-
-UPSTREAM_ROOTFOLDER="${REPACK_TMPDIR}/unpacked"
-mkdir "${UPSTREAM_ROOTFOLDER}"
-tar -C "${UPSTREAM_ROOTFOLDER}" -xf "${UPSTREAM_TARBALLZZ}" || unzip -d "${UPSTREAM_ROOTFOLDER}" "${UPSTREAM_TARBALLZZ}"
-if [ `ls -1 "${UPSTREAM_ROOTFOLDER}" | wc -l` -eq 1 ]; then
-	UPSTREAM_ROOTFOLDER="${UPSTREAM_ROOTFOLDER}/`ls -1 "${UPSTREAM_ROOTFOLDER}"`"
-fi
-
-DEBIAN_ROOTFOLDER="${REPACK_TMPDIR}/${DEBIAN_ROOTFOLDERNAME}"
-## repack
-####set -f
-REPACK_WORKING_FOLDER=$(pwd)
-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
-## mimic autoreconf clean up
-rm --verbose --force -- m4/lt~obsolete.m4
-rm --verbose --force -- m4/ltsugar.m4
-rm --verbose --force -- m4/ltoptions.m4
-rm --verbose --force -- m4/ltversion.m4
-rm --verbose --force -- m4/libtool.m4
-rm --verbose --force -- cnf/ltmain.sh
-rm --verbose --force -- cnf/pkgconfig.h.in
-rm --verbose --force -- cnf/compile
-rm --verbose --force -- cnf/ar-lib
-rm --verbose --force -- cnf/missing
-rm --verbose --force -- cnf/depcomp
-rm --verbose --force -- cnf/install-sh
-rm --verbose --force -- cnf/config.guess
-rm --verbose --force -- cnf/config.sub
-rm --verbose --recursive --force -- autom4te.cache
-rm --verbose --force -- aclocal.m4
-rm --verbose --force -- configure
-rm --verbose --force -- Makefile.in
-####rm --verbose --force -- Makefile
-## mimic make clean up
-rm --verbose --force -- doc/chap*.txt
-rm --verbose --force -- doc/chap*.html
-rm --verbose --force -- doc/chooser.html
-####rm --verbose --force -- doc/io.{tex,aux,toc,log,bbl,blg,ind,idx,ilg}
-####rm --verbose --force -- doc/io.pnr
-rm --verbose --force -- doc/manual.{pdf,six,lab}
-rm --verbose --force -- doc/lefttoc.css
-rm --verbose --force -- doc/manual.{css,js}
-rm --verbose --force -- doc/nocolorprompt.css
-rm --verbose --force -- doc/ragged.css
-rm --verbose --force -- doc/rainbow.js
-rm --verbose --force -- doc/times.css
-rm --verbose --force -- doc/toggless.{css,js}
-#:
-
-cd ${REPACK_WORKING_FOLDER}
-set +f
-## end
-####if [ -n "${DEBIAN_ENCAPSULATEDFOLDERNAME}" ]; then
-####	mkdir "${DEBIAN_ROOTFOLDER}"
-####	mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}/${DEBIAN_ENCAPSULATEDFOLDERNAME}"
-####else
-	mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}"
-####fi
-
-REPACK_TARBALL="${REPACK_TMPDIR}/repacked.tar"
-REPACK_TARBALLXZ="${REPACK_TARBALL}.xz"
-( cd "${REPACK_TMPDIR}" && \
-	find -L "${DEBIAN_ROOTFOLDERNAME}" -xdev -type f -print | sort | \
-	tar -T-  --owner=root --group=root --mode=a+rX --create --file "${REPACK_TARBALL}" \
-	)
-xz -9e < "${REPACK_TARBALL}" > "${REPACK_TARBALLXZ}"
-mv "${REPACK_TARBALLXZ}" "${DEBIAN_TARBALLXZ}"
-
-message "Testing ${DEBIAN_TARBALLXZ}"
-
-xz --verbose --test "${DEBIAN_TARBALLXZ}"
-
-message "Printing information about ${DEBIAN_TARBALLXZ}"
-
-xz --verbose --list "${DEBIAN_TARBALLXZ}"
-
-message "Quitting"
-
-##
-## eos
diff --git a/debian/rules b/debian/rules
index a45d895..eb6b91b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,4 +28,4 @@ override_dh_installchangelogs:
 	dh_installchangelogs --keep CHANGES
 
 get-orig-source:
-	uscan --no-conf --download-current-version --verbose
+	uscan --no-conf --download-current-version --compression xz --verbose
diff --git a/debian/watch b/debian/watch
index 3f37e45..6d57302 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
 version=3
-opts=dversionmangle=s/\+ds[\d]?// \
-https://github.com/gap-system/io/releases .*/io-(\d\S*)\.tar\.bz2 \
-debian bash debian/repack
+opts=dversionmangle=s/\+ds[\d]?//,repacksuffix=+ds \
+https://github.com/gap-system/io/releases .*/io-(\d\S*)\.tar\.bz2

-- 
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