[Python-modules-commits] r865 - in /packages/kiwi/trunk/debian: changelog patches/02_avoid_version_checking.diff

[kov at users.alioth.debian.org]

Author: kov
Date: Thu Jun 15 23:49:24 2006
New Revision: 865

URL: http://svn.debian.org/wsvn/python-modules/?sc=1&rev=865
Log:
make both executables work

Added:
    packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff
Modified:
    packages/kiwi/trunk/debian/changelog

Modified: packages/kiwi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/changelog?rev=865&op=diff
==============================================================================
--- packages/kiwi/trunk/debian/changelog (original)
+++ packages/kiwi/trunk/debian/changelog Thu Jun 15 23:49:24 2006
@@ -1,6 +1,9 @@
 kiwi (1.9.8-4) UNRELEASED; urgency=low
 
-  * NOT RELEASED YET
+  * debian/patches/02_avoid_version_checking.diff:
+  - don't try to parse the sys.version string; there's no need to check
+    for versions inside the script; that's the packaging system's job,
+    so simply disabling (Closes: #372660)
 
  -- Gustavo Noronha Silva <kov at debian.org>  Sat, 10 Jun 2006 19:18:24 -0300
 

Added: packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff
URL: http://svn.debian.org/wsvn/python-modules/packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff?rev=865&op=file
==============================================================================
--- packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff (added)
+++ packages/kiwi/trunk/debian/patches/02_avoid_version_checking.diff Thu Jun 15 23:49:24 2006
@@ -1,0 +1,64 @@
+--- bin/kiwi-i18n~	2006-04-25 12:09:01.000000000 -0300
++++ bin/kiwi-i18n	2006-06-15 20:40:05.000000000 -0300
+@@ -20,7 +20,7 @@
+ import sys
+ 
+ # Required version of Python
+-REQUIRED_VERSION = (2, 1)
++#REQUIRED_VERSION = (2, 1)
+ 
+ # Directory name, defaults to name of binary, it is relative to ..
+ # a, __init__.py and main.py is expected to be found there.
+@@ -33,13 +33,13 @@
+ dirname = DIRNAME or os.path.split(sys.argv[0])[1]
+ appname = APPNAME or dirname.capitalize()
+ 
+-version_string = sys.version.split(' ')[0]
+-majmin = tuple(map(int, version_string.split('.')))
+-if majmin < REQUIRED_VERSION:
+-    raise SystemExit("ERROR: Python %s or higher is required to run %s, "
+-                     "%s found" % ('.'.join(map(str, REQUIRED_VERSION)),
+-                                   appname,
+-                                   version_string))
++#version_string = sys.version.split(' ')[0]
++#majmin = tuple(map(int, version_string.split('.')))
++#if majmin < REQUIRED_VERSION:
++#    raise SystemExit("ERROR: Python %s or higher is required to run %s, "
++#                     "%s found" % ('.'.join(map(str, REQUIRED_VERSION)),
++#                                   appname,
++#                                   version_string))
+ 
+ # Figure out the directy which is the prefix
+ # path-of-current-file/..
+--- bin/kiwi-ui-test~	2006-04-25 12:09:01.000000000 -0300
++++ bin/kiwi-ui-test	2006-06-15 20:39:07.000000000 -0300
+@@ -20,7 +20,7 @@
+ import sys
+ 
+ # Required version of Python
+-REQUIRED_VERSION = (2, 3)
++#REQUIRED_VERSION = (2, 3)
+ 
+ # Directory name, defaults to name of binary, it is relative to ..
+ # a, __init__.py and main.py is expected to be found there.
+@@ -33,13 +33,13 @@
+ dirname = DIRNAME or os.path.split(sys.argv[0])[1]
+ appname = APPNAME or dirname.capitalize()
+ 
+-version_string = sys.version.split(' ')[0]
+-majmin = tuple(map(int, version_string.split('.')))
+-if majmin < REQUIRED_VERSION:
+-    raise SystemExit("ERROR: Python %s or higher is required to run %s, "
+-                     "%s found" % ('.'.join(map(str, REQUIRED_VERSION)),
+-                                   appname,
+-                                   version_string))
++#version_string = sys.version.split(' ')[0]
++#majmin = tuple(map(int, version_string.split('.')))
++#if majmin < REQUIRED_VERSION:
++#    raise SystemExit("ERROR: Python %s or higher is required to run %s, "
++#                     "%s found" % ('.'.join(map(str, REQUIRED_VERSION)),
++#                                   appname,
++#                                   version_string))
+ 
+ # Figure out the directy which is the prefix
+ # path-of-current-file/..