[Pkg-cli-apps-commits] r4467 - in /packages/bansheelyricsplugin/trunk: ./ debian/rules

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

Author: hyperair-guest
Date: Thu Jan 29 12:32:11 2009
New Revision: 4467

URL: http://svn.debian.org/wsvn/pkg-cli-apps/?sc=1&rev=4467
Log:
Merge from svn

Modified:
    packages/bansheelyricsplugin/trunk/   (props changed)
    packages/bansheelyricsplugin/trunk/debian/rules

Propchange: packages/bansheelyricsplugin/trunk/
------------------------------------------------------------------------------
--- bzr:ancestry:v3-trunk2 (original)
+++ bzr:ancestry:v3-trunk2 Thu Jan 29 12:32:11 2009
@@ -1,2 +1,3 @@
 hyperair at gmail.com-20090127114621-8j758le9kzljez0i
 svn-v3-trunk2:51a4afcb-40d8-4bc0-a9d9-6b9f2cc5091e:packages%2Fbansheelyricsplugin%2Ftrunk:4460
+svn-v3-trunk2:51a4afcb-40d8-4bc0-a9d9-6b9f2cc5091e:packages%2Fbansheelyricsplugin%2Ftrunk:4465

Propchange: packages/bansheelyricsplugin/trunk/
------------------------------------------------------------------------------
--- bzr:revision-id:v3-trunk2 (original)
+++ bzr:revision-id:v3-trunk2 Thu Jan 29 12:32:11 2009
@@ -5,3 +5,4 @@
 6 hyperair at gmail.com-20090128214700-xxndv03iwqq8siiv
 7 hyperair at gmail.com-20090128215409-zovjlntmmr6fsr6x
 8 hyperair at gmail.com-20090128221639-ze80hu3hb77gekwf
+9 hyperair at gmail.com-20090129105534-oagl1wt5bkbseqe5

Propchange: packages/bansheelyricsplugin/trunk/
------------------------------------------------------------------------------
--- bzr:revision-info (original)
+++ bzr:revision-info Thu Jan 29 12:32:11 2009
@@ -1,4 +1,4 @@
-timestamp: 2009-01-29 06:16:39.473000050 +0800
+timestamp: 2009-01-29 18:55:34.174999952 +0800
 committer: Chow Loong Jin <hyperair at gmail.com>
 properties: 
 	branch-nick: packaging-debian

Propchange: packages/bansheelyricsplugin/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Thu Jan 29 12:32:11 2009
@@ -1,1 +1,2 @@
 51a4afcb-40d8-4bc0-a9d9-6b9f2cc5091e:/packages/bansheelyricsplugin/trunk:4460
+51a4afcb-40d8-4bc0-a9d9-6b9f2cc5091e:/packages/bansheelyricsplugin/trunk:4465

Propchange: packages/bansheelyricsplugin/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 29 12:32:11 2009
@@ -1,1 +1,1 @@
-/packages/bansheelyricsplugin/trunk:4460
+/packages/bansheelyricsplugin/trunk:4460,4465

Modified: packages/bansheelyricsplugin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-cli-apps/packages/bansheelyricsplugin/trunk/debian/rules?rev=4467&op=diff
==============================================================================
--- packages/bansheelyricsplugin/trunk/debian/rules (original)
+++ packages/bansheelyricsplugin/trunk/debian/rules Thu Jan 29 12:32:11 2009
@@ -8,14 +8,13 @@
 # Path to the debian directory
 DEBIAN_DIR := $(dir $(firstword $(MAKEFILE_LIST)))
 SOURCE_DIR := $(DEBIAN_DIR)/..
-UPSTREAM_VERSION ?= $(shell cd $(SOURCE_DIR) && \
-    uscan --dehs | \
+UPSTREAM_VERSION ?= $(shell uscan --dehs $(SOURCE_DIR) | \
     sed -n 's/.*<upstream-version>\(.*\)<\/upstream-version>.*/\1/p')
 
 # get orig .tar.bz2, repack into .tar.gz, removing .svn in the process
 get-orig-source:
 	rm -f $(SOURCE_DIR)/../bansheelyricsplugin_$(UPSTREAM_VERSION).orig.*
-	cd $(SOURCE_DIR) && uscan --force-download
+	uscan --force-download $(SOURCE_DIR)
 	tar -xjf $(SOURCE_DIR)/../BansheeLyricsPlugin$(UPSTREAM_VERSION).tar.bz2
 	mv BansheeLyricsPlugin bansheelyricsplugin-$(UPSTREAM_VERSION).orig
 	GZIP=-9fn tar --exclude=.svn --exclude=autom4te.cache --exclude=*.mdb -czf \