[Debian-l10n-commits] translate-toolkit branch master updated. debian/2.0.0_b7-2

[Stuart Prescott]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "translate-toolkit".

The branch, master has been updated
       via  3ff2009832dddc2c621e21ab7e67a5aa7b1ea003 (commit)
       via  0ba7389cab63aaf0ef9291f7b9f8eec4b612d9aa (commit)
       via  60d8b86c3cab28f9ada7e15e6ff23b2ce89af23e (commit)
      from  a89bf090ed824da6e87e863217413b651df6cb2b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------

http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=3ff2009832dddc2c621e21ab7e67a5aa7b1ea003

commit 3ff2009832dddc2c621e21ab7e67a5aa7b1ea003
Author: Stuart Prescott <stuart at debian.org>
Date:   Sat Nov 5 21:14:23 2016 +1100

    Add changelog for upload


http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=0ba7389cab63aaf0ef9291f7b9f8eec4b612d9aa

commit 0ba7389cab63aaf0ef9291f7b9f8eec4b612d9aa
Author: Stuart Prescott <stuart at debian.org>
Date:   Sat Nov 5 21:14:12 2016 +1100

    skip cpo tests until python unbroken


http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=60d8b86c3cab28f9ada7e15e6ff23b2ce89af23e

commit 60d8b86c3cab28f9ada7e15e6ff23b2ce89af23e
Author: Stuart Prescott <stuart at debian.org>
Date:   Sat Nov 5 21:07:15 2016 +1100

    Add 'rename' to build-deps

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog                      |  7 +++++++
 debian/control                        |  1 +
 debian/patches/cpo-broken-tests.patch | 14 ++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 23 insertions(+)
 create mode 100644 debian/patches/cpo-broken-tests.patch

diff --git a/debian/changelog b/debian/changelog
index 5de3d26..9e543cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+translate-toolkit (2.0.0~b7-2) unstable; urgency=medium
+
+  * skip cpo tests for the time being since python segfaults.
+  * Add rename to build-depends.
+
+ -- Stuart Prescott <stuart at debian.org>  Sat, 05 Nov 2016 21:13:44 +1100
+
 translate-toolkit (2.0.0~b7-1) unstable; urgency=medium
 
   * Upload to unstable since 2.0 is looking good for inclusion in Stretch.
diff --git a/debian/control b/debian/control
index e4ca13c..210078f 100644
--- a/debian/control
+++ b/debian/control
@@ -46,6 +46,7 @@ Build-Depends-Indep:
  python3-vobject,
  python3-xapian,
  python3-yaml,
+ rename,
  subversion,
 Build-Depends:
  debhelper (>= 9~),
diff --git a/debian/patches/cpo-broken-tests.patch b/debian/patches/cpo-broken-tests.patch
new file mode 100644
index 0000000..7b9e7b3
--- /dev/null
+++ b/debian/patches/cpo-broken-tests.patch
@@ -0,0 +1,14 @@
+--- a/translate/storage/test_cpo.py
++++ b/translate/storage/test_cpo.py
+@@ -4,10 +4,7 @@
+ 
+ from pytest import importorskip, mark, raises
+ 
+-pytestmark = mark.skipif(
+-    not sys.platform.startswith('linux'),
+-    reason="cpo is only available on Linux"
+-)
++pytestmark = mark.skip(reason='python/ffi breakage makes python segfault')
+ 
+ from translate.misc import wStringIO
+ from translate.misc.multistring import multistring
diff --git a/debian/patches/series b/debian/patches/series
index e4c5ca6..b28cd70 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+cpo-broken-tests.patch
 tests-skip-call.patch
 test-data-location.path
 xliff-xsd-no-network.patch
-----------------------------------------------------------------------


hooks/post-receive
-- 
translate-toolkit