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

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

    Date: Wednesday, June 8, 2011 @ 06:57:10
  Author: johannr-guest
Revision: 7156

Add +ds to version number and update rules and watch as necessary.

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

Modified: packages/preprocess/trunk/debian/changelog
===================================================================
--- packages/preprocess/trunk/debian/changelog	2011-06-07 21:15:07 UTC (rev 7155)
+++ packages/preprocess/trunk/debian/changelog	2011-06-08 06:57:10 UTC (rev 7156)
@@ -1,4 +1,4 @@
-preprocess (1.1.0-1) UNRELEASED; urgency=low
+preprocess (1.1.0+ds-1) UNRELEASED; urgency=low
 
   [ Johannes Ring ]
   * Initial release (Closes: #620701)
@@ -6,4 +6,4 @@
   [ Stefano Rivera ]
   * Set DM-Upload-Allowed: yes
 
- -- Johannes Ring <johannr at simula.no>  Tue, 26 Apr 2011 18:44:40 +0200
+ -- Johannes Ring <johannr at simula.no>  Wed, 08 Jun 2011 08:15:09 +0200

Modified: packages/preprocess/trunk/debian/rules
===================================================================
--- packages/preprocess/trunk/debian/rules	2011-06-07 21:15:07 UTC (rev 7155)
+++ packages/preprocess/trunk/debian/rules	2011-06-08 06:57:10 UTC (rev 7156)
@@ -23,15 +23,19 @@
 	-find $(CURDIR) -name "*.pyc" | xargs rm -rf
 	-rm -rf $(CURDIR)/test/tmp
 
+DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\+ds.*$$//p')
+
 get-orig-source:
 	rm -rf $@
 	mkdir $@
 	uscan --no-conf --force-download --verbose --destdir $@ \
-	  --download-version $(DEB_UPSTREAM_VERSION) \
-	  --upstream-version $(DEB_UPSTREAM_VERSION)
-	unzip -o $@/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).zip -d $@
-	rm -f $@/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)/bin/preprocess.exe
+	  --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) \
+	  --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION)
+	unzip -o $@/$(DEB_SOURCE_PACKAGE)-$(DEB_STRIPPED_UPSTREAM_VERSION).zip -d $@
+	rm -f $@/$(DEB_SOURCE_PACKAGE)-$(DEB_STRIPPED_UPSTREAM_VERSION)/bin/preprocess.exe
+	mv $@/$(DEB_SOURCE_PACKAGE)-$(DEB_STRIPPED_UPSTREAM_VERSION) \
+	  $@/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
 	cd $@ && GZIP=--best tar -cz --owner root --group root --mode a+rX -f \
 	  ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
-	  $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)
+	  $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig
 	rm -r $@

Modified: packages/preprocess/trunk/debian/watch
===================================================================
--- packages/preprocess/trunk/debian/watch	2011-06-07 21:15:07 UTC (rev 7155)
+++ packages/preprocess/trunk/debian/watch	2011-06-08 06:57:10 UTC (rev 7156)
@@ -1,3 +1,4 @@
 version=3
-http://code.google.com/p/preprocess/downloads/list \
-http://preprocess.googlecode.com/files/preprocess-([\d.]+)\.zip
+opts=dversionmangle=s/\+ds// \
+ http://code.google.com/p/preprocess/downloads/list \
+ http://preprocess.googlecode.com/files/preprocess-([\d.]+)\.zip