r23216 - in /tools/gnome-pkg-tools: 1/rules/lp-get-source.mk debian/changelog debian/control debian/control.in

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Mar  7 16:02:05 2010
New Revision: 23216

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23216
Log:
* 1/rules/lp-get-source.mk:
  - Allow to override the default .tar.gz tarball extension.
* debian/control.in:
  - Standards-Version is 3.8.4, no changes needed.

Modified:
    tools/gnome-pkg-tools/1/rules/lp-get-source.mk
    tools/gnome-pkg-tools/debian/changelog
    tools/gnome-pkg-tools/debian/control
    tools/gnome-pkg-tools/debian/control.in

Modified: tools/gnome-pkg-tools/1/rules/lp-get-source.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/lp-get-source.mk?rev=23216&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/lp-get-source.mk [utf-8] (original)
+++ tools/gnome-pkg-tools/1/rules/lp-get-source.mk [utf-8] Sun Mar  7 16:02:05 2010
@@ -6,11 +6,12 @@
 
 # where to store the resulting .orig tarball
 DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
+TARBALL_EXT ?= tar.gz
 
 LP_DOWNLOAD_PAGE ?= https://launchpad.net/$(DEB_SOURCE_PACKAGE)/+download
-LP_DOWNLOAD_URL ?= $(shell wget -q -O - $(LP_DOWNLOAD_PAGE) | grep -o 'href="http://launchpad.net/$(DEB_SOURCE_PACKAGE)/.*/+download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)\.tar\.gz"' | cut -d'"' -f2)
+LP_DOWNLOAD_URL ?= $(shell wget -q -O - $(LP_DOWNLOAD_PAGE) | grep -o 'href="http://launchpad.net/$(DEB_SOURCE_PACKAGE)/.*/+download/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)\.$(TARBALL_EXT)"' | cut -d'"' -f2)
 
-LP_DOWNLOAD_COMMAND ?= wget -nv -T15 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(LP_DOWNLOAD_URL)
+LP_DOWNLOAD_COMMAND ?= wget -nv -T15 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) $(LP_DOWNLOAD_URL)
 
 get-orig-source:
 	dh_testdir
@@ -20,5 +21,12 @@
 	@@echo 'Download url:                        $(LP_DOWNLOAD_URL)'
 	mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
 	$(LP_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

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=23216&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/changelog [utf-8] Sun Mar  7 16:02:05 2010
@@ -2,6 +2,12 @@
 
   [ Josselin Mouette ]
   * Add Michael Biebl to the team.
+
+  [ Emilio Pozuelo Monfort ]
+  * 1/rules/lp-get-source.mk:
+    - Allow to override the default .tar.gz tarball extension.
+  * debian/control.in:
+    - Standards-Version is 3.8.4, no changes needed.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Fri, 12 Feb 2010 09:20:50 +0100
 

Modified: tools/gnome-pkg-tools/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/control?rev=23216&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/control [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/control [utf-8] Sun Mar  7 16:02:05 2010
@@ -11,7 +11,7 @@
 Build-Depends: cdbs,
                debhelper (>= 5)
 Build-Depends-Indep: xmlto
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: gnome-pkg-tools
 Architecture: all

Modified: tools/gnome-pkg-tools/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/control.in?rev=23216&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/control.in [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/control.in [utf-8] Sun Mar  7 16:02:05 2010
@@ -6,7 +6,7 @@
 Build-Depends: cdbs,
                debhelper (>= 5)
 Build-Depends-Indep: xmlto
-Standards-Version: 3.8.3
+Standards-Version: 3.8.4
 
 Package: gnome-pkg-tools
 Architecture: all