[SCM] Debian packaging of pmtools branch, master, updated. upstream/1.20-40-ga33a3de

[Axel Beckert]

The following commit has been merged in the master branch:
commit 51cd51c4b3d96d8584d1a9f5788fae9415a4c39d
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 11 02:03:18 2012 +0100

    No more repacking needed. Cleanup debian/rules and README.source

diff --git a/debian/README.source b/debian/README.source
index 2edc0cf..ad24367 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -1,9 +1,18 @@
-Package needed repackaging since the upstream tar ball contained one
-file twice which dpkg-source can't handle.
+The package once needed repacking due to one file being twice in the
+upstream tar ball. While tar copes with it, dpkg doesn't and hence the
+repacking was necessary.
 
-You can generate the orig.tar.gz by downloading the upstream tar ball
-(pmtools-1.1.0.tar.gz) and calling debian/rules' get-orig-source
-target. It just unpacks the upstream tar ball to a temporary
-directory, renames it and repacks it again.
+To check if repacking is necessary again (e.g. after strange dpkg
+unpacking failures), run the following command:
 
- -- Axel Beckert <abe at debian.org>, Sat,  3 Apr 2010 01:16:50 +0200
+$ tar tzf ../pmtools-1.10.tar.gz | sort | uniq -c | sort -n | egrep -v '^ *1 '
+      2 pmtools-1.10/Devel/Loaded.pm
+
+(Example above with the known to be affected upstream tarball.)
+
+If this command gives some output, a repacking is likely necessary
+again. The according debian/rules get-orig-source target can be found
+either in the git repository or in the 1.10+ds1-1 version of this
+package on http://snapshot.debian.org/.
+
+ -- Axel Beckert <abe at debian.org>, Tue, 11 Dec 2012 01:58:57 +0100
diff --git a/debian/changelog b/debian/changelog
index bc20e66..a907341 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,6 @@ pmtools (1.20-1) UNRELEASED; urgency=low
   TODO:
   - Copyright years and holder for pmcheck
   - Obsoltete Changelog entry for DEP5 Format-Specification URL
-  - If the orig.tar.gz tarball does not need to be repackaged
-    anymore we should cleanup README.source and debian/rules
 
   [ Ansgar Burchardt ]
   * debian/control: Convert Vcs-* fields to Git.
@@ -20,7 +18,10 @@ pmtools (1.20-1) UNRELEASED; urgency=low
   * Update debian/copyright (license and format)
   * Update source format to 3.0 (quilt)
 
- -- Xavier Guimard <x.guimard at free.fr>  Sun, 09 Dec 2012 21:34:15 +0100
+  [ Axel Beckert ]
+  * No more repacking needed. Cleanup debian/rules and README.source.
+
+ -- Axel Beckert <abe at debian.org>  Tue, 11 Dec 2012 02:00:15 +0100
 
 pmtools (1.10+ds1-2) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index e28298c..c22af56 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,16 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-ORIGVERSION=1.10
-DEBSOURCEVERSION=ds1
-# We have to repack the source because 
-get-orig-source:
-	mkdir -p debian/tmp
-	tar xvzf ../pmtools-$(ORIGVERSION).tar.gz -C debian/tmp
-	mv -vi debian/tmp/pmtools-$(ORIGVERSION) debian/tmp/pmtools-$(ORIGVERSION)+$(DEBSOURCEVERSION).orig
-	tar cvzf ../pmtools_$(ORIGVERSION)+$(DEBSOURCEVERSION).orig.tar.gz -C debian/tmp pmtools-$(ORIGVERSION)+$(DEBSOURCEVERSION).orig
-	rm -rf debian/tmp
-
 %:
 	dh $@
 

-- 
Debian packaging of pmtools