[Pkg-cli-apps-commits] r4235 - in /packages/gnome-do-plugins/trunk/debian: changelog rules

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

Author: hanska-guest
Date: Fri Nov 28 22:06:39 2008
New Revision: 4235

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4235
Log:
Fixing get-orig-source target (and download-tarball) to be more
realiable, and make them work with svn-buildpackage out-of-the-box.

Modified:
    packages/gnome-do-plugins/trunk/debian/changelog
    packages/gnome-do-plugins/trunk/debian/rules

Modified: packages/gnome-do-plugins/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/changelog?rev=4235&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Fri Nov 28 22:06:39 2008
@@ -1,3 +1,10 @@
+gnome-do-plugins (0.6.0.1+dfsg-2) UNRELEASED; urgency=low
+
+  * Fixing get-orig-source target (and download-tarball) to be more
+    realiable, and make them work with svn-buildpackage out-of-the-box.
+
+ -- David Paleino <d.paleino at gmail.com>  Fri, 28 Nov 2008 23:04:00 +0100
+
 gnome-do-plugins (0.6.0.1+dfsg-1) experimental; urgency=low
 
   * New upstream version

Modified: packages/gnome-do-plugins/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/gnome-do-plugins/trunk/debian/rules?rev=4235&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Fri Nov 28 22:06:39 2008
@@ -55,10 +55,12 @@
 TEMP_DIR := $(shell mktemp -d)
 SOURCE_DIR = $(word 1, $(shell ls -d --group-directories-first $(TEMP_DIR)/*))
 SOURCE_VER = $(shell echo $(notdir $(SOURCE_DIR)) | sed s/gnome-do-plugins-//)
+CURVER = $(shell dpkg-parsechangelog | grep ^Version | cut -d" " -f2 | cut -d"-" -f1 | cut -d"+" -f1 )
 
 download-tarball:
 	uscan --download --package gnome-do-plugins --destdir=$(TEMP_DIR) \
-	      --no-symlink --upstream-version 0 --watchfile=$(dir $(_))/watch
+	      --no-symlink --force-download --download-version $(CURVER) \
+	      --watchfile=$(dir $(_))/watch
 	cd $(TEMP_DIR) && tar xzvf *.tar.gz
 
 strip-shipped-binaries: download-tarball
@@ -70,7 +72,8 @@
 			$(notdir $(SOURCE_DIR))
 
 get-orig-source: repack-source
-	mv $(TEMP_DIR)/gnome-do-plugins_$(SOURCE_VER)+dfsg.orig.tar.gz $(CURDIR)
+	[ -d ../tarballs ] || mkdir ../tarballs
+	mv $(TEMP_DIR)/gnome-do-plugins_$(SOURCE_VER)+dfsg.orig.tar.gz ../tarballs
 	rm -r $(TEMP_DIR)
 
 .PHONY: configure build clean install binary binary-indep binary-arch download-tarball strip-shipped-binaries repack-source get-orig-source patch