[Python-apps-commits] r8940 - in packages/hotssh/trunk/debian (changelog rules watch)

[vicho at users.alioth.debian.org]

    Date: Saturday, July 14, 2012 @ 14:40:24
  Author: vicho
Revision: 8940

Fix "Doesn't contain source for waf binary code" by repacking the source with the binary tarball unpacked (Closes: #654475)

Modified:
  packages/hotssh/trunk/debian/changelog
  packages/hotssh/trunk/debian/rules
  packages/hotssh/trunk/debian/watch

Modified: packages/hotssh/trunk/debian/changelog
===================================================================
--- packages/hotssh/trunk/debian/changelog	2012-07-13 15:22:17 UTC (rev 8939)
+++ packages/hotssh/trunk/debian/changelog	2012-07-14 14:40:24 UTC (rev 8940)
@@ -1,3 +1,11 @@
+hotssh (0.2.6+dfsg1-1) UNRELEASED; urgency=low
+
+  * Team upload.
+  * Fix "Doesn't contain source for waf binary code" by repacking the
+    source with the binary tarball unpacked (Closes: #654475)
+
+ -- Javi Merino <vicho at debian.org>  Mon, 09 Jul 2012 18:37:23 -0600
+
 hotssh (0.2.6-2) unstable; urgency=low
 
   * build-deps changed: rarian-compat instead of scrollkeeper (Closes: #526121)

Modified: packages/hotssh/trunk/debian/rules
===================================================================
--- packages/hotssh/trunk/debian/rules	2012-07-13 15:22:17 UTC (rev 8939)
+++ packages/hotssh/trunk/debian/rules	2012-07-14 14:40:24 UTC (rev 8940)
@@ -1,5 +1,21 @@
 #!/usr/bin/make -f
 
+# get-orig-source to drop waf (see: http://bugs.debian.org/654475)
+upstream_version ?= $(shell dpkg-parsechangelog | sed -rne 's/^Version: ([0-9.]+)(\+dfsg\d+)?.*$$/\1/p')
+dfsg_version = $(upstream_version)+dfsg1
+pkg = $(shell dpkg-parsechangelog | sed -ne 's/^Source: //p')
+
+get-orig-source:
+	uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
+	tar -xzf $(pkg)_$(upstream_version).orig.tar.gz
+	mv $(pkg)-$(upstream_version) $(pkg)-$(dfsg_version)
+	cd $(pkg)-$(dfsg_version) ; python waf --help > /dev/null
+	mv $(pkg)-$(dfsg_version)/.waf-*/* $(pkg)-$(dfsg_version)
+	sed -i '/^#==>$$/,$$d' $(pkg)-$(dfsg_version)/waf
+	rmdir $(pkg)-$(dfsg_version)/.waf-*
+	GZIP="-9fn" tar -czf $(pkg)_$(dfsg_version).orig.tar.gz $(pkg)-$(dfsg_version)
+	rm -rf $(pkg)-$(dfsg_version)
+
 build:
 
 clean:

Modified: packages/hotssh/trunk/debian/watch
===================================================================
--- packages/hotssh/trunk/debian/watch	2012-07-13 15:22:17 UTC (rev 8939)
+++ packages/hotssh/trunk/debian/watch	2012-07-14 14:40:24 UTC (rev 8940)
@@ -1,2 +1,3 @@
 version=2
+opts=dversionmangle=s/\+dfsg\d+$// \
 http://ftp.gnome.org/pub/GNOME/sources/hotssh/0.2/hotssh-(.+)\.tar\.gz