From 0dc2efea68bdbb1ab4bfe85983de8fffdf3ff6c0 Mon Sep 17 00:00:00 2001
From: Bastian Kleineidam <calvin@debian.org>
Date: Sun, 2 Sep 2012 23:44:16 +0200
Subject: [PATCH] Adjust for new .xz dist format.

---
 Makefile                    | 7 ++++---
 debian/watch                | 2 +-
 doc/README-Download.md.tmpl | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 0c37d535..232d2d0f 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,7 @@ TESTOPTS=
 PAGER ?= less
 # build dir for debian package
 BUILDDIR:=$(HOME)/projects/debian/official
-DEB_ORIG_TARGET:=$(BUILDDIR)/linkchecker_$(VERSION).orig.tar.bz2
+DEB_ORIG_TARGET:=$(BUILDDIR)/linkchecker_$(VERSION).orig.tar.xz
 # original dnspython repository module
 DNSPYTHON:=$(HOME)/src/dnspython-git
 # options to run the pep8 utility
@@ -85,7 +85,7 @@ localbuild: MANIFEST locale
 deb_orig:
 	if [ ! -e $(DEB_ORIG_TARGET) ]; then \
 	  $(MAKE) dist-stamp && \
-	  cp dist/$(APPNAME)-$(VERSION).tar.bz2 $(DEB_ORIG_TARGET); \
+	  cp dist/$(APPNAME)-$(VERSION).tar.xz $(DEB_ORIG_TARGET); \
 	fi
 
 .PHONY: upload
@@ -121,6 +121,7 @@ chmod:
 
 .PHONY: dist
 dist: locale MANIFEST chmod
+	rm -f dist/$(APPNAME)-$(VERSION).tar.xz
 	$(PYTHON) setup.py sdist --formats=tar
 	xz dist/$(APPNAME)-$(VERSION).tar
 # no rpm buildable with bdist_rpm, presumable due to this bug:
@@ -230,7 +231,7 @@ releasecheck: check
 
 .PHONY: sign_distfiles
 sign_distfiles:
-	for f in $(shell find dist -name *.bz2 -o -name *.exe -o -name *.zip -o -name *.dmg); do \
+	for f in $(shell find dist -name *.xz -o -name *.exe -o -name *.zip -o -name *.dmg); do \
 	  [ -f $${f}.asc ] || gpg --detach-sign --armor $$f; \
 	done
 
diff --git a/debian/watch b/debian/watch
index 33cd2fd6..a2215432 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 # watch control file for uscan
 version=3
-http://sf.net/linkchecker/LinkChecker-(.*).tar.bz2 debian uupdate
+http://sf.net/linkchecker/LinkChecker-(.*).tar.xz debian uupdate
diff --git a/doc/README-Download.md.tmpl b/doc/README-Download.md.tmpl
index fe855dd6..52b88d19 100644
--- a/doc/README-Download.md.tmpl
+++ b/doc/README-Download.md.tmpl
@@ -6,7 +6,7 @@ Unix systems and in source format.
 
 The `.asc` are GPG signatures that you can use to verify the download.
 For example download the `.asc` file in the same directory as the
-`.tar.bz2` file and run `gpg --verify {APPNAME}-{VERSION}.tar.bz2`
+`.tar.xz` file and run `gpg --verify {APPNAME}-{VERSION}.tar.xz`
 
 The GPG key used to sign these packages is 32EC6F3E. It can be
 downloaded with `gpg --keyserver wwwkeys.pgp.net --recv-keys 32EC6F3E`.