[nauty] 01/04: Imported Debian pre-patch 2.6r3+ds-0
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Mar 19 16:53:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository nauty.
commit 42994c297e4538b1159fd16a57b442499e9f2368
Author: Jerome BENOIT <calculus at rezozer.net>
Date: Sat Feb 27 22:05:37 2016 +0100
Imported Debian pre-patch 2.6r3+ds-0
---
debian/changelog | 16 +++++++++
debian/copyright | 19 +++++++---
debian/repack | 104 -------------------------------------------------------
debian/rules | 2 +-
debian/watch | 7 ++--
5 files changed, 34 insertions(+), 114 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 59e2b70..e4e3899 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+nauty (2.6r3+ds-0) UNRELEASED; urgency=medium
+
+ * New upstream version.
+ * 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);
+ - debian/rules:
+ - get-orig-source target, revisit (see above).
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 18 Mar 2016 20:45:37 +0000
+
nauty (2.5r9+ds-1) unstable; urgency=low
* New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 19e1916..b9c69bd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,25 +13,34 @@ Disclaimer:
Comment:
The upstream source tarball is repacked to drop off some weight
by cleaning up material either generated or upgraded by autotools.
+Files-Excluded:
+ install-sh
+ config.guess
+ config.sub
+ configure
+ makefile
+ gtools.h
+ naututil.h
+ nauty.h
Files: *
Copyright:
- 1984-2013 Brendan McKay <bdm at cs.anu.edu.au>
+ 1984-2016 Brendan McKay <bdm at cs.anu.edu.au>
License: BDM-adhoc
Files: traces.c
Copyright:
- 2008-2013 Adolfo Piperno <piperno at di.uniroma1.it>
+ 2008-2016 Adolfo Piperno <piperno at di.uniroma1.it>
License: BDM-adhoc
Files: watercluster2.c
Copyright:
- 2009-2013 Gunnar Brinkmann <gunnar.brinkmann at ugent.be>
+ 2009-2016 Gunnar Brinkmann <gunnar.brinkmann at ugent.be>
License: BDM-adhoc
Files: planarity.c
Copyright:
- 2001-2013 Magna project
+ 2001-2016 Magna project
License: ad-hoc
planarity.c - code for planarity testing of undirected graphs.
Method of Boyer and Myrvold, programmed by Paulette Lieby.
@@ -40,7 +49,7 @@ License: ad-hoc
Files: debian/*
Copyright:
- 2013 Jerome Benoit <calculus at rezozer.net>
+ 2013-2016 Jerome Benoit <calculus at rezozer.net>
2009-2012 David Bremner <bremner at unb.ca>
License: MIT
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index 67e025c..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/sh
-
-PACKAGE_NAME=nauty
-
-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_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 -- makefile.basic
-## clean up
-rm --verbose --force -- install-sh
-rm --verbose --force -- config.guess
-rm --verbose --force -- config.sub
-rm --verbose --force -- configure
-rm --verbose --force -- makefile
-rm --verbose --force -- gtools.h
-rm --verbose --force -- naututil.h
-rm --verbose --force -- nauty.h
-#:
-
-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 c908901..ff04a98 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,4 +20,4 @@ override_dh_strip:
dh_strip --dbg-package=libnauty2-dbg
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 64c9e38..4b947bb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
-version=3
-opts=uversionmangle=s/^(\d)(\d*(?:(?:rc|r|beta|b)\d*)?)$/$1.$2/,dversionmangle=s/\+ds// \
-http://pallini.di.uniroma1.it/nauty(\d.*)\.tar\.(?:gz|bz2|xz) \
-debian sh debian/repack
+version=4
+opts=repack,uversionmangle=s/^(\d)(\d*(?:(?:rc|r|beta|b)\d*)?)$/$1.$2/,dversionmangle=s/\+ds//,repacksuffix=+ds \
+http://pallini.di.uniroma1.it/nauty(\d.*)\.tar\.(?:xz|bz2|gz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/nauty.git
More information about the debian-science-commits
mailing list