r12849 - in /desktop/unstable/sabayon/debian: changelog control control.in patches/40_force-python2.5-build.patch patches/41_force-python2.5-execution.patch

Wed Sep 26 04:31:17 UTC 2007

Author: alanbach-guest
Date: Wed Sep 26 04:31:17 2007
New Revision: 12849

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12849
Log:
* Bump python build-dep to 2.5, * Added 40_force-python2.5-build.patch to force build with python 2.5, * Added 41_force-python2.5-execution.patch to force execution with python 2.5

Added:
    desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch
    desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch
Modified:
    desktop/unstable/sabayon/debian/changelog
    desktop/unstable/sabayon/debian/control
    desktop/unstable/sabayon/debian/control.in

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=12849&op=diff
==============================================================================

--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Wed Sep 26 04:31:17 2007
@@ -1,8 +1,16 @@
-sabayon (2.20.1-2) UNRELEASED; urgency=low
-
+sabayon (2.20.1-2) unstable; urgency=low
+
+  [ Loic Minier ]
   * Cleanup whitespace.
 
- -- Loic Minier <lool at dooz.org>  Tue, 25 Sep 2007 18:45:16 +0200
+  [ Alan Baghumian ]
+  * Bump python build-dep to 2.5
+  * Added 40_force-python2.5-build.patch to force build
+    with python 2.5
+  * Added 41_force-python2.5-execution.patch to force 
+    execution with python 2.5  
+
+ -- Alan Baghumian <alan at technotux.org>  Wed, 26 Sep 2007 07:55:34 +0330
 
 sabayon (2.20.1-1) unstable; urgency=low
 

Modified: desktop/unstable/sabayon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control?rev=12849&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control (original)
+++ desktop/unstable/sabayon/debian/control Wed Sep 26 04:31:17 2007
@@ -7,7 +7,7 @@
                debhelper (>= 5.0.37.2),
                cdbs,
                gnome-pkg-tools,
-               python-dev (>= 2.4),
+               python2.5-dev,
                libpango1.0-dev,
                libgtk2.0-dev,
                python-gtk2-dev,

Modified: desktop/unstable/sabayon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/control.in?rev=12849&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/control.in (original)
+++ desktop/unstable/sabayon/debian/control.in Wed Sep 26 04:31:17 2007
@@ -7,7 +7,7 @@
                debhelper (>= 5.0.37.2),
                cdbs,
                gnome-pkg-tools,
-               python-dev (>= 2.4),
+               python2.5-dev,
                libpango1.0-dev,
                libgtk2.0-dev,
                python-gtk2-dev,

Added: desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch?rev=12849&op=file
==============================================================================
--- desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch (added)
+++ desktop/unstable/sabayon/debian/patches/40_force-python2.5-build.patch Wed Sep 26 04:31:17 2007
@@ -1,0 +1,27 @@
+# Force to build with python 2.5, sabayon needs python 2.5 to
+# be executed correctly
+
+diff -urpN sabayon-2.20.1/aclocal.m4 sabayon-2.20.1.new/aclocal.m4
+--- sabayon-2.20.1/aclocal.m4	2007-09-20 03:55:04.000000000 +0330
++++ sabayon-2.20.1.new/aclocal.m4	2007-09-26 07:47:21.000000000 +0330
+@@ -8241,7 +8241,7 @@ AC_DEFUN([AM_PATH_PYTHON],
+   dnl $prefix/lib/site-python in 1.4 to $prefix/lib/python1.5/site-packages
+   dnl in 1.5.
+   m4_define_default([_AM_PYTHON_INTERPRETER_LIST],
+-                    [python python2 python2.5 python2.4 python2.3 python2.2 dnl
++                    [python2.5 python2.4 python2.3 python2.2 dnl
+ python2.1 python2.0 python1.6 python1.5])
+ 
+   m4_if([$1],[],[
+diff -urpN sabayon-2.20.1/configure sabayon-2.20.1.new/configure
+--- sabayon-2.20.1/configure	2007-09-20 03:55:07.000000000 +0330
++++ sabayon-2.20.1.new/configure	2007-09-26 07:46:56.000000000 +0330
+@@ -22025,7 +22025,7 @@ LIBTOOL='$(SHELL) $(top_builddir)/libtoo
+ 
+         # Find any Python interpreter.
+     if test -z "$PYTHON"; then
+-      for ac_prog in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
++      for ac_prog in python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5
+ do
+   # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2

Added: desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch?rev=12849&op=file
==============================================================================
--- desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch (added)
+++ desktop/unstable/sabayon/debian/patches/41_force-python2.5-execution.patch Wed Sep 26 04:31:17 2007
@@ -1,0 +1,30 @@
+# Force to be executed with python 2.5, on Debian, /usr/bin/python still
+# points to python 2.4
+
+diff -urpN sabayon-2.20.1/admin-tool/sabayon sabayon-2.20.1.new/admin-tool/sabayon
+--- sabayon-2.20.1/admin-tool/sabayon	2007-09-20 03:49:27.000000000 +0330
++++ sabayon-2.20.1.new/admin-tool/sabayon	2007-09-26 07:49:17.000000000 +0330
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.5
+ # -*- mode: python -*-
+ #
+ # Copyright (C) 2005 Red Hat, Inc.
+diff -urpN sabayon-2.20.1/admin-tool/sabayon-apply sabayon-2.20.1.new/admin-tool/sabayon-apply
+--- sabayon-2.20.1/admin-tool/sabayon-apply	2007-09-20 03:49:27.000000000 +0330
++++ sabayon-2.20.1.new/admin-tool/sabayon-apply	2007-09-26 07:50:27.000000000 +0330
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.5
+ # -*- mode: python -*-
+ #
+ # Copyright (C) 2005 Red Hat, Inc.
+diff -urpN sabayon-2.20.1/admin-tool/sabayon-session sabayon-2.20.1.new/admin-tool/sabayon-session
+--- sabayon-2.20.1/admin-tool/sabayon-session	2007-09-20 03:49:27.000000000 +0330
++++ sabayon-2.20.1.new/admin-tool/sabayon-session	2007-09-26 07:50:42.000000000 +0330
+@@ -1,4 +1,4 @@
+-#!/usr/bin/env python
++#!/usr/bin/env python2.5
+ # -*- mode: python -*-
+ #
+ # Copyright (C) 2005 Red Hat, Inc.


