r23130 - in /desktop/experimental/sabayon/debian: changelog control control.in patches/03_python26.patch rules

[dktrkranz at users.alioth.debian.org]

Author: dktrkranz
Date: Wed Feb 24 17:22:48 2010
New Revision: 23130

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23130
Log:
Revert r23075, upstream made code compatible with python2.5

Removed:
    desktop/experimental/sabayon/debian/patches/03_python26.patch
Modified:
    desktop/experimental/sabayon/debian/changelog
    desktop/experimental/sabayon/debian/control
    desktop/experimental/sabayon/debian/control.in
    desktop/experimental/sabayon/debian/rules

Modified: desktop/experimental/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/changelog?rev=23130&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/changelog [utf-8] (original)
+++ desktop/experimental/sabayon/debian/changelog [utf-8] Wed Feb 24 17:22:48 2010
@@ -2,13 +2,7 @@
 
   * New upstream release.
   * debian/control.in:
-    - sabayon requires python2.6 to work.
-    - Build-depend on python2.6-dev.
     - Bump Standards-Version to 3.8.4, no changes required.
-  * debian/rules:
-    - Instruct configure to build extension for python2.6 by default.
-  * debian/patches/03_python26.patch:
-    - Fix shebangs to be launched via python2.6 interpreter.
 
  -- Luca Falavigna <dktrkranz at debian.org>  Wed, 24 Feb 2010 17:16:51 +0000
 

Modified: desktop/experimental/sabayon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/control?rev=23130&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/control [utf-8] (original)
+++ desktop/experimental/sabayon/debian/control [utf-8] Wed Feb 24 17:22:48 2010
@@ -14,7 +14,7 @@
                gnome-pkg-tools,
                gnome-doc-utils (>= 0.17.3),
                python-gtk2-dev (>= 2.16.0),
-               python2.6-dev,
+               python-dev,
                intltool (>= 0.40.0),
                python-xdg,
                pessulus,
@@ -27,7 +27,7 @@
                python-support (>= 0.5.3)
 Homepage: http://live.gnome.org/Sabayon
 Standards-Version: 3.8.4
-XS-Python-Version: >= 2.6
+XS-Python-Version: >= 2.5
 
 Package: sabayon
 Architecture: any

Modified: desktop/experimental/sabayon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/control.in?rev=23130&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/control.in [utf-8] (original)
+++ desktop/experimental/sabayon/debian/control.in [utf-8] Wed Feb 24 17:22:48 2010
@@ -9,7 +9,7 @@
                gnome-pkg-tools,
                gnome-doc-utils (>= 0.17.3),
                python-gtk2-dev (>= 2.16.0),
-               python2.6-dev,
+               python-dev,
                intltool (>= 0.40.0),
                python-xdg,
                pessulus,
@@ -22,7 +22,7 @@
                python-support (>= 0.5.3)
 Homepage: http://live.gnome.org/Sabayon
 Standards-Version: 3.8.4
-XS-Python-Version: >= 2.6
+XS-Python-Version: >= 2.5
 
 Package: sabayon
 Architecture: any

Modified: desktop/experimental/sabayon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/sabayon/debian/rules?rev=23130&op=diff
==============================================================================
--- desktop/experimental/sabayon/debian/rules [utf-8] (original)
+++ desktop/experimental/sabayon/debian/rules [utf-8] Wed Feb 24 17:22:48 2010
@@ -7,7 +7,6 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_CONFIGURE_SCRIPT_ENV += PYTHON="python2.6"
 DEB_CONFIGURE_EXTRA_FLAGS += \
 				--with-prototype-user=sabayon-admin \
 				--with-distro=debian