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

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Apr 20 18:37:25 2011
New Revision: 27700

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27700
Log:
* gnome-get-source.mk:
  + Make conversion rules silent.
  + Prefer tar.bz2 when 3.0 source format is used (pending tar.xz 
    support, which should be RSN.
  + Only convert tar.bz2 to tar.gz if 1.0 format is still used.

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

Modified: tools/gnome-pkg-tools/1/rules/gnome-get-source.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/gnome-get-source.mk?rev=27700&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/gnome-get-source.mk [utf-8] (original)
+++ tools/gnome-pkg-tools/1/rules/gnome-get-source.mk [utf-8] Wed Apr 20 18:37:25 2011
@@ -18,7 +18,13 @@
 # upstream tarball, set to non-empty to change this behavior
 DEB_USE_DBS_TARBALL_LAYOUT ?=
 
-TARBALL_EXT ?= tar.gz
+DEB_SOURCE_FORMAT := $(shell cat debian/source/format 2>/dev/null || echo 1.0)
+
+ifeq ($(DEB_SOURCE_FORMAT),3.0 (quilt))
+  TARBALL_EXT ?= tar.bz2
+else
+  TARBALL_EXT ?= tar.gz
+endif
 
 GNOME_MODULE ?= $(DEB_SOURCE_PACKAGE)
 GNOME_TARBALL ?= $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT)
@@ -37,13 +43,17 @@
 	mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
 ifeq ($(DEB_UPSTREAM_GIT_REV),)
 	$(GNOME_DOWNLOAD_COMMAND)
-	case "$(TARBALL_EXT)" in \
+	@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) \
+	  if [ "$(DEB_SOURCE_FORMAT)" != "3.0 (quilt)" ]; then \
+	    echo "$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) -> $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz ...";\
+	    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); \
+	  fi \
 	  ;;\
 	zip) \
+	  echo "$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) -> $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz ...";\
 	  unzip -q $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) \
 	    -d $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION) ;\
 	    (cd $(DEB_TARBALL_DOWNLOAD_DIR);\

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=27700&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog [utf-8] (original)
+++ tools/gnome-pkg-tools/debian/changelog [utf-8] Wed Apr 20 18:37:25 2011
@@ -1,10 +1,18 @@
-gnome-pkg-tools (0.17.1) UNRELEASED; urgency=low
-
+gnome-pkg-tools (0.18.0) unstable; urgency=low
+
+  [ Emilio Pozuelo Monfort ]
   * 1/rules/clean-la.mk:
     + If $DEB_HOST_MULTIARCH is set, look in this directory for .la files
      to clean too. Thanks Steve Langasek for the patch. Closes: #618377.
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Mon, 14 Mar 2011 21:42:18 +0000
+  [ Josselin Mouette ]
+  * gnome-get-source.mk:
+    + Make conversion rules silent.
+    + Prefer tar.bz2 when 3.0 source format is used (pending tar.xz 
+      support, which should be RSN.
+    + Only convert tar.bz2 to tar.gz if 1.0 format is still used.
+
+ -- Josselin Mouette <joss at debian.org>  Wed, 20 Apr 2011 20:37:14 +0200
 
 gnome-pkg-tools (0.17.0) unstable; urgency=low