From 88b167d18c98dd64bb5934ebd9c7e627923bdc8b Mon Sep 17 00:00:00 2001
From: Matt Turner <mattst88@gmail.com>
Date: Sun, 19 Apr 2020 14:46:34 -0700
Subject: Build xz tarballs instead of bzip2

Signed-off-by: Matt Turner <mattst88@gmail.com>
---
 Makefile.am  | 26 +++++++++++++-------------
 configure.ac |  2 +-
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e33b2b9..b451a50 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,13 +31,13 @@ EXTRA_DIST =				\
 	$(NULL)
 
 tar_gz = $(PACKAGE)-$(VERSION).tar.gz
-tar_bz2 = $(PACKAGE)-$(VERSION).tar.bz2
+tar_xz = $(PACKAGE)-$(VERSION).tar.xz
 
 sha1_tgz = $(tar_gz).sha1
 md5_tgz = $(tar_gz).md5
 
-sha1_tbz2 = $(tar_bz2).sha1
-md5_tbz2 = $(tar_bz2).md5
+sha1_txz = $(tar_xz).sha1
+md5_txz = $(tar_xz).md5
 
 gpg_file = $(sha1_tgz).asc
 
@@ -47,17 +47,17 @@ $(sha1_tgz): $(tar_gz)
 $(md5_tgz): $(tar_gz)
 	md5sum $^ > $@
 
-$(sha1_tbz2): $(tar_bz2)
+$(sha1_txz): $(tar_xz)
 	sha1sum $^ > $@
 
-$(md5_tbz2): $(tar_bz2)
+$(md5_txz): $(tar_xz)
 	md5sum $^ > $@
 
 $(gpg_file): $(sha1_tgz)
 	@echo "Please enter your GPG password to sign the checksum."
 	gpg --armor --sign $^ 
 
-HASHFILES = $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(md5_tbz2)
+HASHFILES = $(sha1_tgz) $(sha1_txz) $(md5_tgz) $(md5_txz)
 
 release-verify-newer:
 	@echo -n "Checking that no $(VERSION) release already exists at $(RELEASE_XORG_HOST)..."
@@ -72,7 +72,7 @@ release-verify-newer:
 	@echo "Good."
 
 release-remove-old:
-	$(RM) $(tar_gz) $(tar_bz2) $(HASHFILES) $(gpg_file)
+	$(RM) $(tar_gz) $(tar_xz) $(HASHFILES) $(gpg_file)
 
 ensure-prev:
 	@if [[ "$(PREV)" == "" ]]; then							\
@@ -91,9 +91,9 @@ release-check: ensure-prev release-verify-newer release-remove-old distcheck
 release-tag:
 	git tag -u $(GPGKEY) -m "$(PACKAGE) $(VERSION) release" $(PACKAGE)-$(VERSION)
 
-release-upload: release-check $(tar_gz) $(tar_bz2) $(sha1_tgz) $(sha1_tbz2) $(md5_tgz) $(gpg_file)
+release-upload: release-check $(tar_gz) $(tar_xz) $(sha1_tgz) $(sha1_txz) $(md5_tgz) $(gpg_file)
 	scp $(tar_gz) $(sha1_tgz) $(gpg_file) $(RELEASE_CAIRO_HOST):$(RELEASE_CAIRO_DIR)
-	scp $(tar_gz) $(tar_bz2) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
+	scp $(tar_gz) $(tar_xz) $(RELEASE_XORG_HOST):$(RELEASE_XORG_DIR)
 	ssh $(RELEASE_CAIRO_HOST) "rm -f $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-[0-9]* && ln -s $(tar_gz) $(RELEASE_CAIRO_DIR)/LATEST-$(PACKAGE)-$(VERSION)"
 
 RELEASE_TYPE = $$(if test "x$(PIXMAN_VERSION_MINOR)" = "x$$(echo "$(PIXMAN_VERSION_MINOR)/2*2" | bc)" ; then echo "stable release in the" ; else echo "development snapshot leading up to a stable"; fi)
@@ -111,18 +111,18 @@ release-publish-message: $(HASHFILES) ensure-prev
 	@echo "	$(RELEASE_CAIRO_URL)/$(tar_gz)"
 	@echo "	$(RELEASE_XORG_URL)/$(tar_gz)"
 	@echo ""
-	@echo "tar.bz2:"
-	@echo "	$(RELEASE_XORG_URL)/$(tar_bz2)"
+	@echo "tar.xz:"
+	@echo "	$(RELEASE_XORG_URL)/$(tar_xz)"
 	@echo ""
 	@echo "Hashes:"
 	@echo -n "	MD5:  "
 	@cat $(md5_tgz)
 	@echo -n "	MD5:  "
-	@cat $(md5_tbz2)
+	@cat $(md5_txz)
 	@echo -n "	SHA1: "
 	@cat $(sha1_tgz)
 	@echo -n "	SHA1: "
-	@cat $(sha1_tbz2)
+	@cat $(sha1_txz)
 	@echo ""
 	@echo "GPG signature:"
 	@echo "	$(RELEASE_CAIRO_URL)/$(gpg_file)"
diff --git a/configure.ac b/configure.ac
index fd7df47..90a6035 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,7 +59,7 @@ m4_define([pixman_micro], 5)
 m4_define([pixman_version],[pixman_major.pixman_minor.pixman_micro])
 
 AC_INIT(pixman, pixman_version, [pixman@lists.freedesktop.org], pixman)
-AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_INIT_AUTOMAKE([foreign dist-xz])
 
 # Suppress verbose compile lines
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-- 
cgit v1.2.1