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

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

    Date: Saturday, March 29, 2008 @ 20:50:22
  Author: pochu-guest
Revision: 884

  - Build the package with python2.5 since it FTBFS with python2.4 due to
    an issue with distutils.
  - Build-Depend on python2.5 since the package is built with python2.5,
    as it fails with python2.4's distutils.

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

Modified: packages/emesene/trunk/debian/changelog
===================================================================
--- packages/emesene/trunk/debian/changelog	2008-03-29 20:37:16 UTC (rev 883)
+++ packages/emesene/trunk/debian/changelog	2008-03-29 20:50:22 UTC (rev 884)
@@ -9,6 +9,8 @@
       tarballs.
     - Remove python-patchsys include.
     - Run dh_icons and dh_desktop
+    - Build the package with python2.5 since it FTBFS with python2.4 due to
+      an issue with distutils.
   * debian/copyright:
     - Updated.
   * debian/watch:
@@ -16,14 +18,12 @@
   * debian/emesene-launcher:
     - Update for the new Controller.py location.
   * debian/control:
-    - Build-Depend on python2.5 and change XS-Python-Versions to >= 2.5
-      so that the package is built with python2.5, as it fails with
-      python2.4's distutils. Depend on "python (>= 2.4) | ${python:Depends}".
-      This hack will be removed once python2.5 is the default python version.
+    - Build-Depend on python2.5 since the package is built with python2.5,
+      as it fails with python2.4's distutils.
     - Wrap Build-Depends.
     - Build-Depend on debhelper >= 5.0.51~ for dh_icons
 
- -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 29 Mar 2008 21:35:19 +0100
+ -- Emilio Pozuelo Monfort <pochu at ubuntu.com>  Sat, 29 Mar 2008 21:48:29 +0100
 
 emesene (1.0~r1137-1) unstable; urgency=low
 

Modified: packages/emesene/trunk/debian/control
===================================================================
--- packages/emesene/trunk/debian/control	2008-03-29 20:37:16 UTC (rev 883)
+++ packages/emesene/trunk/debian/control	2008-03-29 20:50:22 UTC (rev 884)
@@ -8,14 +8,14 @@
                python2.5
 Build-Depends-Indep: python-central (>= 0.5.6)
 Standards-Version: 3.7.3
-XS-Python-Version: >=2.5
+XS-Python-Version: >=2.4
 Homepage: http://www.emesene.org/
 Vcs-Svn: svn://svn.debian.org/python-apps/packages/emesene/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-apps/packages/emesene/?op=log
 
 Package: emesene
 Architecture: all
-Depends: python (>= 2.4) | ${python:Depends},
+Depends: ${python:Depends},
          python-gtk2 (>= 2.10),
          python-cairo,
          python-gobject

Modified: packages/emesene/trunk/debian/rules
===================================================================
--- packages/emesene/trunk/debian/rules	2008-03-29 20:37:16 UTC (rev 883)
+++ packages/emesene/trunk/debian/rules	2008-03-29 20:50:22 UTC (rev 884)
@@ -6,6 +6,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
 
+cdbs_python_compile_version := 2.5 # workaround FTBFS with python2.4's distutils. emesene runs fine with python2.4 though
 DEB_PYTHON_INSTALL_ARGS_ALL = --install-lib=usr/share/emesene
 
 install/emesene::