r12032 - in /tools/gnome-pkg-tools: 1/rules/sf-get-source.mk debian/changelog

[kilian at users.alioth.debian.org]

Author: kilian
Date: Sat Jul 21 15:20:53 2007
New Revision: 12032

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12032
Log:
* Add bz2 downloads with repacking to 1/rules/sf-get-source.mk.

Modified:
    tools/gnome-pkg-tools/1/rules/sf-get-source.mk
    tools/gnome-pkg-tools/debian/changelog

Modified: tools/gnome-pkg-tools/1/rules/sf-get-source.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/sf-get-source.mk?rev=12032&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/sf-get-source.mk (original)
+++ tools/gnome-pkg-tools/1/rules/sf-get-source.mk Sat Jul 21 15:20:53 2007
@@ -6,13 +6,14 @@
 
 # where to store the resulting .orig tarball
 DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
+TARBALL_EXT ?= tar.gz
 
 SF_PROJECT ?= $(DEB_SOURCE_PACKAGE)
 SF_MODULE ?= $(DEB_SOURCE_PACKAGE)
-SF_TARBALL ?= $(SF_MODULE)-$(DEB_UPSTREAM_VERSION).tar.gz
+SF_TARBALL ?= $(SF_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT)
 SF_DOWNLOAD_URL ?= http://$$sf_mirror.dl.sourceforge.net/$(SF_PROJECT)/$(SF_TARBALL)
 SF_MIRRORS ?= belnet easynews heanet internap jaist kent mesh nchc optusnet ovh puzzle superb-east superb-west surfnet switch ufpr umn
-SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -N -nv -T10 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(SF_DOWNLOAD_URL) && break; done
+SF_DOWNLOAD_COMMAND ?= for sf_mirror in $(SF_MIRRORS); do wget -N -nv -T10 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) $(SF_DOWNLOAD_URL) && break; done
 
 get-orig-source:
 	dh_testdir
@@ -22,5 +23,12 @@
 	@@echo 'Upstream version (for orig tarball): $(DEB_UPSTREAM_VERSION)'
 	mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
 	$(SF_DOWNLOAD_COMMAND)
+	case "$(TARBALL_EXT)" in \
+	tar.bz2|tbz) \
+	  bzcat $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) | \
+	  gzip -9 >$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz ; \
+	  rm -f $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) \
+	  ;;\
+	esac
 
 .PHONY: get-orig-source print-version

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=12032&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog (original)
+++ tools/gnome-pkg-tools/debian/changelog Sat Jul 21 15:20:53 2007
@@ -1,3 +1,9 @@
+gnome-pkg-tools (0.12.1) unstable; urgency=low
+
+  * Add bz2 downloads with repacking to 1/rules/sf-get-source.mk.
+
+ -- Kilian Krause <kilian at debian.org>  Sat, 21 Jul 2007 17:09:44 +0200
+
 gnome-pkg-tools (0.12) unstable; urgency=low
 
   * New script, desktop-check-mime-types, will fail if a MIME type found in a