[Python-modules-commits] r12635 - in packages/pyamf/trunk/debian (6 files)

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

    Date: Sunday, April 18, 2010 @ 19:07:52
  Author: nomadium-guest
Revision: 12635

* Added Build-Depends on cython to generate .c code from .pyx files.
* Enabled unit tests during build time and backported a trivial patch from
  upstream to fix a failing test.
* Removed requires.txt file with bogus dependences to avoid problems
  if pyamf is imported via pkg_resources.
* Disabled compression for .js files in python-pyamf-doc package.

Added:
  packages/pyamf/trunk/debian/patches/
  packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff
  packages/pyamf/trunk/debian/patches/series
Modified:
  packages/pyamf/trunk/debian/changelog
  packages/pyamf/trunk/debian/control
  packages/pyamf/trunk/debian/rules

Modified: packages/pyamf/trunk/debian/changelog
===================================================================
--- packages/pyamf/trunk/debian/changelog	2010-04-18 17:04:44 UTC (rev 12634)
+++ packages/pyamf/trunk/debian/changelog	2010-04-18 19:07:52 UTC (rev 12635)
@@ -2,4 +2,4 @@
 
   * Initial release. (Closes: #499617)
 
- -- Miguel Landaeta <miguel at miguel.cc>  Sat, 17 Apr 2010 18:26:17 -0430
+ -- Miguel Landaeta <miguel at miguel.cc>  Sun, 18 Apr 2010 14:17:33 -0430

Modified: packages/pyamf/trunk/debian/control
===================================================================
--- packages/pyamf/trunk/debian/control	2010-04-18 17:04:44 UTC (rev 12634)
+++ packages/pyamf/trunk/debian/control	2010-04-18 19:07:52 UTC (rev 12635)
@@ -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)
+               python-setuptools (>= 0.6c9), cython
 Standards-Version: 3.8.4
 Homepage: http://pyamf.org/
 XS-Python-Version: >= 2.5

Added: packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff
===================================================================
--- packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff	                        (rev 0)
+++ packages/pyamf/trunk/debian/patches/fix_typo_in_django_unittest.diff	2010-04-18 19:07:52 UTC (rev 12635)
@@ -0,0 +1,17 @@
+Author: Miguel Landaeta <miguel at miguel.cc>
+Subject: fix typo in a django unit test
+
+After PyAMF 0.5.1 release, at upstream svn repo in revision 2927,
+this unit test was changed as is showed below.
+
+--- pyamf-0.5.1.orig/pyamf/tests/adapters/test_django.py
++++ pyamf-0.5.1/pyamf/tests/adapters/test_django.py
+@@ -655,7 +655,7 @@ class ImageTestCase(ModelsBaseTestCase):
+ 
+         sa, da = alias.getEncodableAttributes(i)
+ 
+-        self.assertEquals(sa, {'text': '', 'id': 1, 'file': u'foo_'})
++        self.assertEquals(sa, {'text': '', 'id': 1, 'file': u'foo'})
+         self.assertEquals(da, None)
+         self.assertTrue(self.executed)
+ 

Added: packages/pyamf/trunk/debian/patches/series
===================================================================
--- packages/pyamf/trunk/debian/patches/series	                        (rev 0)
+++ packages/pyamf/trunk/debian/patches/series	2010-04-18 19:07:52 UTC (rev 12635)
@@ -0,0 +1 @@
+fix_typo_in_django_unittest.diff

Modified: packages/pyamf/trunk/debian/rules
===================================================================
--- packages/pyamf/trunk/debian/rules	2010-04-18 17:04:44 UTC (rev 12634)
+++ packages/pyamf/trunk/debian/rules	2010-04-18 19:07:52 UTC (rev 12635)
@@ -3,14 +3,29 @@
 %:
 	dh $@
 
+override_dh_auto_build:
+	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
+	rm -rf PyAMF.egg-info cpyamf/amf3.{c,so} cpyamf/util.{c,so} foo
 
+override_dh_auto_test:
+	dh_auto_test
+	python setup.py test
+
+override_dh_install:
+	dh_install
+	find debian/python-pyamf/usr/lib -type f -name requires.txt -delete
+
 override_dh_installdocs:
 	dh_installdocs
 	rm -f debian/python-pyamf-doc/usr/share/doc/python-pyamf-doc/_static/jquery.js
 
+override_dh_compress:
+	dh_compress -X.js
+
 get-orig-source:
 	cd $(dir $(firstword $(MAKEFILE_LIST)))../ && \
 	uscan --rename --force-download --watchfile debian/watch --destdir $(CURDIR)