diff -u gdesklets-0.36/debian/control.in gdesklets-0.36/debian/control.in --- gdesklets-0.36/debian/control.in +++ gdesklets-0.36/debian/control.in @@ -6,7 +6,7 @@ Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), - python-dev, + python-all-dev, python-gnome2-dev (>= 2.12.0), python-gtk2-dev (>= 2.10.0), python-pyorbit-dev (>= 2.0.1), @@ -22,7 +22,7 @@ python-support (>= 0.3), intltool Standards-Version: 3.7.3 -XS-Python-Version: all +XS-Python-Version: >= 2.5, << 2.6 Package: gdesklets Architecture: any diff -u gdesklets-0.36/debian/rules gdesklets-0.36/debian/rules --- gdesklets-0.36/debian/rules +++ gdesklets-0.36/debian/rules @@ -21,0 +22,11 @@ + : # FIXME: gdesklets doesn't work with python2.6 + for i in `find debian/gdesklets -type f`; do \ + sed '1s,#!.*python.*,#!/usr/bin/python2.5,' $$i > $$i.temp; \ + if cmp --quiet $$i $$i.temp; then \ + rm -f $$i.temp; \ + else \ + mv -f $$i.temp $$i; \ + chmod a+x $$i; \ + echo "Fixed interpreter to python2.5: $$i"; \ + fi; \ + done diff -u gdesklets-0.36/debian/control gdesklets-0.36/debian/control --- gdesklets-0.36/debian/control +++ gdesklets-0.36/debian/control @@ -6,7 +6,7 @@ Uploaders: Clément Stenac , Debian GNOME Maintainers , Deng Xiyue , Loic Minier , Sebastian Dröge Build-Depends: cdbs (>= 0.4.49), debhelper (>= 6), - python-dev, + python-all-dev, python-gnome2-dev (>= 2.12.0), python-gtk2-dev (>= 2.10.0), python-pyorbit-dev (>= 2.0.1), @@ -22,7 +22,7 @@ python-support (>= 0.3), intltool Standards-Version: 3.7.3 -XS-Python-Version: all +XS-Python-Version: >= 2.5, << 2.6 Package: gdesklets Architecture: any diff -u gdesklets-0.36/debian/changelog gdesklets-0.36/debian/changelog --- gdesklets-0.36/debian/changelog +++ gdesklets-0.36/debian/changelog @@ -1,3 +1,13 @@ +gdesklets (0.36-5build1ubuntu1) jaunty; urgency=low + + * Not compatible with python 2.6 (LP: #83922) + * debian/control, debian/control.in: + + Depends: python-all-dev + + XS-Python-Version: << 2.6 + * debian/rules: Fix interpreter python -> python2.5 + + -- Savvas Radevic Fri, 13 Mar 2009 11:08:34 +0100 + gdesklets (0.36-5build1) jaunty; urgency=low * Rebuild to build with Python 2.6 (LP: #336200).