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

[kilian at users.alioth.debian.org]

Author: kilian
Date: Sat Jul 21 16:19:23 2007
New Revision: 12038

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

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=12038&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/gnome-get-source.mk (original)
+++ tools/gnome-pkg-tools/1/rules/gnome-get-source.mk Sat Jul 21 16:19:23 2007
@@ -19,10 +19,12 @@
 # upstream tarball, set to non-empty to change this behavior
 DEB_USE_DBS_TARBALL_LAYOUT ?=
 
+TARBALL_EXT ?= tar.gz
+
 GNOME_MODULE ?= $(DEB_SOURCE_PACKAGE)
-GNOME_TARBALL ?= $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tar.gz
+GNOME_TARBALL ?= $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).$(TARBALL_EXT)
 GNOME_DOWNLOAD_URL ?= http://ftp.gnome.org/pub/GNOME/sources/$(GNOME_MODULE)/$(DEB_UPSTREAM_VERSION_MAJOR_MINOR)/$(GNOME_TARBALL)
-GNOME_DOWNLOAD_COMMAND ?= wget -nv -T10 -t3 -O $(if $(DEB_USE_DBS_TARBALL_LAYOUT),$(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL),$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz) $(GNOME_DOWNLOAD_URL)
+GNOME_DOWNLOAD_COMMAND ?= wget -nv -T10 -t3 -O $(if $(DEB_USE_DBS_TARBALL_LAYOUT),$(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL),$(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT)) $(GNOME_DOWNLOAD_URL)
 
 GNOME_SVN_BRANCH ?= trunk
 GNOME_SVN_URL ?= http://svn.gnome.org/svn/$(GNOME_MODULE)/$(GNOME_SVN_BRANCH)
@@ -37,13 +39,30 @@
 	mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
 ifeq ($(DEB_UPSTREAM_SVN_REV),)
 	$(GNOME_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
 	@# create a dbs tarball if necessary
 	$(if $(DEB_USE_DBS_TARBALL_LAYOUT),gnome-make-tartar $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL) $(DEB_SOURCE_PACKAGE) $(DEB_UPSTREAM_VERSION))
 	@# remove the original tarball if necessary
 	$(if $(DEB_USE_DBS_TARBALL_LAYOUT),rm -f $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_TARBALL))
 else
 	@@echo 'Upstream SVN rev:                    $(DEB_UPSTREAM_SVN_REV)'
-	svn co
+	@@echo 'Upstream SVN repo:                   $(GNOME_SVN_URL)'
+	@@svn -q co -r$(DEB_UPSTREAM_SVN_REV) $(GNOME_SVN_URL) \
+	    $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tmp
+	@@svn -q export $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tmp\
+	    $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION)
+	@@(cd $(DEB_TARBALL_DOWNLOAD_DIR);\
+	    tar cfz $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
+	    $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION) \
+	  )
+	@@$(RM) -rf $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION).tmp\
+	    $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION)
 endif
 
 .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=12038&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog (original)
+++ tools/gnome-pkg-tools/debian/changelog Sat Jul 21 16:19:23 2007
@@ -1,3 +1,11 @@
+gnome-pkg-tools (0.12.2) UNRELEASED; urgency=low
+
+  * NOT RELEASED YET
+  * Add bz2 downloads with repacking to 1/rules/gnome-get-source.mk.
+  * Add svn downloads from svn.gnome.org.
+
+ -- Kilian Krause <kilian at debian.org>  Sat, 21 Jul 2007 17:49:02 +0200
+
 gnome-pkg-tools (0.12.1) unstable; urgency=low
 
   * Add bz2 downloads with repacking to 1/rules/sf-get-source.mk.