[med-svn] r14932 - trunk/packages/pdb2pqr/trunk/debian

[Andreas Tille]

Author: tille
Date: 2013-10-24 08:27:12 +0000 (Thu, 24 Oct 2013)
New Revision: 14932

Modified:
   trunk/packages/pdb2pqr/trunk/debian/changelog
   trunk/packages/pdb2pqr/trunk/debian/rules
   trunk/packages/pdb2pqr/trunk/debian/watch
Log:
Use enhanced uscan to repack the source


Modified: trunk/packages/pdb2pqr/trunk/debian/changelog
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/changelog	2013-10-24 07:56:31 UTC (rev 14931)
+++ trunk/packages/pdb2pqr/trunk/debian/changelog	2013-10-24 08:27:12 UTC (rev 14932)
@@ -1,4 +1,4 @@
-pdb2pqr (1.8-2) UNRELEASED; urgency=low
+pdb2pqr (1.8+dfsg-1) UNRELEASED; urgency=low
 
   [ Manuel Prinz ]
   * Fixed build issues on HURD. Thanks to Barry deFreese for the patch!
@@ -7,6 +7,9 @@
     debian/rules.
 
   [ Andreas Tille ]
+  * Use '+dfsg' appendix to mark repackaged upstream source (adapted
+    debian/watch)
+  * debian/rules: Repackaging is done using enhanced uscan
   * debian/control:
      - cme fix dpkg-control
      - canonical Vcs fields

Modified: trunk/packages/pdb2pqr/trunk/debian/rules
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/rules	2013-10-24 07:56:31 UTC (rev 14931)
+++ trunk/packages/pdb2pqr/trunk/debian/rules	2013-10-24 08:27:12 UTC (rev 14932)
@@ -59,14 +59,10 @@
 	chmod 0644 debian/pdb2pqr/usr/share/pdb2pqr/pdb2pka/pKa_utility_functions_compat.py
 	chmod 0755 debian/pdb2pqr/usr/share/pdb2pqr/propka30/propka.py
 
-.PHONY: get-orig-source
+# Remark: The following uscan command requires devscripts > 2.12.4 which is not
+#         yet released at the time of this package release.  The code can be obtained
+#         via
+#   git clone git://tille@git.debian.org/git/users/tille/devscripts.git
+#         and then use scripts/uscan.pl
 get-orig-source:
-	rm -rf get-orig-source
-	mkdir -p get-orig-source
-	uscan --no-conf --no-symlink --force-download --download-current-version --destdir=get-orig-source
-	tar xzf get-orig-source/$(PACKAGE)-$(UPSTREAM).tar.gz -C get-orig-source \
-		--exclude="contrib" \
-		--exclude="jmol"
-	mv get-orig-source/$(PACKAGE)-$(UPSTREAM) get-orig-source/$(PACKAGE)-$(UPSTREAM).repack
-	GZIP='--best --no-name' tar czf ../$(PACKAGE)_$(UPSTREAM).orig.tar.gz -C get-orig-source $(PACKAGE)-$(UPSTREAM).repack
-	rm -rf get-orig-source
+	uscan --verbose --force-download --repack-compression xz

Modified: trunk/packages/pdb2pqr/trunk/debian/watch
===================================================================
--- trunk/packages/pdb2pqr/trunk/debian/watch	2013-10-24 07:56:31 UTC (rev 14931)
+++ trunk/packages/pdb2pqr/trunk/debian/watch	2013-10-24 08:27:12 UTC (rev 14932)
@@ -1,2 +1,3 @@
 version=3
-http://sf.net/pdb2pqr/pdb2pqr-(.*)\.tar\.gz
+opts=dversionmangle=s/[~+]dfsg[0-9]*// \
+  http://sf.net/pdb2pqr/pdb2pqr-(.*)\.tar\.gz