[Python-modules-commits] r8564 - in packages/pycairo/trunk/debian (4 files)

[shlomme at users.alioth.debian.org]

    Date: Monday, May 25, 2009 @ 19:28:29
  Author: shlomme
Revision: 8564

prepare new upload to experimental, for python 2.6 support

Modified:
  packages/pycairo/trunk/debian/changelog
  packages/pycairo/trunk/debian/control
  packages/pycairo/trunk/debian/python-cairo.install
  packages/pycairo/trunk/debian/rules

Modified: packages/pycairo/trunk/debian/changelog
===================================================================
--- packages/pycairo/trunk/debian/changelog	2009-05-25 18:20:57 UTC (rev 8563)
+++ packages/pycairo/trunk/debian/changelog	2009-05-25 19:28:29 UTC (rev 8564)
@@ -1,3 +1,13 @@
+pycairo (1.8.4-3exp1) experimental; urgency=low
+
+  * Added module for Python 2.6, for experimental
+  * debian/rules
+    - make sure debug build files are cleaned correctly
+  * debian/control
+    - set build dependency on python-all-{dev,dbg} to 2.5.4-1~
+
+ -- Torsten Marek <shlomme at debian.org>  Mon, 25 May 2009 21:12:55 +0200
+
 pycairo (1.8.4-3) unstable; urgency=low
 
   * debian/python-cairo.preinst

Modified: packages/pycairo/trunk/debian/control
===================================================================
--- packages/pycairo/trunk/debian/control	2009-05-25 18:20:57 UTC (rev 8563)
+++ packages/pycairo/trunk/debian/control	2009-05-25 19:28:29 UTC (rev 8564)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Dave Beckett <dajobe at debian.org>, Torsten Marek <shlomme at debian.org>
-Build-Depends: debhelper (>= 7), cdbs (>= 0.4.49), python-all-dev (>= 2.4.0), python-all-dbg (>= 2.4.0), python-support (>= 0.8.7), libcairo2-dev (>= 1.8.6), dpatch, patchutils
+Build-Depends: debhelper (>= 7), cdbs (>= 0.4.49), python-all-dev (>= 2.5.4-1~), python-all-dbg (>= 2.5.4-1~), python-support (>= 0.9.0), libcairo2-dev (>= 1.8.6), dpatch, patchutils
 Standards-Version: 3.8.1
 Homepage: http://cairographics.org/pycairo/
 

Modified: packages/pycairo/trunk/debian/python-cairo.install
===================================================================
--- packages/pycairo/trunk/debian/python-cairo.install	2009-05-25 18:20:57 UTC (rev 8563)
+++ packages/pycairo/trunk/debian/python-cairo.install	2009-05-25 19:28:29 UTC (rev 8564)
@@ -1,2 +1,2 @@
-/usr/lib/python*/site-packages/cairo/__init__.py
-/usr/lib/python*/site-packages/cairo/_cairo.so
+/usr/lib/python*/*-packages/cairo/*.py
+/usr/lib/python*/*-packages/cairo/_cairo.so

Modified: packages/pycairo/trunk/debian/rules
===================================================================
--- packages/pycairo/trunk/debian/rules	2009-05-25 18:20:57 UTC (rev 8563)
+++ packages/pycairo/trunk/debian/rules	2009-05-25 19:28:29 UTC (rev 8564)
@@ -3,11 +3,8 @@
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/dpatch.mk
-include /usr/share/dpatch/dpatch.make
 
-# needed for Python 2.6 test builds, installs into /usr/local
-DEB_PYTHON_INSTALL_ARGS_ALL += --prefix=/usr
+DEB_PYTHON_INSTALL_ARGS_ALL += --install-layout=deb
 
 install/python-cairo-dev::
 	python setup.py install_data --install-dir=$(CURDIR)/debian/tmp/usr
@@ -20,9 +17,16 @@
 
 install/python-cairo-dbg::
 	for i in $(cdbs_python_build_versions); do \
-	  python$$i-dbg ./setup.py install --prefix=/usr --root $(CURDIR)/debian/tmp; \
+	  python$$i-dbg ./setup.py install --install-layout=deb --root $(CURDIR)/debian/tmp; \
 	done
 
 # pycairo.pc is created automatically by setup.py, remove before .diff.gz is created
 clean::
+	for i in $(cdbs_python_build_versions); do \
+	  python$$i-dbg ./setup.py clean -a; \
+	done
 	rm -f $(CURDIR)/pycairo.pc
+
+# this has to be include after our clean calls since setup.py needs to be patched
+# in order to run
+include /usr/share/cdbs/1/rules/dpatch.mk