[bibtool] 01/06: Imported Debian pre-patch 2.61+ds-1
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository bibtool.
commit 46571dca945cd1a177fb213d0fb196480355bf99
Author: Jerome Benoit <calculus@rezozer.net>
Date: Tue Jul 21 03:47:27 2015 +0200
Imported Debian pre-patch 2.61+ds-1
---
debian/changelog | 13 ++++++++
debian/copyright | 37 +++++++++++++++-------
debian/repack | 93 --------------------------------------------------------
debian/rules | 2 +-
debian/watch | 5 ++-
5 files changed, 42 insertions(+), 108 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 37c9ce5..e19e5e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+bibtool (2.61+ds-1) 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).
+
+ -- Jerome Benoit <calculus@rezozer.net> Tue, 21 Jul 2015 00:18:17 +0000
+
bibtool (2.60+ds-1) unstable; urgency=medium
* New upstream version.
diff --git a/debian/copyright b/debian/copyright
index 51eb7ac..e0e8f0a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,9 +10,34 @@ Comment:
by wiping out the included third-party old library regex-0.12 source, which
is unnecessary as Debian uses regex from glibc, related material meant
for non UN*X systems, and regenerated material.
+Files-Excluded:
+ regex-0.12
+ MSDOS
+ makefile.ami
+ makefile.ata
+ makefile.dos
+ makefile.unx
+ doc/config.tex
+ doc/c_main.tex
+ doc/c.tex
+ include/bibtool/config.h
+ AutoConf/config.h.in
+ configure
Files: *
-Copyright: 1996-2014 Gerd Neugebauer <gene@gerd-neugebauer.de>
+Copyright: 1996-2015 Gerd Neugebauer <gene@gerd-neugebauer.de>
+License: GPL-1+
+
+Files: debian/*
+Copyright:
+ 2012-2015 Jerome Benoit <calculus@rezozer.net>
+ 2005-2006 Henning Makholm <henning@makholm.net>
+ 1996-2002 Brian Mays <brian@debian.org>
+License: GPL-2+
+Comment:
+ This package was originally assembled by Brian Mays <brian@debian.org>
+ and later significantly revamped by Henning Makholm <henning@makholm.net>.
+
License: GPL-1+
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,16 +55,6 @@ License: GPL-1+
On Debian systems, the complete text of the GNU General
Public License version 1 can be found in "/usr/share/common-licenses/GPL-1".
-Files: debian/*
-Copyright:
- 2012-2014 Jerome Benoit <calculus@rezozer.net>
- 2005-2006 Henning Makholm <henning@makholm.net>
- 1996-2002 Brian Mays <brian@debian.org>
-License: GPL-2+
-Comment:
- This package was originally assembled by Brian Mays <brian@debian.org>
- and later significantly revamped by Henning Makholm <henning@makholm.net>.
-
License: GPL-2+
This package is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
diff --git a/debian/repack b/debian/repack
deleted file mode 100755
index e68966f..0000000
--- a/debian/repack
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/bin/sh
-
-PACKAGE_NAME=bibtool
-
-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_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 --recursive -- regex-0.12 MSDOS
-rm --verbose --force -- makefile.ami makefile.ata makefile.dos makefile.unx
-## clean up
-rm --verbose --force doc/config.tex
-rm --verbose --force doc/c_main.tex
-rm --verbose --force doc/c.tex
-rm --verbose --force include/bibtool/config.h
-rm --verbose --force AutoConf/config.h.in
-rm --verbose --force configure
-
-cd ${REPACK_WORKING_FOLDER}
-set +f
-## end
-mv "${UPSTREAM_ROOTFOLDER}" "${DEBIAN_ROOTFOLDER}"
-
-REPACK_TARBALL="${REPACK_TMPDIR}/repacked.tar"
-REPACK_TARBALLXZ="${REPACK_TARBALL}.xz"
-tar -C "${REPACK_TMPDIR}" -cf "${REPACK_TARBALL}" "${DEBIAN_ROOTFOLDERNAME}"
-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 f67e031..bb230e3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,4 +15,4 @@ override_dh_compress:
dh_compress -X.pdf
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 61d4349..b314859 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,3 @@
version=3
-opts="uversionmangle=s/_/\./,dversionmangle=s/~cvs\d+//;s/\+ds//,pgpsigurlmangle=s/$/.asc/" \
-http://mirrors.ctan.org/biblio/bibtex/utils/bibtool/BibTool-([\d.]+)\.tar\.gz \
-debian sh debian/repack
+opts=dversionmangle=s/\+ds$//,repacksuffix=+ds,pgpsigurlmangle=s/$/.asc/ \
+http://mirrors.ctan.org/biblio/bibtex/utils/bibtool/ (?:|.*/)BibTool(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|txz|tar\.bz2|tbz2|tar\.gz|tgz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/bibtool.git
Reply to: