[Python-apps-commits] r9132 - in packages/xpra/trunk/debian (changelog repack rules watch)

[aelmahmoudy-guest at users.alioth.debian.org]

    Date: Wednesday, September 19, 2012 @ 09:54:51
  Author: aelmahmoudy-guest
Revision: 9132

* debian/watch: corrected version mangle (Closes: #674964)
* Removing debian/repack in favour of get-orig-source

Thanks: Dmitry Smirnov <onlyjob at member.fsf.org>

Modified:
  packages/xpra/trunk/debian/changelog
  packages/xpra/trunk/debian/rules
  packages/xpra/trunk/debian/watch
Deleted:
  packages/xpra/trunk/debian/repack

Modified: packages/xpra/trunk/debian/changelog
===================================================================
--- packages/xpra/trunk/debian/changelog	2012-09-19 09:07:17 UTC (rev 9131)
+++ packages/xpra/trunk/debian/changelog	2012-09-19 09:54:51 UTC (rev 9132)
@@ -12,8 +12,10 @@
   * Publicly expose xpra modules.
     + Dropped private-pkg.diff patch.
     + debian/xpra.install: install xpra modules publicly.
+  * debian/watch: corrected version mangle (Closes: #674964)
+  * Removing debian/repack in favour of get-orig-source
 
- -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Wed, 19 Sep 2012 11:01:19 +0200
+ -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmoudy at sabily.org>  Wed, 19 Sep 2012 11:51:08 +0200
 
 xpra (0.3.6+dfsg-1) unstable; urgency=low
 

Deleted: packages/xpra/trunk/debian/repack
===================================================================
--- packages/xpra/trunk/debian/repack	2012-09-19 09:07:17 UTC (rev 9131)
+++ packages/xpra/trunk/debian/repack	2012-09-19 09:54:51 UTC (rev 9132)
@@ -1,60 +0,0 @@
-#!/bin/bash --
-
-set -e
-
-VERSION=$2
-TARBALL="`readlink -f "$3"`"
-
-TMPDIR=`mktemp -d`
-
-cd "$TMPDIR"
-
-if [ -n "$VERBOSE" ]; then
-	echo "Repacking tarball $TARBALL"
-fi
-
-if grep tar.gz$ <<< $TARBALL &>/dev/null; then
-	TYPE=gzip
-	tar zxf "$TARBALL"
-elif grep tar.bz2$ <<< $TARBALL &>/dev/null; then
-	TYPE=bzip2
-	tar jxf "$TARBALL"
-elif grep zip$ <<< $TARBALL &>/dev/null; then
-	TYPE=zip
-	unzip -qq "$TARBALL"
-else
-	echo "Do not know how to unpack $TARBALL (expecting tar.gz, tar.bz2 or zip)"
-fi
-
-SUBDIR=
-if [ "`ls -1 | wc -l`" = "1" ]; then
-	cd *
-	SUBDIR=true
-fi
-
-rm -rf working-notes/specs/
-
-if [ -n "$SUBDIR" ]; then
-	cd ..
-fi
-
-rm -f "$TARBALL"
-
-case "$TYPE" in 
-gzip)
-	tar zcf "$TARBALL" *
-	;;
-bzip2)
-	tar jcf "$TARBALL" *
-	;;
-zip)
-	tar zcf "${TARBALL%.zip}.tar.gz" *
-	;;
-esac
-
-cd /
-rm -rf "$TMPDIR"
-
-if [ -n "$VERBOSE" ]; then
-	echo "done"
-fi

Modified: packages/xpra/trunk/debian/rules
===================================================================
--- packages/xpra/trunk/debian/rules	2012-09-19 09:07:17 UTC (rev 9131)
+++ packages/xpra/trunk/debian/rules	2012-09-19 09:54:51 UTC (rev 9132)
@@ -9,3 +9,29 @@
 
 override_dh_installchangelogs:
 	dh_installchangelogs NEWS
+
+PKG := xpra
+DTYPE := +dfsg
+DPATH := $(abspath $(dir $(MAKEFILE_LIST)))
+VER := $(shell dpkg-parsechangelog -l$(DPATH)/changelog | perl -ne 'print $$1 if m{Version:\s*([\d\.]+)}')
+.PHONY: get-orig-source
+get-orig-source: $(PKG)_$(VER)$(DTYPE).orig.tar.xz
+	@
+
+$(PKG)_$(VER)$(DTYPE).orig.tar.xz:
+	@echo "# Downloading..."
+	uscan --noconf --verbose --rename --destdir=$(CURDIR) --check-dirname-level=0 --force-download --download-version $(VER) $(DPATH)
+	@echo "# Extracting..."
+	mkdir $(PKG)-$(VER) \
+	&& tar xf $(PKG)_$(VER).orig.tar.* --directory $(PKG)-$(VER) --strip-components 1 \
+	|| $(RM) -r $(PKG)-$(VER)
+	@echo "# Clean-up..."
+	cd $(PKG)-$(VER) \
+	&& $(RM) -r -v \
+             */*.bmp \
+             */.ico \
+             */*.ico \
+             working-notes/specs
+	@echo "# Packing..."
+	tar cJf "$(PKG)_$(VER)$(DTYPE).orig.tar.xz" "$(PKG)-$(VER)" \
+	&& $(RM) -r "$(PKG)-$(VER)"

Modified: packages/xpra/trunk/debian/watch
===================================================================
--- packages/xpra/trunk/debian/watch	2012-09-19 09:07:17 UTC (rev 9131)
+++ packages/xpra/trunk/debian/watch	2012-09-19 09:54:51 UTC (rev 9132)
@@ -1,7 +1,6 @@
 version=3
-opts="uversionmangle=s/$/\+dfsg/," \
-  http://winswitch.org/src/ xpra-(.*)\.tar\.bz2 \
-  debian ./debian/repack
+opts="dversionmangle=s/\+dfsg//" \
+  http://winswitch.org/src/ xpra-(.*)\.tar\.(?:bz2|xz|gz)
 
 #http://code.google.com/p/partiwm/downloads/list \
 #  http://partiwm.googlecode.com/files/parti-all-(.*)\.tar\.gz \