[Python-modules-commits] r17584 - in packages/python-djvulibre/trunk/debian (11 files)

danstender-guest at users.alioth.debian.org danstender-guest at users.alioth.debian.org
Wed Jun 22 16:39:47 UTC 2011 

    Date: Wednesday, June 22, 2011 @ 16:39:45
  Author: danstender-guest
Revision: 17584

renamed patches, control: restores Svn-Browser, added to descriptions, rules: restored rm *egg.info, added overrides for installchangelogs (also symlinked changelogs removed again), compress, dh_install (removes dllpath.py), changelog: adjusted accordingly, added infos

Added:
  packages/python-djvulibre/trunk/debian/patches/build_sphinx.diff
    (from rev 17577, packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff)
  packages/python-djvulibre/trunk/debian/patches/lizardtech_link.diff
    (from rev 17577, 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/patches/series
  packages/python-djvulibre/trunk/debian/python-djvu-doc.docs
  packages/python-djvulibre/trunk/debian/rules
Deleted:
  packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff
  packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff
  packages/python-djvulibre/trunk/debian/python-djvu-dbg.changelog
  packages/python-djvulibre/trunk/debian/python-djvu.changelog

Modified: packages/python-djvulibre/trunk/debian/changelog
===================================================================
--- packages/python-djvulibre/trunk/debian/changelog	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/changelog	2011-06-22 16:39:45 UTC (rev 17584)
@@ -2,35 +2,38 @@
 
   * New maintainer (Closes: #598157).
   * New upstream release (Closes: #604036).
-  * Fixes FTBFS with Python 2.7 (Closes: #606681).
+    + 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).
-  * Made build_sphinx available even without setuptools [python-djvulibre-
-    55cfd0f79af0.diff].
-  * Updated Lizardtech Djvu Reference link [python-djvulibre-bd925e3ca460.diff]
+    (fixed with 0.3.0), setup-disable-auto-cython.diff (workaround no longer
+    needed).
+  * Made build_sphinx available even without setuptools [build_sphinx.diff].
+  * Updated Lizardtech Djvu Reference link [lizardtech_link.diff]
     (Closes: #627290).
   * debian/control:
-    + rearranged with wrap-and-sort (devscripts).
+    + Wrapped and sorted.
     + added build-dep locales.
-    + bumped Standards-Version to 3.9.2.
-    + changed Vcs-Browser field.
+    + bumped Standards-Version to 3.9.2 (no changes needed).
   * debian/rules:
-    + added buildtime creation of locales.
-    + changed building of html docs to be processed with build_sphinx.
-    + removed building with cython from rules.
-    + changed tests: explicit module names not needed anymore, removed doctests
-      option.
-    + dropped dh_clean removal of egg-info/.
+    + removed building with cython from rules (no longer needed).
+    + removal of dllpath.py after dh_install (not useful on Debian systems).
+    + changed building of html docs to be processed with setup build_sphinx
+    (doc/Makefile removed from upstream).
+    + added generating of needed locales at build time to avoid build-dep on
+    locales-all, added export LC_ALL=C.
+    + tests: passing of explicit module names not needed anymore (test
+    modules have been renamed for that) and doctests option dropped (no
+    doctests anymore).
+    + added override for installchangelogs to spare deb/python-djvu.changelog
+    and python-djvu-dbg.changelog (also removed doc/changelog from
+    python-djvu-doc.docs).
+    + added override for dh_compress to drop python-djvu-doc.compress
+    (deprecated).
   * debian/copyright:
     + bumped DEP-5 revision to CANDIDATE.
     + changed maintainer.
     + expanded copyrights to cover also 2011.
-  * debian/:
-    + removed python-djvu-doc-compress (deprecated).
-    + added symlinks for -dbg.changelog and -djvu.changelog, therefore dropped
-    their .docs.
 
- -- Daniel Stender <daniel at danielstender.com>  Tue, 21 Jun 2011 23:08:55 +0200
+ -- Daniel Stender <daniel at danielstender.com>  Wed, 22 Jun 2011 18:34:31 +0200
 
 python-djvulibre (0.1.18-2) unstable; urgency=low
 
@@ -43,7 +46,7 @@
 
 python-djvulibre (0.1.18-1) unstable; urgency=low
 
-  * New upstream release.q
+  * New upstream release.
   * Update homepage URL.
   * Fix FTBFS with nostrip build option.
   * Run tests at build time:

Modified: packages/python-djvulibre/trunk/debian/control
===================================================================
--- packages/python-djvulibre/trunk/debian/control	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/control	2011-06-22 16:39:45 UTC (rev 17584)
@@ -20,7 +20,7 @@
 Build-Depends-Indep: graphviz, python-pygments, python-sphinx
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-djvulibre/trunk
-Vcs-Browser: http://anonscm.debian.org/viewvc/python-modules/packages/python-djvulibre/trunk
+Vcs-Browser: http://svn.debian.org/viewvc/python-modules/packages/python-djvulibre/trunk
 Homepage: http://jwilk.net/software/python-djvulibre
 
 Package: python-djvu
@@ -35,7 +35,10 @@
 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.
+ an open source implementation of the DjVu image format.
+ .
+ This packet contains the actual Python bindings, please see python-djvu-
+ doc for its documentation and python-djvu-dbg for debugging symbols.
 
 Package: python-djvu-dbg
 Section: debug
@@ -48,7 +51,7 @@
  ${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.
+ an open source implementation of the DjVu image format.
  .
  This package contains the detached debugging symbols and the extensions built
  for the Python debug interpreter.
@@ -60,6 +63,6 @@
 Recommends: python-djvu
 Description: Python support for the DjVu image format (documentation)
  python-djvulibre is a set of Python bindings for the DjVuLibre library,
- an open source implementation of DjVu.
+ an open source implementation of the DjVu image format.
  .
  This package contains technical documentation.

Copied: packages/python-djvulibre/trunk/debian/patches/build_sphinx.diff (from rev 17577, packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff)
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/build_sphinx.diff	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/patches/build_sphinx.diff	2011-06-22 16:39:45 UTC (rev 17584)
@@ -0,0 +1,43 @@
+Description: make build_sphinx available even without setuptools.
+Origin: https://bitbucket.org/jwilk/python-djvulibre/changeset/55cfd0f79af0
+Last-Update: 2011-05-21 
+
+--- 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
+     )
+ )
+

Copied: packages/python-djvulibre/trunk/debian/patches/lizardtech_link.diff (from rev 17577, packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff)
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/lizardtech_link.diff	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/patches/lizardtech_link.diff	2011-06-22 16:39:45 UTC (rev 17584)
@@ -0,0 +1,15 @@
+Description: doc: update link to Lizardtech DjVu Reference.
+Origin: https://bitbucket.org/jwilk/python-djvulibre/changeset/bd925e3ca460
+Last-Update: 2011-05-23
+
+--- 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

Deleted: packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/patches/python-djvulibre-55cfd0f79af0.diff	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1,43 +0,0 @@
-Description: make build_sphinx available even without setuptools.
-Origin: https://bitbucket.org/jwilk/python-djvulibre/changeset/55cfd0f79af0
-Last-Update: 2011-05-21 
-
---- 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
-     )
- )
-

Deleted: packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/patches/python-djvulibre-bd925e3ca460.diff	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1,15 +0,0 @@
-Description: doc: update link to Lizardtech DjVu Reference.
-Origin: https://bitbucket.org/jwilk/python-djvulibre/changeset/bd925e3ca460
-Last-Update: 2011-05-23
-
---- 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-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/patches/series	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1,2 +1,2 @@
-python-djvulibre-55cfd0f79af0.diff
-python-djvulibre-bd925e3ca460.diff
+build_sphinx.diff
+lizardtech_link.diff

Deleted: packages/python-djvulibre/trunk/debian/python-djvu-dbg.changelog
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-dbg.changelog	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/python-djvu-dbg.changelog	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1 +0,0 @@
-link changelog
\ No newline at end of file

Modified: packages/python-djvulibre/trunk/debian/python-djvu-doc.docs
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-doc.docs	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/python-djvu-doc.docs	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1,2 +1 @@
-debian/changelog
 build/sphinx/html/

Deleted: packages/python-djvulibre/trunk/debian/python-djvu.changelog
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu.changelog	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/python-djvu.changelog	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1 +0,0 @@
-link changelog
\ No newline at end of file

Modified: packages/python-djvulibre/trunk/debian/rules
===================================================================
--- packages/python-djvulibre/trunk/debian/rules	2011-06-22 12:05:20 UTC (rev 17583)
+++ packages/python-djvulibre/trunk/debian/rules	2011-06-22 16:39:45 UTC (rev 17584)
@@ -1,4 +1,5 @@
 #!/usr/bin/make -f
+export DH_VERBOSE=1
 export LC_ALL=C
 
 PYX_FILES = $(wildcard djvu/*.pyx)
@@ -9,6 +10,11 @@
 pythonpath = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib.*-$${_py_})
 pythonpath_dbg = $$(_py_=$(strip $(1)); _py_=$${_py_\#python}; ls -d $(CURDIR)/build/lib_d.*-$${_py_} 2>/dev/null || ls -d $(CURDIR)/build/lib.*-$${_py_}-pydebug)
 
+:PHONY: override_dh_install
+override_dh_install:
+	dh_install
+	rm -f $(CURDIR)/debian/python-djvu/usr/lib/python*/dist-packages/djvu/dllpath.py
+
 .PHONY: override_dh_installdocs
 override_dh_installdocs:
 ifneq ($(shell dh_listpackages | grep -x -F python-djvu-doc),)
@@ -43,6 +49,14 @@
 	done
 endif
 
+.PHONY: override_dh_installchangelogs
+override_dh_installchangelogs:
+	dh_installchangelogs doc/changelog
+
+.PHONY: override_dh_compress
+override_dh_compress:
+	dh_compress $(ls $$(CURDIR)/debian/python-*/usr/share/doc/*/changelog*)
+
 .PHONY: build build-arch build-indep binary binary-arch binary-indep clean
 build build-arch build-indep binary binary-arch binary-indep clean:
 	dh $(@)

More information about the Python-modules-commits mailing list