[Python-modules-commits] [python-odf] 09/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 6489046ccf6d98a4322a64ddbdf5bcf391189c02
Merge: dd6ae4b ad91859
Author: W. Martin Borgert <debacle at debian.org>
Date:   Fri Dec 23 22:56:44 2016 +0000

    merge patched into master

 config.dox                             |   2 +-
 csv2ods/csv2ods.1                      | 270 ++++++++++++++++++++++++++++++++
 debian/.git-dpm                        |   6 +-
 debian/patches/fixMath.patch           |  49 ------
 debian/patches/no_html_timestamp.patch |  19 ---
 debian/patches/series                  |   2 -
 mailodf/mailodf.1                      | 232 +++++++++++++++++++++++++++
 odf/anim.py                            |   4 +-
 odf/attrconverters.py                  |   2 +-
 odf/chart.py                           |   4 +-
 odf/config.py                          |   4 +-
 odf/dc.py                              |   4 +-
 odf/dr3d.py                            |   6 +-
 odf/draw.py                            |   4 +-
 odf/easyliststyle.py                   |   4 +-
 odf/element.py                         |   6 +-
 odf/elementtypes.py                    |   2 +-
 odf/form.py                            |   4 +-
 odf/grammar.py                         |   2 +-
 odf/load.py                            |   4 +-
 odf/manifest.py                        |   5 +-
 odf/math.py                            |   4 +-
 odf/meta.py                            |   4 +-
 odf/namespaces.py                      |   2 +-
 odf/number.py                          |   6 +-
 odf/odf2moinmoin.py                    |   4 +-
 odf/odf2xhtml.py                       |  13 +-
 odf/office.py                          |   6 +-
 odf/opendocument.py                    |  46 +++---
 odf/presentation.py                    |   4 +-
 odf/script.py                          |   4 +-
 odf/style.py                           |   4 +-
 odf/svg.py                             |   6 +-
 odf/table.py                           |   4 +-
 odf/text.py                            |   6 +-
 odf/xforms.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.py                               |   2 +-
 xml2odf/xml2odf.1                      | 235 ++++++++++++++++++++++++++++
 46 files changed, 2721 insertions(+), 160 deletions(-)

diff --cc debian/.git-dpm
index 1c64178,0000000..0613379
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
- 411b32bb49d3c73b9f4e7ce26a41de9aae29f00d
- 411b32bb49d3c73b9f4e7ce26a41de9aae29f00d
- 612542eedb96dd8216efebabdd108abb21953f91
++ad9185961f35530a2321d4f3d09461b2404fc8af
++ad9185961f35530a2321d4f3d09461b2404fc8af
++ad9185961f35530a2321d4f3d09461b2404fc8af
 +ad9185961f35530a2321d4f3d09461b2404fc8af
 +python-odf_1.3.3+dfsg.orig.tar.xz
 +68a86f0fdd6e0835299496e439c6a7fb001c16f6
 +2524948
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"

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