[Python-modules-commits] [python-odf] 05/10: package 1.3.2+dfsg2-1 by Georges Khaznadar
Wolfgang Borgert
debacle at moszumanska.debian.org
Fri Dec 23 23:33:39 UTC 2016
This is an automated email from the git hooks/post-receive script.
debacle pushed a commit to branch master
in repository python-odf.
commit c57c054a838ce1b4263b2adb8e57db2cff422d37
Author: Georges Khaznadar <georgesk at debian.org>
Date: Fri Dec 23 21:59:21 2016 +0000
package 1.3.2+dfsg2-1 by Georges Khaznadar
---
config.dox | 2 +-
debian/changelog | 34 +++++++++++++--
debian/control | 10 +++--
debian/patches/fixMath.patch | 49 ++++++++++++++++++++++
...ucible-builds.patch => no_html_timestamp.patch} | 15 ++-----
debian/patches/series | 3 +-
debian/python-odf-doc.lintian-overrides | 4 ++
debian/python-odf-tools.install | 2 -
debian/python-odf.install | 1 -
debian/python3-odf.install | 1 -
debian/rules | 19 +++++----
11 files changed, 109 insertions(+), 31 deletions(-)
diff --git a/config.dox b/config.dox
index bf460ff..257dfde 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 = NO
+HTML_TIMESTAMP = YES
# 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 --git a/debian/changelog b/debian/changelog
index b967c8d..a607b5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,36 @@
-python-odf (1.3.1+dfsg-2) UNRELEASED; urgency=medium
+python-odf (1.3.2+dfsg2-1) unstable; urgency=medium
- * Fixed VCS URL (https)
+ * repacked the source: removed the doc subdirectory since it is generated
+ by Doxygen
- -- Ondřej Nový <novy at ondrej.org> Tue, 29 Mar 2016 22:12:58 +0200
+ -- Georges Khaznadar <georgesk at debian.org> Sun, 01 May 2016 15:11:46 +0200
+
+python-odf (1.3.2+dfsg1-3) unstable; urgency=medium
+
+ * upgraded Standards-Version to 3.9.8
+ * fixed dependencies for python3-odf. Closes: #822099
+ * defined XS-Python-Version and XS-Python3-Version
+ * simplified d/rules
+
+ -- Georges Khaznadar <georgesk at debian.org> Sat, 30 Apr 2016 16:42:17 +0200
+
+python-odf (1.3.2+dfsg1-2) unstable; urgency=medium
+
+ * recompiled the package to change dependencies. Closes: #822099
+
+ -- Georges Khaznadar <georgesk at debian.org> Sat, 23 Apr 2016 23:41:55 +0200
+
+python-odf (1.3.2+dfsg1-1) unstable; urgency=medium
+
+ * New upstream version
+
+ -- Georges Khaznadar <georgesk at debian.org> Fri, 19 Feb 2016 20:22:35 +0100
+
+python-odf (1.3.1+dfsg-2) unstable; urgency=medium
+
+ * fixed an issue raised by math elements, for odt2xhtml
+
+ -- Georges Khaznadar <georgesk at debian.org> Fri, 19 Feb 2016 12:40:21 +0100
python-odf (1.3.1+dfsg-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 63c0f08..36d9426 100644
--- a/debian/control
+++ b/debian/control
@@ -5,12 +5,14 @@ Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.
Uploaders: Thomas Bechtold <thomasbechtold at jpberlin.de>,
W. Martin Borgert <debacle at debian.org>,
Georges Khaznadar <georgesk at debian.org>
-Standards-Version: 3.9.6
+Standards-Version: 3.9.8
Build-Depends: debhelper (>= 9), python-all, python3-all, xmlto,
python-setuptools, dh-python, doxygen, doxypy, graphviz
Homepage: https://github.com/eea/odfpy
-Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/python-odf.git
-Vcs-Browser: https://anonscm.debian.org/cgit/python-modules/packages/python-odf.git
+XS-Python-Version: >=2.7
+XS-Python3-Version: >=3.4
+Vcs-Git: git://anonscm.debian.org/python-modules/packages/python-odf.git
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=python-modules/packages/python-odf.git
Package: python-odf
Architecture: all
@@ -45,7 +47,7 @@ Description: Python API and tools to manipulate OpenDocument files
Package: python3-odf
Architecture: all
Recommends: python-odf-doc, python-odf-tools
-Depends: ${misc:Depends}, ${python:Depends}, python3
+Depends: ${misc:Depends}, ${python3:Depends}
Description: Python API and tools to manipulate OpenDocument files
Odfpy is a library to read and write OpenDocument v. 1.1 files.
The main focus has been to prevent the programmer from creating invalid
diff --git a/debian/patches/fixMath.patch b/debian/patches/fixMath.patch
new file mode 100644
index 0000000..f4c58da
--- /dev/null
+++ b/debian/patches/fixMath.patch
@@ -0,0 +1,49 @@
+Index: python-odf-1.3.2+dfsg1/odf/odf2xhtml.py
+===================================================================
+--- python-odf-1.3.2+dfsg1.orig/odf/odf2xhtml.py
++++ python-odf-1.3.2+dfsg1/odf/odf2xhtml.py
+@@ -748,12 +748,15 @@ class ODF2XHTML(handler.ContentHandler):
+ """
+ objhref = attrs[(XLINKNS,"href")]
+ # Remove leading "./": from "./Object 1" to "Object 1"
+-# objhref = objhref [2:]
++ # objhref = objhref [2:]
+
+ # Not using os.path.join since it fails to find the file on Windows.
+-# objcontentpath = '/'.join([objhref, 'content.xml'])
+-
+- for c in self.document.childnodes:
++ # objcontentpath = '/'.join([objhref, 'content.xml'])
++ ################################
++ # fixed: self.document.childnodes ===> self.document.childobjects
++ # 2016-02-19 G.K.
++ ################################
++ for c in self.document.childobjects:
+ if c.folder == objhref:
+ self._walknode(c.topnode)
+
+Index: python-odf-1.3.2+dfsg1/odf/opendocument.py
+===================================================================
+--- python-odf-1.3.2+dfsg1.orig/odf/opendocument.py
++++ python-odf-1.3.2+dfsg1/odf/opendocument.py
+@@ -916,9 +916,17 @@ def __fixXmlPart(xmlpart):
+ u'svg', u'fo',u'draw', u'table',u'form')
+ for prefix in requestedPrefixes:
+ if u' xmlns:{prefix}'.format(prefix=prefix) not in xmlpart:
+- pos=result.index(u" xmlns:")
+- toInsert=u' xmlns:{prefix}="urn:oasis:names:tc:opendocument:xmlns:{prefix}:1.0"'.format(prefix=prefix)
+- result=result[:pos]+toInsert+result[pos:]
++ ###########################################
++ # fixed a bug triggered by math elements
++ # Notice: math elements are probably wrongly exported to XHTML
++ # 2016-02-19 G.K.
++ ###########################################
++ try:
++ pos=result.index(u" xmlns:")
++ toInsert=u' xmlns:{prefix}="urn:oasis:names:tc:opendocument:xmlns:{prefix}:1.0"'.format(prefix=prefix)
++ result=result[:pos]+toInsert+result[pos:]
++ except:
++ pass
+ return result
+
+
diff --git a/debian/patches/0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch b/debian/patches/no_html_timestamp.patch
similarity index 54%
rename from debian/patches/0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
rename to debian/patches/no_html_timestamp.patch
index f9bf88d..4f17289 100644
--- a/debian/patches/0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
+++ b/debian/patches/no_html_timestamp.patch
@@ -1,21 +1,14 @@
-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
-
+Description: unset HTML_TIMESTAMP for reproducible builds
+Author: W. Martin Borgert <debacle at debian.org>
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
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/config.dox
+++ b/config.dox
-@@ -1127,7 +1127,7 @@ HTML_COLORSTYLE_GAMMA = 80
+@@ -1127,7 +1127,7 @@
# The default value is: YES.
# This tag requires that the tag GENERATE_HTML is set to YES.
diff --git a/debian/patches/series b/debian/patches/series
index 3e81326..25eebd7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-0001-unset-HTML_TIMESTAMP-for-reproducible-builds.patch
+no_html_timestamp.patch
+fixMath.patch
diff --git a/debian/python-odf-doc.lintian-overrides b/debian/python-odf-doc.lintian-overrides
new file mode 100644
index 0000000..717ca7d
--- /dev/null
+++ b/debian/python-odf-doc.lintian-overrides
@@ -0,0 +1,4 @@
+# the files jquery.js comes from Doxygen, and it must be that one
+# replacing it by a symlink is a no-way.
+
+python-odf-doc binary: embedded-javascript-library usr/share/python-odf/API-doc/html/jquery.js please use libjs-jquery
diff --git a/debian/python-odf-tools.install b/debian/python-odf-tools.install
deleted file mode 100644
index 05e7b29..0000000
--- a/debian/python-odf-tools.install
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/python3-odfpy/usr/share usr
-debian/python3-odfpy/usr/bin usr
diff --git a/debian/python-odf.install b/debian/python-odf.install
deleted file mode 100644
index 89b9185..0000000
--- a/debian/python-odf.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/python-odfpy/usr/lib usr
\ No newline at end of file
diff --git a/debian/python3-odf.install b/debian/python3-odf.install
deleted file mode 100644
index 5eed57f..0000000
--- a/debian/python3-odf.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/python3-odfpy/usr/lib usr
diff --git a/debian/rules b/debian/rules
index 0164b24..94c23a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,11 +2,11 @@
#DH_VERBOSE=1
-export PYBUILD_NAME=odfpy
+export PYBUILD_NAME=odf
PYTHON2=$(shell pyversions -vr)
%:
- dh $@ --buildsystem=pybuild --with python2 --with python3
+ dh $@ --with python2,python3 --buildsystem=pybuild
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
test-python%:
@@ -38,8 +38,13 @@ override_dh_auto_build:
doxygen config.dox
dh_auto_build
-override_dh_install:
- dh_install
- # remove an embedded JS library
- f=debian/python-odf-doc/usr/share/python-odf/API-doc/html/jquery.js; \
- [ -e $$f ] && rm $$f && ln -s /usr/share/javascript/jquery/jquery.js $$f
+override_dh_auto_install:
+ dh_auto_install
+ # ensure that debian/python-odf-tools/usr/share exists
+ mkdir -p debian/python-odf-tools/usr/share
+ # remove scripts for Python2.7
+ rm -rf debian/python-odf/usr/bin
+ rm -rf debian/python-odf/usr/share/man
+ # moce scripts and their man pages to python-odf-tools
+ mv debian/python3-odf/usr/bin debian/python-odf-tools/usr
+ mv debian/python3-odf/usr/share/man debian/python-odf-tools/usr/share
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-odf.git
More information about the Python-modules-commits
mailing list