[Python-modules-commits] r12672 - in packages/pyamf/trunk/debian (8 files)

[nomadium-guest at users.alioth.debian.org]

    Date: Tuesday, April 20, 2010 @ 16:36:25
  Author: nomadium-guest
Revision: 12672

* Added Build-Depends on python-all-dbg.
* Clarified fix_typo_in_django_unittest.diff is not needed to be forwarded.
* Removed cpyamf/*.c files in clean target.
* Added patch to work-around #541314 regarding the generation of extension
  modules compiled for the debug interpreter.

Added:
  packages/pyamf/trunk/debian/patches/cython-dbg.diff
  packages/pyamf/trunk/debian/python-pyamf-dbg.install
Modified:
  packages/pyamf/trunk/debian/changelog
  packages/pyamf/trunk/debian/control
  packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff
  packages/pyamf/trunk/debian/patches/series
  packages/pyamf/trunk/debian/python-pyamf.install
  packages/pyamf/trunk/debian/rules

Modified: packages/pyamf/trunk/debian/changelog
===================================================================
--- packages/pyamf/trunk/debian/changelog	2010-04-20 12:24:16 UTC (rev 12671)
+++ packages/pyamf/trunk/debian/changelog	2010-04-20 16:36:25 UTC (rev 12672)
@@ -2,4 +2,4 @@
 
   * Initial release. (Closes: #499617)
 
- -- Miguel Landaeta <miguel at miguel.cc>  Mon, 19 Apr 2010 13:07:13 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Tue, 20 Apr 2010 19:35:23 -0430

Modified: packages/pyamf/trunk/debian/control
===================================================================
--- packages/pyamf/trunk/debian/control	2010-04-20 12:24:16 UTC (rev 12671)
+++ packages/pyamf/trunk/debian/control	2010-04-20 16:36:25 UTC (rev 12672)
@@ -4,7 +4,7 @@
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Build-Depends: debhelper (>= 7.0.50), python-all-dev, python-support (>= 0.8),
- python-setuptools (>= 0.6c9), cython
+ python-setuptools (>= 0.6c9), cython, python-all-dbg
 Standards-Version: 3.8.4
 Homepage: http://pyamf.org/
 XS-Python-Version: >= 2.5

Added: packages/pyamf/trunk/debian/patches/cython-dbg.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/cython-dbg.diff	                        (rev 0)
+++ packages/pyamf/trunk/debian/patches/cython-dbg.diff	2010-04-20 16:36:25 UTC (rev 12672)
@@ -0,0 +1,17 @@
+Description:
+ Make sure that Cython's version of build_ext is used only if Cython if fully usable.
+ This is work-around for bug #541314.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2010-04-20
+
+--- a/setup.py
++++ b/setup.py
+@@ -11,6 +11,7 @@
+ 
+ try:
+     from Cython.Distutils import build_ext
++    import Cython.Compiler.Scanning
+ except ImportError:
+     from setuptools.command.build_ext import build_ext
+ 

Modified: packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff	2010-04-20 12:24:16 UTC (rev 12671)
+++ packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff	2010-04-20 16:36:25 UTC (rev 12672)
@@ -1,5 +1,6 @@
 Author: Miguel Landaeta <miguel at miguel.cc>
 Subject: fix typo in a django unit test
+Forwarded: not-needed
 
 After PyAMF 0.5.1 release, at upstream svn repo in revision 2927,
 this unit test was changed as is showed below.

Modified: packages/pyamf/trunk/debian/patches/series
===================================================================
--- packages/pyamf/trunk/debian/patches/series	2010-04-20 12:24:16 UTC (rev 12671)
+++ packages/pyamf/trunk/debian/patches/series	2010-04-20 16:36:25 UTC (rev 12672)
@@ -1 +1,2 @@
 fix_typo_in_django_unittest.diff
+cython-dbg.diff

Added: packages/pyamf/trunk/debian/python-pyamf-dbg.install
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf-dbg.install	                        (rev 0)
+++ packages/pyamf/trunk/debian/python-pyamf-dbg.install	2010-04-20 16:36:25 UTC (rev 12672)
@@ -0,0 +1,2 @@
+usr/lib/python*/*-packages/cpyamf/amf3_d.so
+usr/lib/python*/*-packages/cpyamf/util_d.so

Modified: packages/pyamf/trunk/debian/python-pyamf.install
===================================================================
--- packages/pyamf/trunk/debian/python-pyamf.install	2010-04-20 12:24:16 UTC (rev 12671)
+++ packages/pyamf/trunk/debian/python-pyamf.install	2010-04-20 16:36:25 UTC (rev 12672)
@@ -1 +1,5 @@
-debian/tmp/usr/*
+usr/lib/python*/*-packages/*.egg-info
+usr/lib/python*/*-packages/pyamf
+usr/lib/python*/*-packages/cpyamf/*.py
+usr/lib/python*/*-packages/cpyamf/amf3.so
+usr/lib/python*/*-packages/cpyamf/util.so

Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules	2010-04-20 12:24:16 UTC (rev 12671)
+++ packages/pyamf/trunk/debian/rules	2010-04-20 16:36:25 UTC (rev 12672)
@@ -4,13 +4,13 @@
 	dh $@
 
 override_dh_auto_build:
-	rm cpyamf/*.c
+	rm -f cpyamf/*.c
 	set -e; for module in cpyamf/amf3.pyx cpyamf/util.pyx; do cython $${module}; done
 	dh_auto_build
 
 override_dh_auto_clean:
 	dh_auto_clean
-	rm -rf PyAMF.egg-info cpyamf/*.so foo
+	rm -rf PyAMF.egg-info cpyamf/*.so cpyamf/*.c foo
 
 override_dh_auto_test:
 	dh_auto_test