[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. iso-codes/3.11.1-2-g491d133

[Tobias Quathamer]

The following commit has been merged in the master branch:
commit 491d1331fbdcdbe65ddbd0d440819a8cf757b5b8
Author: Tobias Quathamer <toddy at debian.org>
Date:   Tue Nov 10 16:44:34 2009 +0100

    Do no longer generate a gzip'ed tarball

diff --git a/ChangeLog b/ChangeLog
index c647944..9b080c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,10 @@
 iso-codes trunk
 ---------------
 
+  [ General ]
+  * The package iso-codes does no longer provide a gzip'ed tarball,
+    the compression method is now bzip2
+
   [ ISO 3166 translations ]
   * German typo fix found by Christian Persch. Closes: alioth#312050
 
diff --git a/Makefile.am b/Makefile.am
index 31a3eb4..4721238 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,10 +16,8 @@ DISTCLEANFILES = $(pkgconfig_DATA)
 release: check distcheck
 
 .PHONY: sign-release
-sign-release: iso-codes-$(VERSION).tar.gz iso-codes-$(VERSION).tar.bz2
-	rm -f iso-codes-$(VERSION).tar.gz.sig
+sign-release: iso-codes-$(VERSION).tar.bz2
 	rm -f iso-codes-$(VERSION).tar.bz2.sig
-	gpg --detach-sign iso-codes-$(VERSION).tar.gz
 	gpg --detach-sign iso-codes-$(VERSION).tar.bz2
 
 .PHONY: upload
@@ -28,12 +26,9 @@ upload:
 		echo "Please set your Alioth username. Example command line:"; \
 		echo "  ALIOTH_USERNAME=toddy make upload"; \
 	fi
-	@if [[ -f "iso-codes-$(VERSION).tar.gz" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.bz2" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.gz.sig" ]] \
+	@if [[ -f "iso-codes-$(VERSION).tar.bz2" ]] \
 	&& [[ -f "iso-codes-$(VERSION).tar.bz2.sig" ]] \
 	&& [[ -n "$(ALIOTH_USERNAME)" ]]; then \
 		scp iso-codes-$(VERSION).tar.* \
 		$(ALIOTH_USERNAME)@alioth.debian.org:/var/lib/gforge/chroot/ftproot/pub/pkg-isocodes; \
 	fi
-
diff --git a/Makefile.in b/Makefile.in
index dfb01be..15de960 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -118,8 +118,8 @@ am__relativize = \
     dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
   done; \
   reldir="$$dir2"
-DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
+DIST_ARCHIVES = $(distdir).tar.bz2
 distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
@@ -500,7 +500,6 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
@@ -706,10 +705,8 @@ uninstall-am: uninstall-pkgconfigDATA
 release: check distcheck
 
 .PHONY: sign-release
-sign-release: iso-codes-$(VERSION).tar.gz iso-codes-$(VERSION).tar.bz2
-	rm -f iso-codes-$(VERSION).tar.gz.sig
+sign-release: iso-codes-$(VERSION).tar.bz2
 	rm -f iso-codes-$(VERSION).tar.bz2.sig
-	gpg --detach-sign iso-codes-$(VERSION).tar.gz
 	gpg --detach-sign iso-codes-$(VERSION).tar.bz2
 
 .PHONY: upload
@@ -718,9 +715,7 @@ upload:
 		echo "Please set your Alioth username. Example command line:"; \
 		echo "  ALIOTH_USERNAME=toddy make upload"; \
 	fi
-	@if [[ -f "iso-codes-$(VERSION).tar.gz" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.bz2" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.gz.sig" ]] \
+	@if [[ -f "iso-codes-$(VERSION).tar.bz2" ]] \
 	&& [[ -f "iso-codes-$(VERSION).tar.bz2.sig" ]] \
 	&& [[ -n "$(ALIOTH_USERNAME)" ]]; then \
 		scp iso-codes-$(VERSION).tar.* \
diff --git a/configure.ac b/configure.ac
index 17a1478..82e3023 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,7 +16,7 @@ dnl 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
 
 AC_INIT([iso-codes],[3.11.1])
 
-AM_INIT_AUTOMAKE([dist-bzip2 foreign])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign])
 AM_MAINTAINER_MODE
 
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])

-- 
ISO language, territory, currency, script codes and their translations