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

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

Author: laney-guest
Date: Fri Feb 27 22:16:39 2009
New Revision: 4568

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4568
Log:
debian/rules: Update repacking to work with +dfsgXX in case of errors with
repacking

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=4568&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/changelog (original)
+++ packages/gnome-do-plugins/trunk/debian/changelog Fri Feb 27 22:16:39 2009
@@ -31,8 +31,10 @@
     row)  
   * debian/patches/01_firefox_iceweasel_rename: The profiles file is called
     profiles.ini and not profile.ini. Update accordingly.
+  * debian/rules: Update repacking to work with +dfsgXX in case of errors with
+    repacking
 
- -- Christopher James Halse Rogers <raof at ubuntu.com>  Fri, 27 Feb 2009 17:41:46 +0000
+ -- Christopher James Halse Rogers <raof at ubuntu.com>  Fri, 27 Feb 2009 22:15:47 +0000
 
 gnome-do-plugins (0.6.0.1+dfsg-1) experimental; urgency=low
 

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=4568&op=diff
==============================================================================
--- packages/gnome-do-plugins/trunk/debian/rules (original)
+++ packages/gnome-do-plugins/trunk/debian/rules Fri Feb 27 22:16:39 2009
@@ -44,8 +44,10 @@
 
 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 )
+VERSION = $(shell dpkg-parsechangelog | grep ^Vers | cut -d" " -f2)
+UPVERSION = $(shell echo $(VERSION) | sed 's,-.*,,') 
+TARBALL = $(shell echo "gnome-do-plugins_$(UPVERSION).orig.tar.gz" | tr -d " ")
 
 download-tarball:
 	uscan --download --destdir $(TEMP_DIR) \
@@ -54,16 +56,17 @@
 	cd $(TEMP_DIR) && tar xzvf *.tar.gz
 
 strip-shipped-binaries: download-tarball
-	rm $(SOURCE_DIR)/BundledLibraries/*.{dll,exe}
+	rm $(SOURCE_DIR)/BundledLibraries/*.dll
+	rm $(SOURCE_DIR)/BundledLibraries/*.exe
 
 repack-source: strip-shipped-binaries
 	cd $(TEMP_DIR) && \
-		tar czvf gnome-do-plugins_$(SOURCE_VER)+dfsg.orig.tar.gz \
+		tar czvf $(TARBALL) \
 			$(notdir $(SOURCE_DIR))
 
 get-orig-source: repack-source
 	[ -d ../tarballs ] || mkdir ../tarballs
-	mv $(TEMP_DIR)/gnome-do-plugins_$(SOURCE_VER)+dfsg.orig.tar.gz ../tarballs
+	mv $(TEMP_DIR)/*.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