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

varun at users.alioth.debian.org varun at users.alioth.debian.org
Sun Mar 16 03:29:59 UTC 2014 

    Date: Sunday, March 16, 2014 @ 03:29:56
  Author: varun
Revision: 28204

* New upstream release
* Remove embedded fonttools from upstream sources
* Add fonttools to Depends
* Bump Standards-Version to 3.9.5

Added:
  packages/python-enable/trunk/debian/patches/fonttools.diff
Modified:
  packages/python-enable/trunk/debian/changelog
  packages/python-enable/trunk/debian/control
  packages/python-enable/trunk/debian/orig-tar.sh
  packages/python-enable/trunk/debian/patches/freetype2.diff
  packages/python-enable/trunk/debian/patches/series

Modified: packages/python-enable/trunk/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog	2014-03-15 21:10:06 UTC (rev 28203)
+++ packages/python-enable/trunk/debian/changelog	2014-03-16 03:29:56 UTC (rev 28204)
@@ -1,9 +1,16 @@
-python-enable (4.1.0-2) UNRELEASED; urgency=low
+python-enable (4.3.0-1) unstable; urgency=low
 
+  [ Jakub Wilk ]
   * Use canonical URIs for Vcs-* fields.
 
- -- Jakub Wilk <jwilk at debian.org>  Sun, 05 May 2013 16:02:31 +0200
+  [ Varun Hiremath ]
+  * New upstream release
+  * Remove embedded fonttools from upstream sources
+  * Add fonttools to Depends
+  * Bump Standards-Version to 3.9.5
 
+ -- Varun Hiremath <varun at debian.org>  Sat, 15 Mar 2014 23:02:32 -0400
+
 python-enable (4.1.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control	2014-03-15 21:10:06 UTC (rev 28203)
+++ packages/python-enable/trunk/debian/control	2014-03-16 03:29:56 UTC (rev 28204)
@@ -6,7 +6,7 @@
 Build-Depends: cdbs (>= 0.4.90~), debhelper(>= 7), python-all-dev (>= 2.6.6-3~),
  python-setuptools, python-setupdocs, python-numpy, python-pyrex, swig,
  libfreetype6-dev, libx11-dev, libglu1-mesa-dev, cython
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 X-Python-Version: >=2.6
 Homepage: http://pypi.python.org/pypi/enable
 Vcs-Svn: svn://anonscm.debian.org/python-modules/packages/python-enable/trunk/
@@ -14,7 +14,7 @@
 
 Package: python-enable
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, fonttools,
  python-numpy, python-traitsui, python-wxgtk2.8, python-pkg-resources
 Description: Drawing and interaction packages
  The Enable project provides two related multi-platform packages for

Modified: packages/python-enable/trunk/debian/orig-tar.sh
===================================================================
--- packages/python-enable/trunk/debian/orig-tar.sh	2014-03-15 21:10:06 UTC (rev 28203)
+++ packages/python-enable/trunk/debian/orig-tar.sh	2014-03-16 03:29:56 UTC (rev 28204)
@@ -10,6 +10,9 @@
 # remove freetype2 source from enthought.kiva
 (cd $DIR; rm -rf kiva/agg/freetype2)
 
+# remove fonttools sources
+(cd $DIR; rm -rf kiva/fonttools/fontTools)
+
 # remove non-free gpc sources
 (cd $DIR; rm -rf kiva/agg/agg-24/gpc)
 

Added: packages/python-enable/trunk/debian/patches/fonttools.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/fonttools.diff	                        (rev 0)
+++ packages/python-enable/trunk/debian/patches/fonttools.diff	2014-03-16 03:29:56 UTC (rev 28204)
@@ -0,0 +1,13 @@
+Index: python-enable-4.3.0/kiva/fonttools/font_manager.py
+===================================================================
+--- python-enable-4.3.0.orig/kiva/fonttools/font_manager.py	2013-03-28 09:58:28.000000000 -0400
++++ python-enable-4.3.0/kiva/fonttools/font_manager.py	2014-03-15 23:16:17.242810912 -0400
+@@ -56,7 +56,7 @@
+ import afm
+ 
+ from traits.etsconfig.api import ETSConfig
+-from kiva.fonttools.fontTools.ttLib import TTFont
++from fontTools.ttLib import TTFont
+ 
+ try:
+     import cPickle as pickle

Modified: packages/python-enable/trunk/debian/patches/freetype2.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/freetype2.diff	2014-03-15 21:10:06 UTC (rev 28203)
+++ packages/python-enable/trunk/debian/patches/freetype2.diff	2014-03-16 03:29:56 UTC (rev 28204)
@@ -2,10 +2,10 @@
 Date: Sun, 28 Feb 2010 15:16:17 -0500
 Description: Remove freetype2 sources from upstream and use the
  pre-built libfreetype6-dev library in Debian.
-Index: python-enable-4.0.0/kiva/agg/setup.py
+Index: python-enable-4.3.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-08-26 22:13:48.000000000 -0400
+--- python-enable-4.3.0.orig/kiva/agg/setup.py	2014-03-15 23:19:16.985199737 -0400
++++ python-enable-4.3.0/kiva/agg/setup.py	2014-03-15 23:20:45.494375150 -0400
 @@ -4,59 +4,6 @@
  import re
  import platform
@@ -66,7 +66,7 @@
  def configuration(parent_package='', top_path=None):
      from numpy.distutils.misc_util import Configuration
      from numpy.distutils.system_info import dict_append, get_info
-@@ -87,44 +34,10 @@
+@@ -87,44 +34,11 @@
  
  
      #-------------------------------------------------------------------------
@@ -85,7 +85,7 @@
 -    ft2_incl_dirs = ['freetype2/src/' + s for s in freetype2_dirs] \
 -                    + ['freetype2/include', 'freetype2/src']
 -    ft2_incl_dirs = config.paths(*ft2_incl_dirs)
--    if sys.platform == 'darwin':
+-    if sys.platform == 'darwin' and '64bit' not in platform.architecture():
 -        ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
 -
 -    config.add_library(freetype_lib,
@@ -109,10 +109,11 @@
 -    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + \
 -                                   ft2_incl_dirs
 +    agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
++
      agg_sources = [agg_dir+'/src/*.cpp',
                      agg_dir+'/font_freetype/*.cpp']
      config.add_library(agg_lib,
-@@ -138,7 +51,7 @@
+@@ -138,7 +52,7 @@
      if sys.platform == 'darwin':
          define_macros = [('__DARWIN__', None)]
          macros = [('__DARWIN__', None)]
@@ -121,7 +122,16 @@
      else:
          define_macros = []
          macros = []
-@@ -191,7 +104,7 @@
+@@ -182,7 +96,7 @@
+     if '64bit' not in platform.architecture():
+         darwin_frameworks = ['Carbon', 'ApplicationServices', 'OpenGL']
+     else:
+-        darwin_frameworks = ['ApplicationServices', 'OpenGL']    
++        darwin_frameworks = ['ApplicationServices', 'OpenGL']
+     darwin_opengl_opts = dict(
+             include_dirs = [
+               '/System/Library/Frameworks/%s.framework/Versions/A/Headers' % x
+@@ -193,7 +107,7 @@
  
      build_info = {}
      kiva_lib = 'kiva_src'
@@ -130,9 +140,9 @@
      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)
+@@ -236,6 +150,7 @@
+         # the builder if we do not raise an exception.
+         x11_info = get_info('x11', notfound_action=2)
          dict_append(plat_info, **x11_info)
 +        dict_append(plat_info, libraries = ['X11'])
  

Modified: packages/python-enable/trunk/debian/patches/series
===================================================================
--- packages/python-enable/trunk/debian/patches/series	2014-03-15 21:10:06 UTC (rev 28203)
+++ packages/python-enable/trunk/debian/patches/series	2014-03-16 03:29:56 UTC (rev 28204)
@@ -1 +1,2 @@
+fonttools.diff
 freetype2.diff

More information about the Python-modules-commits mailing list