rev 5618 - kde-extras/digikam/branches/experimental/debian

[Mark Purcell]

Author: msp
Date: 2007-02-19 21:26:16 +0100 (Mon, 19 Feb 2007)
New Revision: 5618

Modified:
   kde-extras/digikam/branches/experimental/debian/rules
   kde-extras/digikam/branches/experimental/debian/watch
Log:
handle rc/beta

Modified: kde-extras/digikam/branches/experimental/debian/rules
===================================================================
--- kde-extras/digikam/branches/experimental/debian/rules	2007-02-19 20:25:22 UTC (rev 5617)
+++ kde-extras/digikam/branches/experimental/debian/rules	2007-02-19 20:26:16 UTC (rev 5618)
@@ -1,6 +1,9 @@
 #!/usr/bin/make -f
 
 DEB_KDE_ENABLE_FINAL = yes
+FILENAME = $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+UPFILENAME = $(DEB_SOURCE_PACKAGE)-$(shell echo $(DEB_UPSTREAM_VERSION) | sed 's/~/-/').tar.bz2
+URL = http://heanet.dl.sourceforge.net/$(DEB_SOURCE_PACKAGE)/$(UPFILENAME)
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/simple-patchsys.mk
@@ -12,7 +15,23 @@
 	# remove empty API-docs dirs tree
 	rm -rf $(CURDIR)/debian/digikam/usr/share/doc/kde
 
+get-orig-source-dpatch:
+	@@dh_testdir
+	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
+	@@dpatch-get-origtargz ../tarballs
+
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
-	@@dpatch-get-origtargz ../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)

Modified: kde-extras/digikam/branches/experimental/debian/watch
===================================================================
--- kde-extras/digikam/branches/experimental/debian/watch	2007-02-19 20:25:22 UTC (rev 5617)
+++ kde-extras/digikam/branches/experimental/debian/watch	2007-02-19 20:26:16 UTC (rev 5618)
@@ -4,5 +4,5 @@
 version=3
 
 opts=dversionmangle=s/~/-/ \
- http://sf.net/digikam/digikam-([\d].[\d].[\d])-(rc|beta).*)\.tar\.bz2 debian svn-upgrade
+ http://sf.net/digikam/digikam-([\d\.].*)\.tar\.bz2 debian svn-upgrade