[Python-modules-commits] [python-odf] 04/10: 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 73f7cc753ae851ca9c881ee081568780f6345bfb
Merge: f43ee8e 411b32b
Author: W. Martin Borgert <debacle at debian.org>
Date:   Fri Dec 23 21:54:12 2016 +0000

    merge patched into master

 .gitignore                                         |   2 +-
 HOWTODIST                                          |  38 +++
 README.md                                          |   7 +-
 csv2ods/csv2ods.1                                  | 270 --------------------
 debian/.git-dpm                                    |   6 +-
 .../0001-Fixes-loading-of-Chinese-ODS-file.patch   |  26 --
 ...t-HTML_TIMESTAMP-for-reproducible-builds.patch} |   2 +-
 debian/patches/series                              |   3 +-
 mailodf/mailodf.1                                  | 232 -----------------
 odf/namespaces.py                                  |   4 +-
 odf/opendocument.py                                |   1 -
 odf/thumbnail.py                                   |   4 +-
 odf2mht/odf2mht.1                                  | 239 ------------------
 odf2xhtml/odf2xhtml.1                              | 221 ----------------
 odf2xml/odf2xml.1                                  | 231 -----------------
 odfimgimport/odfimgimport.1                        | 227 -----------------
 odflint/odflint.1                                  | 217 ----------------
 odfmeta/odfmeta.1                                  | 277 ---------------------
 odfoutline/odfoutline.1                            | 213 ----------------
 odfuserfield/odfuserfield.1                        | 267 --------------------
 setup                                              |   2 +
 setup.py                                           |   5 +-
 tests/examples/chinese_spreadsheet.ods             | Bin 0 -> 11765 bytes
 tests/runtests                                     |  10 +-
 tests/testload.py                                  |  22 +-
 tests/testnamespaces.py                            |  33 +++
 tests/testpicture.py                               |  43 ++++
 tests/teststyles.py                                |   9 +-
 xml2odf/xml2odf.1                                  | 235 -----------------
 29 files changed, 161 insertions(+), 2685 deletions(-)

diff --cc debian/.git-dpm
index 3936616,0000000..c93029f
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 40e4f351a63731c6cdc076487dea55e8eb5bca09
- 40e4f351a63731c6cdc076487dea55e8eb5bca09
- 91df7eb044bb8c54871ca613022c214211292475
++411b32bb49d3c73b9f4e7ce26a41de9aae29f00d
++411b32bb49d3c73b9f4e7ce26a41de9aae29f00d
++612542eedb96dd8216efebabdd108abb21953f91
 +612542eedb96dd8216efebabdd108abb21953f91
 +python-odf_1.3.2+dfsg2.orig.tar.xz
 +ab668cca3d0ac815583d4684809396be45f5928f
 +2522388
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
index c11a3d9,0000000..f9bf88d
mode 100644,000000..100644
--- a/debian/patches/0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
+++ b/debian/patches/0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 40e4f351a63731c6cdc076487dea55e8eb5bca09 Mon Sep 17 00:00:00 2001
++From 411b32bb49d3c73b9f4e7ce26a41de9aae29f00d 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
diff --cc debian/patches/series
index 9407173,0000000..3e81326
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- 0001-Fixes-loading-of-Chinese-ODS-file.patch
- 0002-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
++0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch

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