[Python-modules-commits] [python-odf] 04/04: merge patched into master

[Wolfgang Borgert]

This is an automated email from the git hooks/post-receive script.

debacle pushed a commit to branch master
in repository python-odf.

commit 318e3780302bbcd6f6090014815657e51df1c665
Merge: f92f224 40e4f35
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Oct 11 02:10:43 2015 +0200

    merge patched into master

 debian/.git-dpm                                                     | 6 +++---
 debian/patches/0001-Fixes-loading-of-Chinese-ODS-file.patch         | 2 +-
 .../patches/0002-unset-HTML_TIMESTAMP-for-reproducible-builds.patch | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index d75e86b,0000000..b577a5c
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- ec3038d336dedf7e0332235db93c4eee67931d61
- ec3038d336dedf7e0332235db93c4eee67931d61
- 3a63e2b9ddb958324b5d13472be21975120fe44e
++40e4f351a63731c6cdc076487dea55e8eb5bca09
++40e4f351a63731c6cdc076487dea55e8eb5bca09
++91df7eb044bb8c54871ca613022c214211292475
 +91df7eb044bb8c54871ca613022c214211292475
 +python-odf_1.3.1+dfsg.orig.tar.gz
 +0a59b29abd6a76087e686badbc32d7500e85e305
 +2752889
diff --cc debian/patches/0001-Fixes-loading-of-Chinese-ODS-file.patch
index df60c7f,0000000..24fe0ed
mode 100644,000000..100644
--- a/debian/patches/0001-Fixes-loading-of-Chinese-ODS-file.patch
+++ b/debian/patches/0001-Fixes-loading-of-Chinese-ODS-file.patch
@@@ -1,26 -1,0 +1,26 @@@
- From bccaed899f26495d7aa875b9aa2ad2aa06098e18 Mon Sep 17 00:00:00 2001
++From 5a2bf09941fa26f8e3c5847308828d5dbfb65309 Mon Sep 17 00:00:00 2001
 +From: "W. Martin Borgert" <debacle at debian.org>
 +Date: Sat, 10 Oct 2015 00:40:55 +0200
 +Subject: Fixes loading of Chinese ODS file
 +
 +Origin: vendor
 +Bug: https://github.com/eea/odfpy/issues/19
 +Bug-Debian: https://bugs.debian.org/783789
 +Last-Update: 2015-07-25
 +---
 + odf/attrconverters.py | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/odf/attrconverters.py b/odf/attrconverters.py
 +index cbdd8f3..fd48f6a 100644
 +--- a/odf/attrconverters.py
 ++++ b/odf/attrconverters.py
 +@@ -103,7 +103,7 @@ def cnv_family(attribute, arg, element):
 + def __save_prefix(attribute, arg, element):
 +     prefix = arg.split(':',1)[0]
 +     if prefix == arg:
 +-        return str(arg)
 ++        return arg
 +     namespace = element.get_knownns(prefix)
 +     if namespace is None:
 +         #raise ValueError( "'%s' is an unknown prefix" % str(prefix))
diff --cc debian/patches/0002-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
index 53463dc,0000000..c11a3d9
mode 100644,000000..100644
--- a/debian/patches/0002-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
+++ b/debian/patches/0002-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
@@@ -1,26 -1,0 +1,26 @@@
- From ec3038d336dedf7e0332235db93c4eee67931d61 Mon Sep 17 00:00:00 2001
++From 40e4f351a63731c6cdc076487dea55e8eb5bca09 Mon Sep 17 00:00:00 2001
 +From: "W. Martin Borgert" <debacle at debian.org>
 +Date: Sat, 10 Oct 2015 00:41:09 +0200
 +Subject: unset HTML_TIMESTAMP for reproducible builds
 +
 +Origin: vendor
 +Bug: https://github.com/eea/odfpy/issues/20
 +Bug-Debian: https://bugs.debian.org/777635
 +Last-Update: 2015-07-25
 +---
 + config.dox | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/config.dox b/config.dox
 +index 257dfde..bf460ff 100644
 +--- a/config.dox
 ++++ b/config.dox
 +@@ -1127,7 +1127,7 @@ HTML_COLORSTYLE_GAMMA  = 80
 + # The default value is: YES.
 + # This tag requires that the tag GENERATE_HTML is set to YES.
 + 
 +-HTML_TIMESTAMP         = YES
 ++HTML_TIMESTAMP         = NO
 + 
 + # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 + # documentation will contain sections that can be hidden and shown after the

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-odf.git