rev 5602 - kde-extras/kipi-plugins/branches/experimental/debian

[Mark Purcell]

Author: msp
Date: 2007-02-18 21:23:12 +0100 (Sun, 18 Feb 2007)
New Revision: 5602

Modified:
   kde-extras/kipi-plugins/branches/experimental/debian/changelog
   kde-extras/kipi-plugins/branches/experimental/debian/rules
Log:
* debian/rules get-orig-source more robust

Modified: kde-extras/kipi-plugins/branches/experimental/debian/changelog
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/changelog	2007-02-18 20:18:03 UTC (rev 5601)
+++ kde-extras/kipi-plugins/branches/experimental/debian/changelog	2007-02-18 20:23:12 UTC (rev 5602)
@@ -10,8 +10,9 @@
 
   [ Mark Purcell ]
   * Build-Depends: libgpod-dev (>=0.4.2) - enable IpodExport plugin
+  * debian/rules get-orig-source more robust
 
- -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 18 Feb 2007 20:12:34 +0000
+ -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 18 Feb 2007 20:21:37 +0000
 
 kipi-plugins (0.1.3-1) experimental; urgency=low
 

Modified: kde-extras/kipi-plugins/branches/experimental/debian/rules
===================================================================
--- kde-extras/kipi-plugins/branches/experimental/debian/rules	2007-02-18 20:18:03 UTC (rev 5601)
+++ kde-extras/kipi-plugins/branches/experimental/debian/rules	2007-02-18 20:23:12 UTC (rev 5602)
@@ -1,9 +1,10 @@
 #!/usr/bin/make -f
 
-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$$//' -e 's/+/.0-/')
+FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).tar.bz2
+URL = http://heanet.dl.sourceforge.net/kipi/$(UPFILENAME)
 
+
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
 include /usr/share/cdbs/1/class/kde.mk
@@ -17,11 +18,23 @@
 	done
 	rm -f debian/stamp-space-uu 
 
-print-version:
-	@@echo "Debian version:          $(DEBVERSION)"
-	@@echo "Upstream version:        $(UPVERSION)"
+get-orig-source-dpatch:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@dpatch-get-origtargz ../tarballs
 
 get-orig-source:
 	@@dh_testdir
-	@@[ -d ../tarballs/. ]
-	@@dpatch-get-origtargz ../tarballs
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@echo Downloading $(UPFILENAME) from $(URL) ...
+	@@wget -N -nv -T10 -t3 -O ../tarballs/$(UPFILENAME) $(URL)
+	@@echo Converting $(UPFILENAME) to $(FILENAME)
+	@@bzcat ../tarballs/$(UPFILENAME) | gzip -9 > ../tarballs/$(FILENAME)
+
+print-version:
+	@@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)