[Python-modules-commits] r18371 - in packages/python-enable/trunk/debian (4 files)

[varun at users.alioth.debian.org]

    Date: Saturday, August 27, 2011 @ 02:36:14
  Author: varun
Revision: 18371

Update patches/freetype2.diff to fix linking issues with libX11
(Closes: #639232)

Modified:
  packages/python-enable/trunk/debian/changelog
  packages/python-enable/trunk/debian/control
  packages/python-enable/trunk/debian/patches/freetype2.diff
  packages/python-enable/trunk/debian/rules

Modified: packages/python-enable/trunk/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog	2011-08-26 21:49:20 UTC (rev 18370)
+++ packages/python-enable/trunk/debian/changelog	2011-08-27 02:36:14 UTC (rev 18371)
@@ -1,3 +1,10 @@
+python-enable (4.0.0-2) unstable; urgency=low
+
+  * Update patches/freetype2.diff to fix linking issues with libX11
+    (Closes: #639232)
+
+ -- Varun Hiremath <varun at debian.org>  Fri, 26 Aug 2011 22:03:57 -0400
+
 python-enable (4.0.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control	2011-08-26 21:49:20 UTC (rev 18370)
+++ packages/python-enable/trunk/debian/control	2011-08-27 02:36:14 UTC (rev 18371)
@@ -8,7 +8,7 @@
  libfreetype6-dev, libx11-dev, libglu1-mesa-dev, cython
 Standards-Version: 3.9.2
 X-Python-Version: >=2.5
-Homepage: http://pypi.python.org/pypi/Enable
+Homepage: http://pypi.python.org/pypi/enable
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-enable/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/python-enable/trunk/
 

Modified: packages/python-enable/trunk/debian/patches/freetype2.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/freetype2.diff	2011-08-26 21:49:20 UTC (rev 18370)
+++ packages/python-enable/trunk/debian/patches/freetype2.diff	2011-08-27 02:36:14 UTC (rev 18371)
@@ -5,8 +5,8 @@
 Index: python-enable-4.0.0/kiva/agg/setup.py
 ===================================================================
 --- python-enable-4.0.0.orig/kiva/agg/setup.py	2011-06-21 18:37:45.000000000 -0400
-+++ python-enable-4.0.0/kiva/agg/setup.py	2011-07-08 18:14:03.000000000 -0400
-@@ -4,58 +4,6 @@
++++ python-enable-4.0.0/kiva/agg/setup.py	2011-08-26 22:13:48.000000000 -0400
+@@ -4,59 +4,6 @@
  import re
  import platform
  
@@ -62,10 +62,11 @@
 -    ]
 -
 -
- 
+-
  def configuration(parent_package='', top_path=None):
      from numpy.distutils.misc_util import Configuration
-@@ -87,44 +35,10 @@
+     from numpy.distutils.system_info import dict_append, get_info
+@@ -87,44 +34,10 @@
  
  
      #-------------------------------------------------------------------------
@@ -111,7 +112,7 @@
      agg_sources = [agg_dir+'/src/*.cpp',
                      agg_dir+'/font_freetype/*.cpp']
      config.add_library(agg_lib,
-@@ -138,7 +52,7 @@
+@@ -138,7 +51,7 @@
      if sys.platform == 'darwin':
          define_macros = [('__DARWIN__', None)]
          macros = [('__DARWIN__', None)]
@@ -120,12 +121,20 @@
      else:
          define_macros = []
          macros = []
-@@ -191,7 +105,7 @@
+@@ -191,7 +104,7 @@
  
      build_info = {}
      kiva_lib = 'kiva_src'
 -    build_libraries = [kiva_lib, agg_lib, freetype_lib]
-+    build_libraries = [kiva_lib, agg_lib, "freetype"]
++    build_libraries = [kiva_lib, agg_lib, "freetype", "X11"]
      if sys.platform == "win32":
          build_libraries += ["opengl32", "glu32"]
      elif sys.platform == "darwin":
+@@ -230,6 +143,7 @@
+     elif plat in ['x11','gtk1']:
+         x11_info = get_info('x11', notfound_action=1)
+         dict_append(plat_info, **x11_info)
++        dict_append(plat_info, libraries = ['X11'])
+ 
+     elif plat=='gdkpixbuf2':
+         #gdk_pixbuf_xlib_2 = get_info('gdk_pixbuf_xlib_2',notfound_action=1)

Modified: packages/python-enable/trunk/debian/rules
===================================================================
--- packages/python-enable/trunk/debian/rules	2011-08-26 21:49:20 UTC (rev 18370)
+++ packages/python-enable/trunk/debian/rules	2011-08-27 02:36:14 UTC (rev 18371)
@@ -21,4 +21,4 @@
 	find $(EXAMPLES) -name 'CHANGES.txt' -delete
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename
+	-uscan --force-download --rename