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

Tue Jul 31 14:45:43 UTC 2007

Author: lool
Date: Tue Jul 31 14:45:43 2007
New Revision: 12163

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12163
Log:
* Try non-native and then native tarballs in ubuntu-get-source.

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

Modified: tools/gnome-pkg-tools/1/rules/ubuntu-get-source.mk
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/1/rules/ubuntu-get-source.mk?rev=12163&op=diff
==============================================================================

--- tools/gnome-pkg-tools/1/rules/ubuntu-get-source.mk (original)
+++ tools/gnome-pkg-tools/1/rules/ubuntu-get-source.mk Tue Jul 31 14:45:43 2007
@@ -10,7 +10,9 @@
 DEB_TARBALL_DOWNLOAD_DIR ?= ../tarballs
 
 UBUNTU_COMPONENT ?= main
-UBUNTU_DOWNLOAD_URL ?= http://archive.ubuntu.com/ubuntu/pool/$(UBUNTU_COMPONENT)/$(DEB_SOURCE_PACKAGE_INITIAL)/$(DEB_SOURCE_PACKAGE)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz
+# defaults to non-native; you don't need to set this as both are tried
+UBUNTU_NATIVE ?=
+UBUNTU_DOWNLOAD_URL ?= http://archive.ubuntu.com/ubuntu/pool/$(UBUNTU_COMPONENT)/$(DEB_SOURCE_PACKAGE_INITIAL)/$(DEB_SOURCE_PACKAGE)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION)$(if $(filter 1 true yes,$(UBUNTU_NATIVE)),,.orig).tar.gz
 
 UBUNTU_DOWNLOAD_COMMAND ?= wget -N -nv -T10 -t1 -O $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(UBUNTU_DOWNLOAD_URL)
 
@@ -21,6 +23,7 @@
 	@@echo 'Source version without epoch:        $(DEB_NOEPOCH_VERSION)'
 	@@echo 'Upstream version (for orig tarball): $(DEB_UPSTREAM_VERSION)'
 	mkdir -p $(DEB_TARBALL_DOWNLOAD_DIR)
-	$(UBUNTU_DOWNLOAD_COMMAND)
+	# try to download non-native, then native, or fail
+	$(foreach UBUNTU_NATIVE,no yes,$(UBUNTU_DOWNLOAD_COMMAND) ||) false
 
 .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=12163&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog (original)
+++ tools/gnome-pkg-tools/debian/changelog Tue Jul 31 14:45:43 2007
@@ -1,8 +1,9 @@
-gnome-pkg-tools (0.12.3) UNRELEASED; urgency=low
+gnome-pkg-tools (0.12.3) unstable; urgency=low
 
   * Drop obsolete print-version from .PHONY.
-
- -- Loic Minier <lool at dooz.org>  Tue, 31 Jul 2007 16:30:03 +0200
+  * Try non-native and then native tarballs in ubuntu-get-source.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 31 Jul 2007 16:45:22 +0200
 
 gnome-pkg-tools (0.12.2) unstable; urgency=low
 


