[Python-modules-commits] r16103 - in packages/gamera/trunk/debian (3 files)

[jwilk at users.alioth.debian.org]

    Date: Friday, March 11, 2011 @ 18:16:36
  Author: jwilk
Revision: 16103

Don't hardcode Python or wx versions at build time.

Added:
  packages/gamera/trunk/debian/patches/setup-no-import-wx.diff
Modified:
  packages/gamera/trunk/debian/changelog
  packages/gamera/trunk/debian/patches/series

Modified: packages/gamera/trunk/debian/changelog
===================================================================
--- packages/gamera/trunk/debian/changelog	2011-03-11 16:55:06 UTC (rev 16102)
+++ packages/gamera/trunk/debian/changelog	2011-03-11 18:16:36 UTC (rev 16103)
@@ -3,6 +3,8 @@
   * New upstream release.
     + Drop fix-memory-leak-to-raw-string.diff, applied upstream.
     + Refresh other patches.
+    + Don't hardcode Python or wx versions at build time.
+      (setup-no-import-wx.diff)
   * Strip file extension from icon name in the desktop file (closes: #609570).
     Thanks to Daniel Stender for the bug report.
   * Overhaul debian/rules.
@@ -12,7 +14,7 @@
     + Build depend on dpkg-dev (>= 1.15.7).
   * Update patch headers.
 
- -- Jakub Wilk <jwilk at debian.org>  Fri, 11 Mar 2011 17:54:23 +0100
+ -- Jakub Wilk <jwilk at debian.org>  Fri, 11 Mar 2011 18:34:09 +0100
 
 gamera (3.2.6-3) unstable; urgency=low
 

Modified: packages/gamera/trunk/debian/patches/series
===================================================================
--- packages/gamera/trunk/debian/patches/series	2011-03-11 16:55:06 UTC (rev 16102)
+++ packages/gamera/trunk/debian/patches/series	2011-03-11 18:16:36 UTC (rev 16103)
@@ -4,3 +4,4 @@
 use-system-galib.diff
 use-system-vigra.diff
 use-system-python-modules.diff
+setup-no-import-wx.diff

Added: packages/gamera/trunk/debian/patches/setup-no-import-wx.diff
===================================================================
--- packages/gamera/trunk/debian/patches/setup-no-import-wx.diff	                        (rev 0)
+++ packages/gamera/trunk/debian/patches/setup-no-import-wx.diff	2011-03-11 18:16:36 UTC (rev 16103)
@@ -0,0 +1,26 @@
+Description: Don't hardcode Python or wx versions at build time.
+Author: Jakub Wilk <jwilk at debian.org>
+Forwarded: not-needed
+Last-Update: 2011-03-11
+
+--- a/setup.py
++++ b/setup.py
+@@ -158,15 +158,9 @@
+ ##########################################
+ # Here's the basic distutils stuff
+ 
+-# read versions from compile computer
+-pythonversion = "%d.%d" % (sys.version_info[0],sys.version_info[1])
+-import wx
+-wx_version_info = wx.__version__.split(".")
+-wxversion = "%s.%s" % (wx_version_info[0],wx_version_info[1])
+-description = ("This is the Gamera installer.\n" + \
+-               "\tPlease ensure that Python " + pythonversion + \
+-               " and wxPython " + wxversion + "\n" + \
+-               "\tare installed before proceeding.")
++description = ("This is the Gamera installer. " +
++               "Please ensure that Python 2.4 and wxPython 2.6.x " +
++               "(or later) are installed before proceeding.")
+ 
+ includes = [(os.path.join(gamera_setup.include_path, path),
+              glob.glob(os.path.join("include", os.path.join(path, ext))))