[PATCH 2/2] Use xz compression for linux source package

[Ben Hutchings]

Changes from v1:
- Separate from the conversion to source format 3.0
- Use tar -a option

Index: debian/bin/genorig.py
===================================================================
--- debian/bin/genorig.py       (revision 19075)
+++ debian/bin/genorig.py       (working copy)
@@ -33,7 +33,7 @@
         self.log('Using source name %s, version %s, dfsg %s\n' % (source, 
version.upstream, self.version_dfsg))
 
         self.orig = '%s-%s' % (source, version.upstream)
-        self.orig_tar = '%s_%s.orig.tar.gz' % (source, version.upstream)
+        self.orig_tar = '%s_%s.orig.tar.xz' % (source, version.upstream)
         self.tag = 'v' + version.linux_upstream_full
 
     def __call__(self):
@@ -117,7 +117,7 @@
         except OSError:
             pass
         self.log("Generate tarball %s\n" % out)
-        cmdline = ['tar -czf', out, '-C', self.dir, self.orig]
+        cmdline = ['tar -caf', out, '-C', self.dir, self.orig]
         try:
             if os.spawnv(os.P_WAIT, '/bin/sh', ['sh', '-c', ' 
'.join(cmdline)]):
                 raise RuntimeError("Can't patch source")
Index: debian/changelog
===================================================================
--- debian/changelog    (revision 19077)
+++ debian/changelog    (working copy)
@@ -18,6 +18,7 @@
   * test-patches: Recognise the rt featureset automatically
   * Convert source package format to 3.0 (quilt)
     - Convert patch system to quilt, except for the 'orig' patch series
+    - Use xz compression for upstream and Debian tarballs
 
  -- Ben Hutchings <b...@decadent.org.uk>  Sat, 02 Jun 2012 20:31:53 +0100
 
Index: debian/rules
===================================================================
--- debian/rules        (revision 19075)
+++ debian/rules        (working copy)
@@ -39,7 +39,7 @@
        @$(stamp)
 
 DIR_ORIG = ../orig/$(SOURCE)-$(VERSION_UPSTREAM)
-TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.gz
+TAR_ORIG_NAME = $(SOURCE)_$(VERSION_UPSTREAM).orig.tar.xz
 TAR_ORIG = $(firstword $(wildcard ../$(TAR_ORIG_NAME)) $(wildcard 
../orig/$(TAR_ORIG_NAME)))
 
 orig: $(DIR_ORIG)
@@ -51,7 +51,7 @@
        $(error Cannot find orig tarball $(TAR_ORIG_NAME))
 else
        mkdir -p ../orig
-       tar -C ../orig -xzf $(TAR_ORIG)
+       tar -C ../orig -xaf $(TAR_ORIG)
 endif
 
 maintainerclean:
Index: debian/source/options
===================================================================
--- debian/source/options       (revision 0)
+++ debian/source/options       (revision 0)
@@ -0,0 +1,1 @@
+compression = "xz"


-- 
Ben Hutchings
It is impossible to make anything foolproof because fools are so ingenious.

signature.asc
Description: This is a digitally signed message part