[Pkg-voip-commits] r2971 - twinkle/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-01-07 09:52:50 +0100 (Sun, 07 Jan 2007)
New Revision: 2971

Modified:
   twinkle/trunk/debian/changelog
   twinkle/trunk/debian/rules
Log:
* debian/rules get-orig-source targets rewritten

Modified: twinkle/trunk/debian/changelog
===================================================================
--- twinkle/trunk/debian/changelog	2007-01-07 08:37:30 UTC (rev 2970)
+++ twinkle/trunk/debian/changelog	2007-01-07 08:52:50 UTC (rev 2971)
@@ -3,8 +3,9 @@
   * (NOT RELEASED YET) New upstream release
   * Needed for the preceeding package to get into etch
   * delete debian/patches dtmf, invite4xx and memman included upstream
+  * debian/rules get-orig-source targets rewritten
 
- -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 08:26:10 +0000
+ -- Mark Purcell <msp at debian.org>  Sun,  7 Jan 2007 08:52:40 +0000
 
 twinkle (1:0.9-6) testing-proposed-updates; urgency=medium
 

Modified: twinkle/trunk/debian/rules
===================================================================
--- twinkle/trunk/debian/rules	2007-01-07 08:37:30 UTC (rev 2970)
+++ twinkle/trunk/debian/rules	2007-01-07 08:52:50 UTC (rev 2971)
@@ -4,16 +4,14 @@
   
 # Add here any variable or target overrides you need
 
-
 export QTDIR=/usr/share/qt3
-  
-DEBVERSION:=$(shell head -n 1 debian/changelog \
-		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
-FILENAME := twinkle_$(UPVERSION).orig.tar.gz
-URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-$(UPVERSION).tar.gz
+UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.bz2
+URL2 = http://www.xs4all.nl/~mfnboer/twinkle/download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.gz
 
+FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+URL := http://www.xs4all.nl/~mfnboer/twinkle/download/twinkle-1.0beta.tar.gz
+
 -include /usr/share/cdbs/1/class/autotools.mk
 -include /usr/share/cdbs/1/rules/debhelper.mk
 -include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -27,8 +25,13 @@
 	cp sip.protocol $(CURDIR)/debian/twinkle/usr/share/services
 
 print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
+	@@echo DEB_SOURCE_PACKAGE: $(DEB_SOURCE_PACKAGE)
+	@@echo DEB_VERSION: $(DEB_VERSION)
+	@@echo DEB_NO_EPOCH_VERSION: $(DEB_NOEPOCH_VERSION)
+	@@echo DEB_UPSTREAM_VERSION: $(DEB_UPSTREAM_VERSION)
+	@@echo FILENAME: $(FILENAME)
+	@@echo URL: $(URL)
+	@@echo URL2: $(URL2)
 
 get-orig-source:
 	@@dh_testdir