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

Sun Apr 25 19:38:17 UTC 2010

Date: Sunday, April 25, 2010 @ 19:38:15
  Author: jwilk
Revision: 12747

Build python-djvu-dbg (debug extension + detached debug symbols).

Added:
  packages/python-djvulibre/trunk/debian/patches/
  packages/python-djvulibre/trunk/debian/patches/series
  packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff
  packages/python-djvulibre/trunk/debian/python-djvu-dbg.install
Modified:
  packages/python-djvulibre/trunk/debian/changelog
  packages/python-djvulibre/trunk/debian/control
  packages/python-djvulibre/trunk/debian/python-djvu.install
  packages/python-djvulibre/trunk/debian/rules

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

--- packages/python-djvulibre/trunk/debian/changelog	2010-04-25 17:48:16 UTC (rev 12746)
+++ packages/python-djvulibre/trunk/debian/changelog	2010-04-25 19:38:15 UTC (rev 12747)
@@ -2,8 +2,13 @@
 
   * Install example programs.
   * Switch to source format 3.0 (quilt).
+  * Build python-djvu-dbg (debug extension + detached debug symbols):
+    + Build-depend on python-all-dbg.
+    + In order to work around bug #541314, disable automatic cythoning sources
+      with setup.py. [setup-disable-auto-cython.diff]
+    + Cython sources manually in debian/rules.
 
- -- Jakub Wilk <jwilk at debian.org>  Fri, 26 Mar 2010 23:04:25 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Sun, 25 Apr 2010 21:35:14 +0200
 
 python-djvulibre (0.1.17-1) unstable; urgency=low
 

Modified: packages/python-djvulibre/trunk/debian/control
===================================================================
--- packages/python-djvulibre/trunk/debian/control	2010-04-25 17:48:16 UTC (rev 12746)
+++ packages/python-djvulibre/trunk/debian/control	2010-04-25 19:38:15 UTC (rev 12747)
@@ -4,7 +4,7 @@
 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-support (>= 0.90), python-setuptools, cython, python-all-dev, python-all-dbg,
  libdjvulibre-dev, pkg-config
 Build-Depends-Indep: python-sphinx, python-pygments, graphviz
 Standards-Version: 3.8.4
@@ -23,6 +23,18 @@
  python-djvulibre is a set of Python bindings for the DjVuLibre library,
  an open source implementation of DjVu.
 
+Package: python-djvu-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: python-djvu (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc: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.
+
 Package: python-djvu-doc
 Section: doc
 Architecture: all

Added: packages/python-djvulibre/trunk/debian/patches/series
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/series	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/patches/series	2010-04-25 19:38:15 UTC (rev 12747)
@@ -0,0 +1 @@
+setup-disable-auto-cython.diff

Added: packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff
===================================================================
--- packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/patches/setup-disable-auto-cython.diff	2010-04-25 19:38:15 UTC (rev 12747)
@@ -0,0 +1,37 @@
+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__)]

Added: packages/python-djvulibre/trunk/debian/python-djvu-dbg.install
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu-dbg.install	                        (rev 0)
+++ packages/python-djvulibre/trunk/debian/python-djvu-dbg.install	2010-04-25 19:38:15 UTC (rev 12747)
@@ -0,0 +1 @@
+usr/lib/python*/*-packages/*/*_d.so

Modified: packages/python-djvulibre/trunk/debian/python-djvu.install
===================================================================
--- packages/python-djvulibre/trunk/debian/python-djvu.install	2010-04-25 17:48:16 UTC (rev 12746)
+++ packages/python-djvulibre/trunk/debian/python-djvu.install	2010-04-25 19:38:15 UTC (rev 12747)
@@ -1 +1 @@
-usr/lib/python*/
+usr/lib/python*/*-packages/*/*[!_][!_].so

Modified: packages/python-djvulibre/trunk/debian/rules
===================================================================
--- packages/python-djvulibre/trunk/debian/rules	2010-04-25 17:48:16 UTC (rev 12746)
+++ packages/python-djvulibre/trunk/debian/rules	2010-04-25 19:38:15 UTC (rev 12747)
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+PYX_FILES = $(wildcard djvu/*.pyx)
+C_FILES = $(PYX_FILES:.pyx=.c)
+
 PYTHONPATH = $(wildcard $(CURDIR)/build/lib.*-$(shell pyversions -dv))
 
 .PHONY: build
@@ -9,10 +12,13 @@
 .PHONY: build-arch
 build-arch: build/stamp
 
-build/stamp:
+build/stamp: $(C_FILES)
 	dh build -s
 	touch $(@)
 
+%.c: %.pyx
+	cython $(<)
+
 .PHONY: build-indep
 build-indep: doc/stamp
 
@@ -52,4 +58,9 @@
 binary-indep: build-indep install-indep
 	dh binary-indep
 
+.PHONY: override_dh_strip
+override_dh_strip:
+	dh_strip --dbg-package=python-djvu-dbg
+	cd debian/*-dbg/usr/lib/debug/usr/lib && mv pyshared pymodules
+
 # vim:ts=4 sw=4 noet


