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

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Feb 24 12:20:03 2008
New Revision: 14730

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14730
Log:
* gnome-get-source.mk: fix the case where the zip already contains a 
  single directory.

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=14730&op=diff
==============================================================================
--- tools/gnome-pkg-tools/1/rules/gnome-get-source.mk (original)
+++ tools/gnome-pkg-tools/1/rules/gnome-get-source.mk Sun Feb 24 12:20:03 2008
@@ -49,8 +49,12 @@
 	  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);\
-	      tar cfz $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
-	      $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION) \
+	      if [ -d $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION) ]; then \
+	        cd $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION); \
+	        tar cfz ../$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION);\
+	      else \
+	        tar cfz $(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION); \
+	      fi \
 	     );\
 	  rm -rf $(DEB_TARBALL_DOWNLOAD_DIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.$(TARBALL_EXT) \
 	    $(DEB_TARBALL_DOWNLOAD_DIR)/$(GNOME_MODULE)-$(DEB_UPSTREAM_VERSION);\

Modified: tools/gnome-pkg-tools/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/tools/gnome-pkg-tools/debian/changelog?rev=14730&op=diff
==============================================================================
--- tools/gnome-pkg-tools/debian/changelog (original)
+++ tools/gnome-pkg-tools/debian/changelog Sun Feb 24 12:20:03 2008
@@ -1,3 +1,10 @@
+gnome-pkg-tools (0.13.3) unstable; urgency=low
+
+  * gnome-get-source.mk: fix the case where the zip already contains a 
+    single directory.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 24 Feb 2008 13:20:33 +0100
+
 gnome-pkg-tools (0.13.2) unstable; urgency=low
 
   [ Emilio Pozuelo Monfort ]