[Python-modules-commits] r17131 - in packages/python-djvulibre/trunk/debian (7 files)
danstender-guest at users.alioth.debian.org
danstender-guest at users.alioth.debian.org
Tue May 24 12:35:20 UTC 2011
Date: Tuesday, May 24, 2011 @ 12:35:19
Author: danstender-guest
Revision: 17131
added patches bd925e3ca460 and 55cfd0f79af0.diff, control: standards 3.9.2, rules: improved tests, copyright: changed to met dep5, maintainer changed and copyrights extended
Added:
packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff
packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff
Modified:
packages/python-djvulibre/trunk/debian/changelog
packages/python-djvulibre/trunk/debian/control
packages/python-djvulibre/trunk/debian/copyright
packages/python-djvulibre/trunk/debian/patches/series
packages/python-djvulibre/trunk/debian/rules
Modified: packages/python-djvulibre/trunk/debian/changelog
===================================================================
--- packages/python-djvulibre/trunk/debian/changelog 2011-05-24 12:15:14 UTC (rev 17130)
+++ packages/python-djvulibre/trunk/debian/changelog 2011-05-24 12:35:19 UTC (rev 17131)
@@ -5,11 +5,21 @@
* Fixes FTBFS with Python 2.7 (Closes: #606681).
* Removed patches disable-memory-test.diff, max-cachesize-64bit.diff
(fixed with 0.3.0), setup-disable-auto-cython.diff (#541314 closed).
+ * Added patch python-djvulibre-55cfd0f79af0.diff.
+ * Added patch python-djvulibre-bd925e3ca460.diff (Closes: #627290).
+ * debian/control:
+ + bumped Standards-Version to 3.9.2.
+ + added builds for Python3 flavours (Closes: #604037).
* debian/rules:
- + modified building of html docs for python-djvu-doc
- + added buildtime creation of locales
+ + modified building of html docs for python-djvu-doc.
+ + added buildtime creation of locales.
+ + improved tests.
+ * debian/copyright:
+ + bumped DEP-5 revision.
+ + changed maintainer.
+ + expanded copyrights.
- -- Daniel Stender <daniel at danielstender.com> Tue, 24 May 2011 14:14:21 +0200
+ -- Daniel Stender <daniel at danielstender.com> Tue, 24 May 2011 14:25:13 +0200
python-djvulibre (0.1.18-2) unstable; urgency=low
Modified: packages/python-djvulibre/trunk/debian/control
===================================================================
--- packages/python-djvulibre/trunk/debian/control 2011-05-24 12:15:14 UTC (rev 17130)
+++ packages/python-djvulibre/trunk/debian/control 2011-05-24 12:35:19 UTC (rev 17131)
@@ -16,16 +16,22 @@
python-all-dev,
python-nose,
python-setuptools,
- python-support (>= 0.90)
+ python-support (>= 0.90),
+ python3-all-dbg,
+ python3-all-dev,
+ python3-setuptools
Build-Depends-Indep: graphviz, python-pygments, python-sphinx
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-djvulibre/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-djvulibre/trunk/
Homepage: http://jwilk.net/software/python-djvulibre
Package: python-djvu
Architecture: any
-Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
+Depends:
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
Suggests: python-djvu-doc
Conflicts: python-djvulibre (<< 0.1.12)
Replaces: python-djvulibre (<< 0.1.12)
@@ -60,3 +66,34 @@
an open source implementation of DjVu.
.
This package contains technical documentation.
+
+Package: python3-djvu
+Architecture: any
+Depends:
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Suggests: python-djvu-doc
+Conflicts: python-djvulibre (<< 0.1.12)
+Replaces: python-djvulibre (<< 0.1.12)
+Provides: python-djvulibre
+Description: Python support for the DjVu image format
+ python-djvulibre is a set of Python bindings for the DjVuLibre library,
+ an open source implementation of DjVu.
+
+Package: python3-djvu-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends:
+ python3-djvu (= ${binary:Version}),
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Description: Python support for the DjVu image format (debug extension)
+ python-djvulibre is a set of Python bindings for the DjVuLibre library,
+ an open source implementation of DjVu.
+ .
+ This package contains the detached debugging symbols and the extensions built
+ for the Python debug interpreter.
+
Modified: packages/python-djvulibre/trunk/debian/copyright
===================================================================
--- packages/python-djvulibre/trunk/debian/copyright 2011-05-24 12:15:14 UTC (rev 17130)
+++ packages/python-djvulibre/trunk/debian/copyright 2011-05-24 12:35:19 UTC (rev 17131)
@@ -1,14 +1,15 @@
Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=135
-Name: python-djvulibre
-Maintainer: Jakub Wilk <jwilk at jwilk.net>
+Upstream-Name: python-djvulibre
+Upstream-Contact: Daniel Stender <daniel at danielstender.com>
Source: http://jwilk.net/software/python-djvulibre
Files: *
-Copyright: 2007, 2008, 2009, 2010 Jakub Wilk <jwilk at jwilk.net>
+Copyright: 2007-2011 Jakub Wilk <jwilk at jwilk.net>
License: GPL-2
Files: debian/*
-Copyright: 2009, 2010 Jakub Wilk <jwilk at debian.org>
+Copyright: 2009-2010 Jakub Wilk <jwilk at debian.org>
+ 2011 Daniel Stender <daniel at danielstender.com>
License: GPL-2
License: GPL-2
@@ -23,3 +24,4 @@
.
On Debian systems, the complete text of the GNU General Public License
version 2 can be found in the /usr/share/common-licenses/GPL-2 file.
+
Added: packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff (rev 0)
+++ packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff 2011-05-24 12:35:19 UTC (rev 17131)
@@ -0,0 +1,42 @@
+Description: make build_sphinx available even without setuptools.
+Origin: https://bitbucket.org/jwilk/python-djvulibre/changeset/55cfd0f79af0
+Last-Update: 05/21/2011
+
+--- a/setup.py
++++ b/setup.py
+@@ -188,6 +188,24 @@ class clean(distutils.command.clean.clea
+ os.remove(filename)
+ return distutils.command.clean.clean.run(self)
+
++if sphinx_setup_command:
++ class build_sphinx(sphinx_setup_command.BuildDoc):
++ def run(self):
++ # Make sure that djvu module is imported from the correct
++ # directory.
++ #
++ # The current directory (which is normally in sys.path[0]) is
++ # typically a wrong choice: it contains djvu/__init__.py but the
++ # extension modules. Prepend the directory that build_ext would
++ # use instead.
++ build_ext = self.get_finalized_command('build_ext')
++ sys.path[:0] = [build_ext.build_lib]
++ import djvu
++ del sys.path[0]
++ sphinx_setup_command.BuildDoc.run(self)
++else:
++ build_sphinx = None
++
+ setup_params = dict(
+ name = 'python-djvulibre',
+ version = __version__,
+@@ -210,8 +228,9 @@ setup_params = dict(
+ ],
+ py_modules = ['djvu.const'],
+ cmdclass = dict(
+- build_ext=build_ext,
+- clean=clean,
++ (cmd.__name__, cmd)
++ for cmd in (build_ext, clean, build_sphinx)
++ if cmd is not None
+ )
+ )
Added: packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff (rev 0)
+++ packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff 2011-05-24 12:35:19 UTC (rev 17131)
@@ -0,0 +1,15 @@
+Description: doc: update link to Lizardtech DjVu Reference.
+Origin: https://bitbucket.org/jwilk/python-djvulibre/changeset/bd925e3ca460
+Last-Update: 05/23/2011
+
+--- a/doc/source/conf.py
++++ b/doc/source/conf.py
+@@ -43,7 +43,7 @@ intersphinx_mapping = {'http://docs.pyth
+
+ rst_epilog = '''
+ .. |djvu3ref| replace:: Lizardtech DjVu Reference
+-.. _djvu3ref: http://www.lizardtech.com/files/doc/techinfo/DjVu3Spec.djvu
++.. _djvu3ref: http://djvu.org/docs/DjVu3Spec.djvu
+
+ .. |djvused| replace:: djvused manual
+ .. _djvused: http://djvu.sourceforge.net/doc/man/djvused.html
Modified: packages/python-djvulibre/trunk/debian/patches/series
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/series 2011-05-24 12:15:14 UTC (rev 17130)
+++ packages/python-djvulibre/trunk/debian/patches/series 2011-05-24 12:35:19 UTC (rev 17131)
@@ -0,0 +1,2 @@
+python-djvulibre-55cfd0f79af0.diff
+python-djvulibre-bd925e3ca460.diff
Modified: packages/python-djvulibre/trunk/debian/rules
===================================================================
--- packages/python-djvulibre/trunk/debian/rules 2011-05-24 12:15:14 UTC (rev 17130)
+++ packages/python-djvulibre/trunk/debian/rules 2011-05-24 12:35:19 UTC (rev 17131)
@@ -39,8 +39,8 @@
cd tests && \
set -x -e; \
for python in $(shell pyversions -r); do \
- PYTHONPATH=$(call pythonpath,$$python) $$python $(nosetests); \
- PYTHONPATH=$(call pythonpath_dbg,$$python) $$python-dbg $(nosetests); \
+ ln -sf $(call pythonpath,$$python)/djvu djvu; $$python $(nosetests); rm djvu; \
+ ln -sf $(call pythonpath_dbg,$$python)/djvu djvu; $$python-dbg $(nosetests); rm djvu; \
done
endif
More information about the Python-modules-commits
mailing list