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

Tue Apr 26 16:18:54 UTC 2011

Date: Tuesday, April 26, 2011 @ 16:18:50
  Author: danstender-guest
Revision: 16786

* New maintainer (Closes: #598157).
* New upstream release (Closes: #604036).
* Fixes FTBFS with Python 2.7	(Closes: #606681).
* Removed all patches disable-memory-test.diff, max-cachesize-64bit.diff
  (fixed with 0.3.0), setup-disable-auto-cython.diff (#541314 closed).

Modified:
  packages/python-djvulibre/trunk/debian/changelog
  packages/python-djvulibre/trunk/debian/control
  packages/python-djvulibre/trunk/debian/patches/series
Deleted:
  packages/python-djvulibre/trunk/debian/patches/disable-memory-test.diff
  packages/python-djvulibre/trunk/debian/patches/max-cachesize-64bit.diff
  packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff

Modified: packages/python-djvulibre/trunk/debian/changelog
===================================================================

--- packages/python-djvulibre/trunk/debian/changelog	2011-04-26 11:50:27 UTC (rev 16785)
+++ packages/python-djvulibre/trunk/debian/changelog	2011-04-26 16:18:50 UTC (rev 16786)
@@ -1,3 +1,13 @@
+python-djvulibre (0.3.3-1) unstable; urgency=low
+
+  * New maintainer (Closes: #598157).
+  * New upstream release (Closes: #604036).
+  * Fixes FTBFS with Python 2.7	(Closes: #606681).
+  * Removed all patches disable-memory-test.diff, max-cachesize-64bit.diff
+    (fixed with 0.3.0), setup-disable-auto-cython.diff (#541314 closed).
+
+ -- Daniel Stender <daniel at danielstender.com>  Tue, 26 Apr 2011 18:10:26 +0200
+
 python-djvulibre (0.1.18-2) unstable; urgency=low
 
   * Disable memory test that is likely to fail on 64-bit architectures.

Modified: packages/python-djvulibre/trunk/debian/control
===================================================================
--- packages/python-djvulibre/trunk/debian/control	2011-04-26 11:50:27 UTC (rev 16785)
+++ packages/python-djvulibre/trunk/debian/control	2011-04-26 16:18:50 UTC (rev 16786)
@@ -1,13 +1,22 @@
 Source: python-djvulibre
 Section: python
 Priority: optional
-Maintainer: Jakub Wilk <jwilk at debian.org>
-Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Build-Depends: debhelper (>= 7.3.5),
- python-support (>= 0.90), python-setuptools, cython, python-all-dev, python-all-dbg,
- libdjvulibre-dev, pkg-config,
- python-nose, djvulibre-bin, ghostscript
-Build-Depends-Indep: python-sphinx, python-pygments, graphviz
+Maintainer: Daniel Stender <daniel at danielstender.com>
+Uploaders:
+ Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Build-Depends:
+ cython,
+ debhelper (>= 7.3.5),
+ djvulibre-bin,
+ ghostscript,
+ libdjvulibre-dev,
+ pkg-config,
+ python-all-dbg,
+ python-all-dev,
+ python-nose,
+ python-setuptools,
+ python-support (>= 0.90)
+Build-Depends-Indep: graphviz, python-pygments, python-sphinx
 Standards-Version: 3.8.4
 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/
@@ -15,7 +24,7 @@
 
 Package: python-djvu
 Architecture: any
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}, ${python:Depends}, ${shlibs:Depends}
 Suggests: python-djvu-doc
 Conflicts: python-djvulibre (<< 0.1.12)
 Replaces: python-djvulibre (<< 0.1.12)
@@ -28,7 +37,11 @@
 Section: debug
 Priority: extra
 Architecture: any
-Depends: python-djvu (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ python-djvu (= ${binary:Version}),
+ ${misc:Depends},
+ ${python: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.
@@ -39,7 +52,7 @@
 Package: python-djvu-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
+Depends: libjs-jquery, ${misc:Depends}
 Recommends: python-djvu
 Description: Python support for the DjVu image format (documentation)
  python-djvulibre is a set of Python bindings for the DjVuLibre library,

Deleted: packages/python-djvulibre/trunk/debian/patches/disable-memory-test.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/disable-memory-test.diff	2011-04-26 11:50:27 UTC (rev 16785)
+++ packages/python-djvulibre/trunk/debian/patches/disable-memory-test.diff	2011-04-26 16:18:50 UTC (rev 16786)
@@ -1,18 +0,0 @@
-Description: Disable memory test that is likely to fail on 64-bit architectures.
-Author: Jakub Wilk <jwilk at debian.org>
-Last-Update: 2010-06-26
-
---- a/tests/decode.py
-+++ b/tests/decode.py
-@@ -529,11 +529,6 @@
-         ...
-         ValueError: row_alignment must be a positive integer
- 
--        >>> page_job.render(RENDER_COLOR, (0, 0, 100000, 100000), (0, 0, 100000, 100000), PixelFormatRgb(), 8)
--        Traceback (most recent call last):
--        ...
--        MemoryError: Unable to allocate 30000000000 bytes for an image memory
--
-         >>> page_job.render(RENDER_COLOR, (0, 0, 10, 10), (0, 0, 4, 4), PixelFormatGrey(), 1)
-         '\xff\xff\xff\xff\xff\xff\xff\xef\xff\xff\xff\xa4\xff\xff\xff\xb8'
- 

Deleted: packages/python-djvulibre/trunk/debian/patches/max-cachesize-64bit.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/max-cachesize-64bit.diff	2011-04-26 11:50:27 UTC (rev 16785)
+++ packages/python-djvulibre/trunk/debian/patches/max-cachesize-64bit.diff	2011-04-26 16:18:50 UTC (rev 16786)
@@ -1,27 +0,0 @@
-Description: Fix test for maximum cache size on 64-bit architectures.
-Author: Jakub Wilk <jwilk at debian.org>
-Last-Update: 2010-06-26
-
---- a/tests/decode.py
-+++ b/tests/decode.py
-@@ -15,6 +15,7 @@
- from djvu.decode import *
- from djvu.sexpr import *
- 
-+import sys
- import os
- import tempfile
- import subprocess
-@@ -44,10 +45,10 @@
- 
-     context = Context()
-     assert_equal(context.cache_size, 10 << 20)
--    for n in -100, 0, 1 << 32:
-+    for n in -100, 0, (sys.maxint + 1) * 2:
-         assert_raises(ValueError, set_cache_size, n)
-     assert_raises(ValueError, set_cache_size, 0)
--    for n in 1, 100, 1 << 10, 1 << 20, (1 << 32) -1:
-+    for n in 1, 100, 1 << 10, 1 << 20, 2 * sys.maxint + 1:
-         set_cache_size(n)
-         assert_equal(context.cache_size, n)
-     context.clear_cache()

Modified: packages/python-djvulibre/trunk/debian/patches/series
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/series	2011-04-26 11:50:27 UTC (rev 16785)
+++ packages/python-djvulibre/trunk/debian/patches/series	2011-04-26 16:18:50 UTC (rev 16786)
@@ -1,3 +0,0 @@
-setup-disable-auto-cython.diff
-disable-memory-test.diff
-max-cachesize-64bit.diff

Deleted: packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff	2011-04-26 11:50:27 UTC (rev 16785)
+++ packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff	2011-04-26 16:18:50 UTC (rev 16786)
@@ -1,37 +0,0 @@
-Description:
- In order to work around bug #541314, disable automatic cythoning sources with
- setup.py.
-Author: Jakub Wilk <jwilk at debian.org>
-Forwarded: not-needed
-Last-Update: 2010-04-25
-
---- a/setup.py
-+++ b/setup.py
-@@ -31,10 +31,6 @@
- import os
- import sys
- 
--from Cython.Distutils import build_ext
--
--# This is required to make setuptools cooperate with Cython:
--sys.path.insert(0, os.path.join(os.path.dirname(__file__), 'fake_pyrex'))
- try:
-     from setuptools import setup
-     from setuptools.extension import Extension
-@@ -42,6 +38,7 @@
-     from distutils.core import setup
-     from distutils.extension import Extension
- from distutils.ccompiler import get_default_compiler
-+from distutils.command.build_ext import build_ext
- 
- from subprocess import Popen, PIPE
- 
-@@ -134,7 +131,7 @@
-     ext_modules = \
-     [
-         Extension(
--            'djvu.%s' % name, ['djvu/%s.pyx' % name],
-+            'djvu.%s' % name, ['djvu/%s.c' % name],
-             **pkg_config(
-                 'ddjvuapi',
-                 define_macros = [('PYTHON_DJVULIBRE_VERSION', '"%s"' % __version__)]


