summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguelangel Jose Freitas Loreto <miguelangel.freitas@gmail.com>2010-01-31 10:09:53 -0330
committerDmitry Bogatov <KAction@debian.org>2018-12-02 05:36:57 +0000
commitfc39540de8988a468a2c2e4aa38c4320b0788db0 (patch)
treebc40a64afe32f7e0e8f242cf53d2a414aceabc09
parent14cec040c6fa99680d9ffc4c3b6ff7bcdc073146 (diff)
parenta17df1c35c397d008c7990ea7ba8b8a2d9525c8c (diff)
Import Debian changes 6.6-1
dtrx (6.6-1) unstable; urgency=low * New upstram release. * Switch to dpkg-source 3.0 (quilt) format. * debian/control: - Add xz-utils to B-D-I and Depends to handle 'xz compression'.
-rw-r--r--INSTALL7
-rw-r--r--NEWS16
-rw-r--r--PKG-INFO4
-rw-r--r--debian/changelog9
-rw-r--r--debian/control6
-rw-r--r--debian/source/format1
-rwxr-xr-xscripts/dtrx12
-rw-r--r--setup.py4
-rw-r--r--tests/test-text.xzbin0 -> 60 bytes
-rw-r--r--tests/tests.yml14
10 files changed, 57 insertions, 16 deletions
diff --git a/INSTALL b/INSTALL
index 715d2b6..abe9d07 100644
--- a/INSTALL
+++ b/INSTALL
@@ -54,6 +54,9 @@ Files compressed with bzip2
Files compressed with lzma
lzcat
+Files compressed with xz
+ xzcat
+
Installation
------------
@@ -73,9 +76,9 @@ Simply run the following command from the dtrx source directory::
python tests/compare.py
-To run the tests, you'll need the `syck module`_.
+To run the tests, you'll need the `PyYAML module`_.
-.. _syck module: http://whytheluckystiff.net/syck/
+.. _PyYAML module: http://pyyaml.org/
If everything's in order, all the tests should pass. Note that some of
them will fail if some of the programs listed above aren't installed on
diff --git a/NEWS b/NEWS
index fc29120..24448ea 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,22 @@
Changes in dtrx
===============
+Version 6.6
+-----------
+
+Enhancements
+~~~~~~~~~~~~
+
+ * dtrx can now handle `xz compression`_.
+
+.. _xz compression: http://tukaani.org/xz/
+
+Other changes
+~~~~~~~~~~~~~
+
+ * The tests now use the PyYAML library, instead of the abandoned Syck.
+ Thanks to Miguelangel Jose Freitas Loreto for a patch.
+
Version 6.5
-----------
diff --git a/PKG-INFO b/PKG-INFO
index d75a1cf..7c6e219 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: dtrx
-Version: 6.5
+Version: 6.6
Summary: Script to intelligently extract multiple archive types
Home-page: http://www.brettcsmith.org/2007/dtrx/
Author: Brett Smith
@@ -11,7 +11,7 @@ Description: dtrx extracts archives in a number of different
formats; it currently supports tar, zip (including self-extracting
.exe files), cpio, rpm, deb, gem, 7z, cab, rar, and InstallShield
files. It can also decompress files compressed with gzip, bzip2,
- lzma, or compress.
+ lzma, xz, or compress.
In addition to providing one command to handle many different archive
types, dtrx also aids the user by extracting contents consistently.
diff --git a/debian/changelog b/debian/changelog
index 193eb76..78ba28d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+dtrx (6.6-1) unstable; urgency=low
+
+ * New upstram release.
+ * Switch to dpkg-source 3.0 (quilt) format.
+ * debian/control:
+ - Add xz-utils to B-D-I and Depends to handle 'xz compression'.
+
+ -- Miguelangel Jose Freitas Loreto <miguelangel.freitas@gmail.com> Sun, 31 Jan 2010 09:09:53 -0430
+
dtrx (6.5-2) unstable; urgency=low
* debian/control:
diff --git a/debian/control b/debian/control
index cc7aeb3..4813590 100644
--- a/debian/control
+++ b/debian/control
@@ -3,14 +3,14 @@ Section: utils
Priority: optional
Maintainer: Miguelangel Jose Freitas Loreto <miguelangel.freitas@gmail.com>
Build-Depends: debhelper (>= 7), python (>= 2.4 )
-Build-Depends-Indep: python-yaml, python-central, python-support, bzip2, unzip, cpio, rpm, binutils, p7zip-full, cabextract, unshield, lzma, rst2man
-Standards-Version: 3.8.3
+Build-Depends-Indep: python-yaml, python-central, python-support, bzip2, unzip, cpio, rpm, binutils, p7zip-full, cabextract, unshield, lzma, rst2man, xz-utils
+Standards-Version: 3.8.4
Homepage: http://brettcsmith.org/2007/dtrx/
XS-Python-Version: >= 2.4
Package: dtrx
Architecture: all
-Depends: python (${python:Versions}), ${python:Depends}, bzip2, unzip, cpio, rpm, binutils, p7zip-full, cabextract, unshield, lzma, ${misc:Depends}
+Depends: python (${python:Versions}), ${python:Depends}, bzip2, unzip, cpio, rpm, binutils, p7zip-full, cabextract, unshield, lzma, xz-utils, ${misc:Depends}
XB-Python-Version: ${python:Versions}
Description: intelligently extract multiple archive types
dtrx is basically the same as tar -zxf or tar -xjf except you don't have
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/scripts/dtrx b/scripts/dtrx
index f053989..7a98ba5 100755
--- a/scripts/dtrx
+++ b/scripts/dtrx
@@ -44,7 +44,7 @@ try:
except NameError:
from sets import Set as set
-VERSION = "6.5"
+VERSION = "6.6"
VERSION_BANNER = """dtrx version %s
Copyright © 2006-2009 Brett Smith <brettcsmith@brettcsmith.org>
Copyright © 2008 Peter Kelemen <Peter.Kelemen@gmail.com>
@@ -80,6 +80,7 @@ RECURSE_LIST = 5
mimetypes.encodings_map.setdefault('.bz2', 'bzip2')
mimetypes.encodings_map.setdefault('.lzma', 'lzma')
+mimetypes.encodings_map.setdefault('.xz', 'xz')
mimetypes.types_map.setdefault('.gem', 'application/x-ruby-gem')
logger = logging.getLogger('dtrx-log')
@@ -138,7 +139,7 @@ EXTRACTION_ERRORS = (ExtractorError, ExtractorUnusable, OSError, IOError)
class BaseExtractor(object):
decoders = {'bzip2': 'bzcat', 'gzip': 'zcat', 'compress': 'zcat',
- 'lzma': 'lzcat'}
+ 'lzma': 'lzcat', 'xz': 'xzcat'}
name_checker = DirectoryChecker
def __init__(self, filename, encoding):
@@ -884,17 +885,20 @@ class ExtractorBuilder(object):
for mapping in (('tar', 'bzip2', 'tar.bz2', 'tbz2', 'tb2', 'tbz'),
('tar', 'gzip', 'tar.gz', 'tgz'),
('tar', 'lzma', 'tar.lzma', 'tlz'),
+ ('tar', 'xz', 'tar.xz'),
('tar', 'compress', 'tar.Z', 'taz'),
('compress', 'gzip', 'Z', 'gz'),
('compress', 'bzip2', 'bz2'),
- ('compress', 'lzma', 'lzma')):
+ ('compress', 'lzma', 'lzma'),
+ ('compress', 'xz', 'xz')):
for extension in mapping[2:]:
extension_map.setdefault(extension, []).append(mapping[:2])
magic_encoding_map = {}
for mapping in (('bzip2', 'bzip2 compressed'),
('gzip', 'gzip compressed'),
- ('lzma', 'LZMA compressed')):
+ ('lzma', 'LZMA compressed'),
+ ('xz', 'xz compressed')):
for pattern in mapping[1:]:
magic_encoding_map[re.compile(pattern)] = mapping[0]
diff --git a/setup.py b/setup.py
index 939528b..b8ab4e7 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from distutils.core import setup
setup(name="dtrx",
- version = "6.5",
+ version = "6.6",
description = "Script to intelligently extract multiple archive types",
author = "Brett Smith",
author_email = "brettcsmith@brettcsmith.org",
@@ -24,7 +24,7 @@ setup(name="dtrx",
formats; it currently supports tar, zip (including self-extracting
.exe files), cpio, rpm, deb, gem, 7z, cab, rar, and InstallShield
files. It can also decompress files compressed with gzip, bzip2,
- lzma, or compress.
+ lzma, xz, or compress.
In addition to providing one command to handle many different archive
types, dtrx also aids the user by extracting contents consistently.
diff --git a/tests/test-text.xz b/tests/test-text.xz
new file mode 100644
index 0000000..75ef861
--- /dev/null
+++ b/tests/test-text.xz
Binary files differ
diff --git a/tests/tests.yml b/tests/tests.yml
index b6b28f4..95f0aef 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -107,6 +107,14 @@
posttest: |
if [ "x`cat test-text`" != "xhi" ]; then exit 1; fi
+- name: decompressing xz
+ directory: inside-dir
+ filenames: ../test-text.xz
+ baseline: |
+ xzcat $1 >test-text
+ posttest: |
+ if [ "x`cat test-text`" != "xhi" ]; then exit 1; fi
+
- name: decompression with -r
directory: inside-dir
filenames: ../test-text.gz
@@ -191,7 +199,7 @@
filenames: tests.yml
options: -n -qq
error: true
- antigrep: .
+ antigrep: '.'
- name: can't write to directory
directory: inside-dir
@@ -511,7 +519,7 @@
filenames: trickery.tar.gz
prerun: cp ${1}test-1.23.zip ${1}trickery.tar.gz
cleanup: rm -f ${1}trickery.tar.gz
- antigrep: .
+ antigrep: '.'
baseline: |
mkdir trickery
cd trickery
@@ -682,4 +690,4 @@
- name: listing empty archive
filenames: test-empty.tar.bz2
options: -l
- antigrep: .
+ antigrep: '.'