[Pkg-isocodes-devel] [SCM] ISO language, territory, currency, script codes and their translations branch, master, updated. 496163ea3fd2b380c55f8a085ef62274d0948bb7

[Tobias Quathamer]

The following commit has been merged in the master branch:
commit 496163ea3fd2b380c55f8a085ef62274d0948bb7
Author: Tobias Quathamer <toddy at debian.org>
Date:   Tue Aug 7 11:37:40 2012 +0200

    Use xz compression for tarball creation

diff --git a/Makefile.am b/Makefile.am
index 1eafe15..c436312 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,17 +22,17 @@ update-po:
 	done
 
 .PHONY: sign-release
-sign-release: iso-codes-$(VERSION).tar.bz2
-	rm -f iso-codes-$(VERSION).tar.bz2.sig
-	gpg --detach-sign iso-codes-$(VERSION).tar.bz2
+sign-release: iso-codes-$(VERSION).tar.xz
+	rm -f iso-codes-$(VERSION).tar.xz.sig
+	gpg --detach-sign iso-codes-$(VERSION).tar.xz
 
 .PHONY: upload
 upload:
 	@if [[ "$(ALIOTH_USERNAME)" == "" ]]; then \
 		ALIOTH_USERNAME="$(USERNAME)"; \
 	fi
-	@if [[ -f "iso-codes-$(VERSION).tar.bz2" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.bz2.sig" ]] \
+	@if [[ -f "iso-codes-$(VERSION).tar.xz" ]] \
+	&& [[ -f "iso-codes-$(VERSION).tar.xz.sig" ]] \
 	&& [[ -n "$(ALIOTH_USERNAME)" ]]; then \
 		scp iso-codes-$(VERSION).tar.* \
 		$(ALIOTH_USERNAME)@alioth.debian.org:/srv/home/groups/pkg-isocodes/htdocs/downloads; \
diff --git a/Makefile.in b/Makefile.in
index 3944376..5ff356f 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -127,7 +127,7 @@ am__relativize = \
   done; \
   reldir="$$dir2"
 GZIP_ENV = --best
-DIST_ARCHIVES = $(distdir).tar.bz2
+DIST_ARCHIVES = $(distdir).tar.xz
 distuninstallcheck_listfiles = find . -type f -print
 am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
   | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
@@ -484,6 +484,7 @@ distdir: $(DISTFILES)
 dist-gzip: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
+
 dist-bzip2: distdir
 	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
@@ -495,7 +496,6 @@ dist-lzip: distdir
 dist-lzma: distdir
 	tardir=$(distdir) && $(am__tar) | lzma -9 -c >$(distdir).tar.lzma
 	$(am__remove_distdir)
-
 dist-xz: distdir
 	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
@@ -514,7 +514,7 @@ dist-zip: distdir
 	$(am__remove_distdir)
 
 dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -741,17 +741,17 @@ update-po:
 	done
 
 .PHONY: sign-release
-sign-release: iso-codes-$(VERSION).tar.bz2
-	rm -f iso-codes-$(VERSION).tar.bz2.sig
-	gpg --detach-sign iso-codes-$(VERSION).tar.bz2
+sign-release: iso-codes-$(VERSION).tar.xz
+	rm -f iso-codes-$(VERSION).tar.xz.sig
+	gpg --detach-sign iso-codes-$(VERSION).tar.xz
 
 .PHONY: upload
 upload:
 	@if [[ "$(ALIOTH_USERNAME)" == "" ]]; then \
 		ALIOTH_USERNAME="$(USERNAME)"; \
 	fi
-	@if [[ -f "iso-codes-$(VERSION).tar.bz2" ]] \
-	&& [[ -f "iso-codes-$(VERSION).tar.bz2.sig" ]] \
+	@if [[ -f "iso-codes-$(VERSION).tar.xz" ]] \
+	&& [[ -f "iso-codes-$(VERSION).tar.xz.sig" ]] \
 	&& [[ -n "$(ALIOTH_USERNAME)" ]]; then \
 		scp iso-codes-$(VERSION).tar.* \
 		$(ALIOTH_USERNAME)@alioth.debian.org:/srv/home/groups/pkg-isocodes/htdocs/downloads; \
diff --git a/configure.ac b/configure.ac
index d9153d3..37f16cb 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.37])
 
-AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip foreign])
+AM_INIT_AUTOMAKE([dist-xz no-dist-gzip foreign])
 AM_MAINTAINER_MODE
 
 AC_SUBST([ACLOCAL_AMFLAGS], ["\${ACLOCAL_FLAGS}"])

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