[Python-modules-commits] [python-odf] 02/05: record new upstream branch created by importing python-odf_1.3.4+dfsg.orig.tar.xz and merge it

[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 2a614b58dee991763964b4946042565a60002ea9
Merge: af461c0 c183b8b
Author: W. Martin Borgert <debacle at debian.org>
Date:   Sun Jan 22 10:42:08 2017 +0000

    record new upstream branch created by importing python-odf_1.3.4+dfsg.orig.tar.xz and merge it

 debian/.git-dpm                    |  14 +++++++-------
 odf/namespaces.py                  |   2 +-
 odf/opendocument.py                |   5 +++--
 setup.py                           |   4 ++--
 tests/examples/externalcontent.txt |   1 +
 tests/examples/nasty.odt           | Bin 0 -> 1539 bytes
 tests/testload.py                  |  29 +++++++++++++++++------------
 7 files changed, 31 insertions(+), 24 deletions(-)

diff --cc debian/.git-dpm
index 0613379,0000000..2ce10af
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
- ad9185961f35530a2321d4f3d09461b2404fc8af
- ad9185961f35530a2321d4f3d09461b2404fc8af
- ad9185961f35530a2321d4f3d09461b2404fc8af
- ad9185961f35530a2321d4f3d09461b2404fc8af
- python-odf_1.3.3+dfsg.orig.tar.xz
- 68a86f0fdd6e0835299496e439c6a7fb001c16f6
- 2524948
++c183b8b2ecc65e0886bb2766413c94e7b1275315
++c183b8b2ecc65e0886bb2766413c94e7b1275315
++c183b8b2ecc65e0886bb2766413c94e7b1275315
++c183b8b2ecc65e0886bb2766413c94e7b1275315
++python-odf_1.3.4+dfsg.orig.tar.xz
++e499ae5cbf41cc1a337661e52e54dedffeef77cf
++2526200
 +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