[Python-apps-commits] r7597 - in packages/canto/trunk/debian (changelog control rules)

[jwilk at users.alioth.debian.org]

    Date: Saturday, October 1, 2011 @ 20:55:03
  Author: jwilk
Revision: 7597

Build against Python 2.6 (closes: #643974).

Modified:
  packages/canto/trunk/debian/changelog
  packages/canto/trunk/debian/control
  packages/canto/trunk/debian/rules

Modified: packages/canto/trunk/debian/changelog
===================================================================
--- packages/canto/trunk/debian/changelog	2011-10-01 08:14:59 UTC (rev 7596)
+++ packages/canto/trunk/debian/changelog	2011-10-01 20:55:03 UTC (rev 7597)
@@ -1,12 +1,17 @@
 canto (0.7.10-2) UNRELEASED; urgency=low
 
+  [ Vincent Legout ]
   * As canto only uses python default version, change python-all-dev
     build-depends to python-dev. Update debian/rules to explicitly tell python
     to not build canto for multiple python versions. Thanks to Scott Kitterman
     for reporting and Jakub Wilk fot the patch. (Closes: #625504)
 
- -- Vincent Legout <vincent at legout.info>  Thu, 09 Jun 2011 20:26:14 +0200
+  [ Jakub Wilk ]
+  * Build against Python 2.6 (closes: #643974). This change is only to work
+    around bug #643816, and should be undone once the bug is fixed.
 
+ -- Jakub Wilk <jwilk at debian.org>  Sat, 01 Oct 2011 22:51:43 +0200
+
 canto (0.7.10-1) unstable; urgency=low
 
   * New upstream version (Closes: #589096, #585203)

Modified: packages/canto/trunk/debian/control
===================================================================
--- packages/canto/trunk/debian/control	2011-10-01 08:14:59 UTC (rev 7596)
+++ packages/canto/trunk/debian/control	2011-10-01 20:55:03 UTC (rev 7597)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Vincent Legout <vincent at legout.info>
-Build-Depends: debhelper (>= 7.0.50~), python-dev, python-support, libncurses5-dev, libncursesw5-dev
+Build-Depends: debhelper (>= 7.0.50~), python2.6-dev, python-support, libncurses5-dev, libncursesw5-dev
 Standards-Version: 3.9.1
 Homepage: http://www.codezen.org/canto/
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/canto/

Modified: packages/canto/trunk/debian/rules
===================================================================
--- packages/canto/trunk/debian/rules	2011-10-01 08:14:59 UTC (rev 7596)
+++ packages/canto/trunk/debian/rules	2011-10-01 20:55:03 UTC (rev 7597)
@@ -6,10 +6,10 @@
 	dh ${@}
 
 override_dh_auto_build:
-	python setup.py build --force
+	python2.6 setup.py build --force
 
 override_dh_auto_install:
-	python setup.py install --root=debian/canto --no-compile $(py_setup_install_args) \
+	python2.6 setup.py install --root=debian/canto --no-compile $(py_setup_install_args) \
 		--install-lib=/usr/lib/canto --install-scripts=/usr/lib/canto/bin
 	mv $(CURDIR)/debian/canto//usr/lib/canto/bin/canto \
 		$(CURDIR)/debian/canto/usr/lib/canto/canto-bin
@@ -20,6 +20,9 @@
 	rm -rf $(CURDIR)/debian/canto/usr/lib/canto/bin
 	rm -rf $(CURDIR)/debian/canto/usr/lib/canto/canto/feedparser_builtin.py
 
+override_dh_pysupport:
+	dh_pysupport -V2.6
+
 override_dh_link:
 	dh_link /usr/lib/canto/canto-bin /usr/bin/canto
 	dh_link /usr/lib/canto/canto-fetch /usr/bin/canto-fetch