[gap-guava] 03/05: Refine repack machinery

[Jerome Benoit]

This is an automated email from the git hooks/post-receive script.

calculus-guest pushed a commit to branch master
in repository gap-guava.

commit 0698fc42d2972687600b37aed218b6b21b759b9a
Author: Jerome Benoit <calculus at rezozer.net>
Date:   Sat Sep 13 11:51:25 2014 +0200

    Refine repack machinery
---
 debian/changelog | 4 ++--
 debian/repack    | 5 +++--
 debian/watch     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac89542..bf52acf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gap-guava (3.12+ds-1) unstable; urgency=medium
+gap-guava (3.12+ds1-1) unstable; urgency=medium
 
   * New upstream version (Closes: #493694).
   * New maintainer (Closes: #760345).
@@ -26,7 +26,7 @@ gap-guava (3.12+ds-1) unstable; urgency=medium
         an multi-arch package as gap is not (yet) multi-arch;
   * Minor, cosmetic fixes submitted to the upstream maintainers.
 
- -- Jerome Benoit <calculus at rezozer.net>  Thu, 11 Sep 2014 20:48:40 +0000
+ -- Jerome Benoit <calculus at rezozer.net>  Sat, 13 Sep 2014 09:42:12 +0000
 
 guava (3.6-2) unstable; urgency=low
 
diff --git a/debian/repack b/debian/repack
index b0e73dc..30115d7 100755
--- a/debian/repack
+++ b/debian/repack
@@ -25,7 +25,7 @@ fi
 UPSTREAM_VERSION="$2"
 UPSTREAM_TARBALLZZ="$3"
 
-DEBIAN_SUFFIX="+ds"
+DEBIAN_SUFFIX="+ds1"
 ####DEBIAN_ENCAPSULATEDFOLDERNAME="${PACKAGE_NAME}-usrc"
 
 DEBIAN_UVERSION=${UPSTREAM_VERSION}${DEBIAN_SUFFIX}
@@ -65,7 +65,7 @@ rm --verbose --force -- guavapage/guava.ps
 rm --verbose --force -- htm/chap*.html
 rmdir --verbose --ignore-fail-on-non-empty -- guavapage
 rmdir --verbose --ignore-fail-on-non-empty -- htm
-rm --verbose --force -- src/leon/doc/leon_guava_manual.pdf
+rm --verbose --force -- src/leon/src/Makefile
 ## mimic autoreconf clean up
 rm --verbose --force --recursive -- src/leon/autom4te.cache
 rm --verbose --force -- src/leon/src/leon_config.h.in
@@ -77,6 +77,7 @@ rm --verbose --force -- src/leon/config.guess
 rm --verbose --force -- src/leon/config.sub
 rm --verbose --force -- src/leon/configure
 ## clean up
+rm --verbose --force -- src/leon/doc/leon_guava_manual.pdf
 rm --verbose --force -- doc/chap*.txt
 rm --verbose --force -- doc/chap*.html
 ####rm --verbose --force -- doc/chooser.html
diff --git a/debian/watch b/debian/watch
index 8173a3e..2ade4d9 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
 version=3
-opts=dversionmangle=s/\+ds// \
+opts=dversionmangle=s/\+ds[\d]?// \
 ftp://ftp.gap-system.org/pub/gap/gap4/tar.bz2/packages/guava-?([\d\.]+)\.tar\.bz2 \
 debian bash debian/repack

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-guava.git