[Debian-l10n-commits] translate-toolkit branch master updated. debian/2.2.5-2
Stuart Prescott
stuart at moszumanska.debian.org
Thu Jan 4 13:25:03 UTC 2018
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 2f691b1b55796b2e28eb1a8391bf5893e37fdf46 (commit)
via a90cdb952f4cdf3208eaa99b5c5bc3304d21307e (commit)
via 6e15f9bcada9d4328ce5c3941fab04c4191a5528 (commit)
via 81daefac0f9db970c714e833cec55b632b2705e2 (commit)
via 063c18e3e33d512c12da9821bee18d0c1d4ed188 (commit)
via ba9638fda83468799c6420a37473494e82ad9ba5 (commit)
from ab172074959947afd581c93071faa52a6d707397 (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=2f691b1b55796b2e28eb1a8391bf5893e37fdf46
commit 2f691b1b55796b2e28eb1a8391bf5893e37fdf46
Author: Stuart Prescott <stuart at debian.org>
Date: Fri Jan 5 00:08:29 2018 +1100
Add changelog for upload
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=a90cdb952f4cdf3208eaa99b5c5bc3304d21307e
commit a90cdb952f4cdf3208eaa99b5c5bc3304d21307e
Author: Stuart Prescott <stuart at debian.org>
Date: Fri Jan 5 00:17:20 2018 +1100
Useless whitespace diff to appease lintian
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=6e15f9bcada9d4328ce5c3941fab04c4191a5528
commit 6e15f9bcada9d4328ce5c3941fab04c4191a5528
Author: Stuart Prescott <stuart at debian.org>
Date: Fri Jan 5 00:16:07 2018 +1100
Drop obsolete lintian override for license.rst
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=81daefac0f9db970c714e833cec55b632b2705e2
commit 81daefac0f9db970c714e833cec55b632b2705e2
Author: Stuart Prescott <stuart at debian.org>
Date: Fri Jan 5 00:06:16 2018 +1100
Update to SV 4.1.3
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=063c18e3e33d512c12da9821bee18d0c1d4ed188
commit 063c18e3e33d512c12da9821bee18d0c1d4ed188
Author: Stuart Prescott <stuart at debian.org>
Date: Fri Jan 5 00:05:54 2018 +1100
Update to debhelper compat 11
http://anonscm.debian.org/gitweb/?p=debian-l10n/translate-toolkit.git;a=commitdiff;h=ba9638fda83468799c6420a37473494e82ad9ba5
commit ba9638fda83468799c6420a37473494e82ad9ba5
Author: Stuart Prescott <stuart at debian.org>
Date: Fri Jan 5 00:05:00 2018 +1100
Patch out test failing due to TZ changes
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 16 +++++++++---
debian/compat | 2 +-
debian/control | 4 +--
debian/patches/series | 1 +
debian/patches/test-skip-tz-windhoek.patch | 35 ++++++++++++++++++++++++++
debian/translate-toolkit-doc.doc-base | 4 +--
debian/translate-toolkit-doc.lintian-overrides | 1 -
7 files changed, 54 insertions(+), 9 deletions(-)
create mode 100644 debian/patches/test-skip-tz-windhoek.patch
delete mode 100644 debian/translate-toolkit-doc.lintian-overrides
diff --git a/debian/changelog b/debian/changelog
index b081922..fda0daf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+translate-toolkit (2.2.5-2) unstable; urgency=medium
+
+ * Patch out test failing due to TZ definition changes.
+ * Update Standards-Version to 4.1.3 (no changes required).
+ * Update to debhelper 11.
+ - Relocate documentation to /usr/share/doc/translate-toolkit.
+ * Drop unneeded lintian override for license.rst.
+
+ -- Stuart Prescott <stuart at debian.org> Fri, 05 Jan 2018 00:08:13 +1100
+
translate-toolkit (2.2.5-1) unstable; urgency=medium
* New upstream version.
@@ -207,7 +217,7 @@ translate-toolkit (1.9.0-1) unstable; urgency=low
* Recommend python-aeidon instead of gaupol. Closes: #569983
* Bump Standard to 3.9.1 (checked)
* Drop dh_link call
- * Move to source v3
+ * Move to source v3
-- Christian Perrier <bubulle at debian.org> Sun, 17 Apr 2011 10:06:54 +0200
@@ -438,7 +448,7 @@ translate-toolkit (1.1.1-1) unstable; urgency=low
translate-toolkit (1.1.0-1) unstable; urgency=low
- * New upstream release.
+ * New upstream release.
* debian/control:
+ Added build dependency on python-lxml and python-elementtree for
manpage generation
@@ -461,7 +471,7 @@ translate-toolkit (1.1.0-1) unstable; urgency=low
translate-toolkit (1.0.1-1) unstable; urgency=low
- * New upstream release.
+ * New upstream release.
* Remove patches applied upstream: manpages_missing_descriptions and
manpages_groff_formatting.
diff --git a/debian/compat b/debian/compat
index ec63514..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+11
diff --git a/debian/control b/debian/control
index 9ce58c2..2bc98e0 100644
--- a/debian/control
+++ b/debian/control
@@ -51,9 +51,9 @@ Build-Depends-Indep:
rename,
subversion,
Build-Depends:
- debhelper (>= 9~),
+ debhelper (>= 11~),
dh-python,
-Standards-Version: 4.1.0
+Standards-Version: 4.1.3
Vcs-Git: https://anonscm.debian.org/cgit/debian-l10n/translate-toolkit.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-l10n/translate-toolkit.git
Homepage: http://toolkit.translatehouse.org/
diff --git a/debian/patches/series b/debian/patches/series
index e4c5ca6..d1529b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@ sphinx-intersphinx.patch
#langmodels-relocate.patch
af-pootle.patch
py3-skip-tests.patch
+test-skip-tz-windhoek.patch
diff --git a/debian/patches/test-skip-tz-windhoek.patch b/debian/patches/test-skip-tz-windhoek.patch
new file mode 100644
index 0000000..838b77a
--- /dev/null
+++ b/debian/patches/test-skip-tz-windhoek.patch
@@ -0,0 +1,35 @@
+commit efd3b9b82a85813a1d6f2b9ee09d5328d2afe113
+Author: Stuart Prescott <stuart at debian.org>
+Date: Thu Jan 4 23:39:19 2018 +1100
+Forwarded: https://github.com/translate/translate/pull/3756
+
+ Stop testing with changing Africa/Windhoek TZ
+
+ The Africa/Windhoek TZ is changing; Namibia changes its TZ definitions in 2018
+ and so this test fails when run after 2018-04-01.
+
+ From tzdata Release 2017c - 2017-10-20 14:49:34 -0700:
+
+ Namibia will switch from +01 with DST to +02 all year on
+ 2017-09-03 at 02:00. This affects UT offsets starting 2018-04-01
+ at 02:00. (Thanks to Steffen Thorsen.)
+
+ This particular test isn't hitting code paths not addressed by other tests
+ so removing it is simplest.
+
+--- a/translate/storage/test_poheader.py
++++ b/translate/storage/test_poheader.py
+@@ -122,13 +122,6 @@
+ # Typically "+0200"
+ assert poheader.tzstring() == time.strftime("%z")
+
+- os.environ['TZ'] = 'Africa/Windhoek'
+- time.tzset()
+- assert time.timezone == -3600
+- # Typically "+0100"
+- # For some reason python's %z doesn't know about Windhoek DST
+- #assert poheader.tzstring() == time.strftime("%z")
+-
+ os.environ['TZ'] = 'UTC'
+ time.tzset()
+ assert time.timezone == 0
diff --git a/debian/translate-toolkit-doc.doc-base b/debian/translate-toolkit-doc.doc-base
index 4f783d9..741aad3 100644
--- a/debian/translate-toolkit-doc.doc-base
+++ b/debian/translate-toolkit-doc.doc-base
@@ -6,5 +6,5 @@ Abstract: The Translate Toolkit is a Python package that assists in
Section: Text
Format: HTML
-Index: /usr/share/doc/translate-toolkit-doc/html/index.html
-Files: /usr/share/doc/translate-toolkit-doc/html/*.html
+Index: /usr/share/doc/translate-toolkit/html/index.html
+Files: /usr/share/doc/translate-toolkit/html/*.html
diff --git a/debian/translate-toolkit-doc.lintian-overrides b/debian/translate-toolkit-doc.lintian-overrides
deleted file mode 100644
index 7a12d48..0000000
--- a/debian/translate-toolkit-doc.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-translate-toolkit-doc: extra-license-file
-----------------------------------------------------------------------
hooks/post-receive
--
translate-toolkit
More information about the Debian-l10n-commits
mailing list