summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiguelangel Jose Freitas Loreto <miguelangel.freitas@gmail.com>2009-08-17 09:54:34 -0330
committerDmitry Bogatov <KAction@debian.org>2018-12-02 05:36:56 +0000
commit14cec040c6fa99680d9ffc4c3b6ff7bcdc073146 (patch)
tree6bacf972ca05504724ad5d8ca52ffcb72c424d4e
parentd42e9428681c357ae0cd1923f5f336c12551812f (diff)
Import Debian changes 6.5-2
dtrx (6.5-2) unstable; urgency=low * debian/control: - B-D-I: Using python-yaml instead of python-syck (Closes: #541955). - Standards-Version: 3.8.3
-rw-r--r--debian/changelog8
-rw-r--r--debian/control4
-rw-r--r--tests/compare.py4
-rw-r--r--tests/tests.yml4
4 files changed, 14 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index e96214d..193eb76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+dtrx (6.5-2) unstable; urgency=low
+
+ * debian/control:
+ - B-D-I: Using python-yaml instead of python-syck (Closes: #541955).
+ - Standards-Version: 3.8.3
+
+ -- Miguelangel Jose Freitas Loreto <miguelangel.freitas@gmail.com> Mon, 17 Aug 2009 08:54:34 -0430
+
dtrx (6.5-1) unstable; urgency=low
* New upstram release.
diff --git a/debian/control b/debian/control
index 25a23c9..cc7aeb3 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: utils
Priority: optional
Maintainer: Miguelangel Jose Freitas Loreto <miguelangel.freitas@gmail.com>
Build-Depends: debhelper (>= 7), python (>= 2.4 )
-Build-Depends-Indep: python-syck, python-central, python-support, bzip2, unzip, cpio, rpm, binutils, p7zip-full, cabextract, unshield, lzma, rst2man
-Standards-Version: 3.8.2
+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
Homepage: http://brettcsmith.org/2007/dtrx/
XS-Python-Version: >= 2.4
diff --git a/tests/compare.py b/tests/compare.py
index 7927467..56122aa 100644
--- a/tests/compare.py
+++ b/tests/compare.py
@@ -20,7 +20,7 @@
import os
import re
import subprocess
-import syck
+import yaml
import sys
import tempfile
@@ -220,7 +220,7 @@ class ExtractorTest(object):
test_db = open('tests.yml')
-test_data = syck.load(test_db.read(-1))
+test_data = yaml.load(test_db.read(-1))
test_db.close()
tests = [ExtractorTest(**data) for data in test_data]
for original_data in test_data:
diff --git a/tests/tests.yml b/tests/tests.yml
index a0758f0..b6b28f4 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -461,7 +461,7 @@
input: |
h
o
- grep: "contains 2 other archive file\(s\), out of 2 file\(s\)"
+ grep: 'contains 2 other archive file\(s\), out of 2 file\(s\)'
baseline: |
tar -xf $1
cd subdir
@@ -646,7 +646,7 @@
r
l
n
- grep: "^test-deep-recursion/subsubdir/test-text\.gz$"
+ grep: '^test-deep-recursion/subsubdir/test-text\.gz$'
- name: partly failed extraction
options: -n