[Python-modules-commits] r21406 - in packages/python-enable/tags (19 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Tue Apr 24 04:05:03 UTC 2012
Date: Tuesday, April 24, 2012 @ 04:04:58
Author: varun
Revision: 21406
[svn-buildpackage] Tagging python-enable 4.1.0-1
Added:
packages/python-enable/tags/4.1.0-1/
packages/python-enable/tags/4.1.0-1/debian/
packages/python-enable/tags/4.1.0-1/debian/changelog
(from rev 21399, packages/python-enable/trunk/debian/changelog)
packages/python-enable/tags/4.1.0-1/debian/control
(from rev 21399, packages/python-enable/trunk/debian/control)
packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh
(from rev 21399, packages/python-enable/trunk/debian/orig-tar.sh)
packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff
(from rev 18371, packages/python-enable/trunk/debian/patches/freetype2.diff)
packages/python-enable/tags/4.1.0-1/debian/patches/series
(from rev 17761, packages/python-enable/trunk/debian/patches/series)
packages/python-enable/tags/4.1.0-1/debian/pydist-overrides
(from rev 21399, packages/python-enable/trunk/debian/pydist-overrides)
packages/python-enable/tags/4.1.0-1/debian/rules
(from rev 21399, packages/python-enable/trunk/debian/rules)
packages/python-enable/tags/4.1.0-1/debian/watch
(from rev 21399, packages/python-enable/trunk/debian/watch)
Deleted:
packages/python-enable/tags/4.1.0-1/debian/
packages/python-enable/tags/4.1.0-1/debian/changelog
packages/python-enable/tags/4.1.0-1/debian/control
packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh
packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff
packages/python-enable/tags/4.1.0-1/debian/patches/series
packages/python-enable/tags/4.1.0-1/debian/patches/sike.diff
packages/python-enable/tags/4.1.0-1/debian/rules
packages/python-enable/tags/4.1.0-1/debian/watch
Deleted: packages/python-enable/tags/4.1.0-1/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/changelog 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,92 +0,0 @@
-python-enable (3.4.1-2) unstable; urgency=low
-
- * d/rules: fix pyshared directory path
-
- -- Varun Hiremath <varun at debian.org> Wed, 06 Apr 2011 19:28:09 -0400
-
-python-enable (3.4.1-1) unstable; urgency=low
-
- * New upstream release
- * Convert to dh_python2 (Closes: #617002)
-
- -- Varun Hiremath <varun at debian.org> Tue, 05 Apr 2011 21:54:28 -0400
-
-python-enable (3.3.2-2) experimental; urgency=low
-
- * Modify patches/sike.diff - import 'with' keyword to enable
- compilation with python2.5, thanks to Piotr
-
- -- Varun Hiremath <varun at debian.org> Thu, 21 Oct 2010 18:07:36 -0400
-
-python-enable (3.3.2-1) experimental; urgency=low
-
- * New upstream release
- * d/copyright: Remove BSD license references
- * d/control: Add cython to Build-Depends
- * Drop patches/fix_exceptions.diff -- merged upstream
- * Add patches/sike.diff to fix a compilation error
-
- -- Varun Hiremath <varun at debian.org> Sun, 17 Oct 2010 23:10:41 -0400
-
-python-enable (3.3.1-3) unstable; urgency=low
-
- * debian/control: Add python-enthoughtbase to Depends (Closes: #599479)
- * debian/rules: Do not install setup.py files (Closes: #595785)
-
- -- Varun Hiremath <varun at debian.org> Sun, 10 Oct 2010 22:26:28 -0400
-
-python-enable (3.3.1-2) unstable; urgency=low
-
- * Add patches/fix_exceptions.diff to fix Python string exceptions
- (Closes: #585288)
- * Remove conflicts on python-enthought-chaco2 - no longer needed
- * Bump Standards-Version to 3.9.1
-
- -- Varun Hiremath <varun at debian.org> Wed, 11 Aug 2010 01:33:31 -0400
-
-python-enable (3.3.1-1) unstable; urgency=low
-
- * New upstream release
-
- -- Varun Hiremath <varun at debian.org> Thu, 03 Jun 2010 01:46:10 -0400
-
-python-enable (3.3.0-1) unstable; urgency=low
-
- * New upstream release
- * Bump Standards-Version to 3.8.4
- * Switch to source format 3.0
- * Update patches/freetype2.diff
-
- -- Varun Hiremath <varun at debian.org> Sun, 28 Feb 2010 14:56:36 -0500
-
-python-enable (3.2.0-1) unstable; urgency=low
-
- * New upstream release
- * Bump Standards-Version to 3.8.2
- * Add python-pyrex to Build-Depends
-
- -- Varun Hiremath <varun at debian.org> Mon, 20 Jul 2009 02:55:56 -0400
-
-python-enable (3.1.0-1) unstable; urgency=low
-
- * New upstream release
-
- -- Varun Hiremath <varun at debian.org> Thu, 26 Mar 2009 20:06:26 -0400
-
-python-enable (3.0.2-1) unstable; urgency=low
-
- [ Sandro Tosi ]
- * debian/control
- - switch Vcs-Browser field to viewsvn
-
- [ Varun Hiremath ]
- * New upstream release
- * debian/control: add python-setupdocs to Build-Depends
-
- -- Varun Hiremath <varun at debian.org> Sun, 28 Dec 2008 22:34:11 -0500
-
-python-enable (3.0.1-1) experimental; urgency=low
-
- * Initial release
-
- -- Varun Hiremath <varun at debian.org> Fri, 12 Dec 2008 16:37:21 -0500
Copied: packages/python-enable/tags/4.1.0-1/debian/changelog (from rev 21399, packages/python-enable/trunk/debian/changelog)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/changelog (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/changelog 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1,116 @@
+python-enable (4.1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.9.3
+ * Add d/pydist-overrides: "pil python-imaging"
+
+ -- Varun Hiremath <varun at debian.org> Mon, 23 Apr 2012 15:46:30 -0400
+
+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
+ * Bump Standards-Version to 3.9.2
+ * Update debian/watch file
+ * Remove patches/sike.diff - not needed
+
+ -- Varun Hiremath <varun at debian.org> Fri, 08 Jul 2011 17:28:49 -0400
+
+python-enable (3.4.1-2) unstable; urgency=low
+
+ * d/rules: fix pyshared directory path
+
+ -- Varun Hiremath <varun at debian.org> Wed, 06 Apr 2011 19:28:09 -0400
+
+python-enable (3.4.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Convert to dh_python2 (Closes: #617002)
+
+ -- Varun Hiremath <varun at debian.org> Tue, 05 Apr 2011 21:54:28 -0400
+
+python-enable (3.3.2-2) experimental; urgency=low
+
+ * Modify patches/sike.diff - import 'with' keyword to enable
+ compilation with python2.5, thanks to Piotr
+
+ -- Varun Hiremath <varun at debian.org> Thu, 21 Oct 2010 18:07:36 -0400
+
+python-enable (3.3.2-1) experimental; urgency=low
+
+ * New upstream release
+ * d/copyright: Remove BSD license references
+ * d/control: Add cython to Build-Depends
+ * Drop patches/fix_exceptions.diff -- merged upstream
+ * Add patches/sike.diff to fix a compilation error
+
+ -- Varun Hiremath <varun at debian.org> Sun, 17 Oct 2010 23:10:41 -0400
+
+python-enable (3.3.1-3) unstable; urgency=low
+
+ * debian/control: Add python-enthoughtbase to Depends (Closes: #599479)
+ * debian/rules: Do not install setup.py files (Closes: #595785)
+
+ -- Varun Hiremath <varun at debian.org> Sun, 10 Oct 2010 22:26:28 -0400
+
+python-enable (3.3.1-2) unstable; urgency=low
+
+ * Add patches/fix_exceptions.diff to fix Python string exceptions
+ (Closes: #585288)
+ * Remove conflicts on python-enthought-chaco2 - no longer needed
+ * Bump Standards-Version to 3.9.1
+
+ -- Varun Hiremath <varun at debian.org> Wed, 11 Aug 2010 01:33:31 -0400
+
+python-enable (3.3.1-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Thu, 03 Jun 2010 01:46:10 -0400
+
+python-enable (3.3.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.8.4
+ * Switch to source format 3.0
+ * Update patches/freetype2.diff
+
+ -- Varun Hiremath <varun at debian.org> Sun, 28 Feb 2010 14:56:36 -0500
+
+python-enable (3.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Bump Standards-Version to 3.8.2
+ * Add python-pyrex to Build-Depends
+
+ -- Varun Hiremath <varun at debian.org> Mon, 20 Jul 2009 02:55:56 -0400
+
+python-enable (3.1.0-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Varun Hiremath <varun at debian.org> Thu, 26 Mar 2009 20:06:26 -0400
+
+python-enable (3.0.2-1) unstable; urgency=low
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ [ Varun Hiremath ]
+ * New upstream release
+ * debian/control: add python-setupdocs to Build-Depends
+
+ -- Varun Hiremath <varun at debian.org> Sun, 28 Dec 2008 22:34:11 -0500
+
+python-enable (3.0.1-1) experimental; urgency=low
+
+ * Initial release
+
+ -- Varun Hiremath <varun at debian.org> Fri, 12 Dec 2008 16:37:21 -0500
Deleted: packages/python-enable/tags/4.1.0-1/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/control 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,26 +0,0 @@
-Source: python-enable
-Section: python
-Priority: optional
-Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varun at debian.org>
-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.1
-X-Python-Version: >=2.4
-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/
-
-Package: python-enable
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-numpy, python-traitsgui, python-enthoughtbase,
- python-wxgtk2.8, python-pkg-resources
-Description: Drawing and interaction packages
- The Enable project provides two related multi-platform packages for
- drawing GUI objects.
- .
- * Enable: An object drawing library that supports containment and
- event notification.
- * Kiva: A multi-platform DisplayPDF vector drawing engine.
Copied: packages/python-enable/tags/4.1.0-1/debian/control (from rev 21399, packages/python-enable/trunk/debian/control)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/control (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/control 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1,25 @@
+Source: python-enable
+Section: python
+Priority: optional
+Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
+Uploaders: Varun Hiremath <varun at debian.org>
+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
+X-Python-Version: >=2.6
+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/
+
+Package: python-enable
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ 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
+ drawing GUI objects.
+ .
+ * Enable: An object drawing library that supports containment and
+ event notification.
+ * Kiva: A multi-platform DisplayPDF vector drawing engine.
Deleted: packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh
===================================================================
--- packages/python-enable/trunk/debian/orig-tar.sh 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,25 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=enthought-chaco2-$2.orig
-
-# cleanup the upstream sources
-tar zxf $3
-mv Enable-$2 $DIR
-
-# remove freetype2 source from enthought.kiva
-(cd $DIR; rm -rf enthought/kiva/agg/freetype2)
-
-# remove non-free gpc sources
-(cd $DIR; rm -rf enthought/kiva/agg/agg-24/gpc)
-
-# create the tarball
-GZIP=--best tar -c -z -f $3 $DIR
-rm -rf $DIR
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $3 $origDir
- echo "moved $3 to $origDir"
-fi
Copied: packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh (from rev 21399, packages/python-enable/trunk/debian/orig-tar.sh)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/orig-tar.sh 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1,25 @@
+#!/bin/sh -e
+
+# called by uscan with '--upstream-version' <version> <file>
+DIR=enthought-chaco2-$2.orig
+
+# cleanup the upstream sources
+tar zxf $3
+mv enable-$2 $DIR
+
+# remove freetype2 source from enthought.kiva
+(cd $DIR; rm -rf kiva/agg/freetype2)
+
+# remove non-free gpc sources
+(cd $DIR; rm -rf kiva/agg/agg-24/gpc)
+
+# create the tarball
+GZIP=--best tar -c -z -f $3 $DIR
+rm -rf $DIR
+
+# move to directory 'tarballs'
+if [ -r .svn/deb-layout ]; then
+ . .svn/deb-layout
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
+fi
Deleted: packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/freetype2.diff 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,133 +0,0 @@
-Author: Varun Hiremath <varun at debian.org>
-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-3.3.0/enthought/kiva/agg/setup.py
-===================================================================
---- python-enable-3.3.0.orig/enthought/kiva/agg/setup.py 2010-02-25 13:15:07.000000000 -0500
-+++ python-enable-3.3.0/enthought/kiva/agg/setup.py 2010-02-28 14:55:37.000000000 -0500
-@@ -4,59 +4,6 @@
- import re
- import platform
-
--freetype2_sources =['autofit/autofit.c',
-- 'base/ftbase.c','base/ftsystem.c','base/ftinit.c',
-- 'base/ftglyph.c','base/ftmm.c','base/ftbdf.c',
-- 'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c',
-- 'base/fttype1.c',
-- 'bdf/bdf.c',
-- 'cff/cff.c',
-- 'cid/type1cid.c',
-- 'lzw/ftlzw.c',
-- 'pcf/pcf.c','pfr/pfr.c',
-- 'psaux/psaux.c',
-- 'pshinter/pshinter.c',
-- 'psnames/psnames.c',
-- 'raster/raster.c',
-- 'sfnt/sfnt.c',
-- 'smooth/smooth.c',
-- 'truetype/truetype.c',
-- 'type1/type1.c',
-- 'type42/type42.c',
-- 'winfonts/winfnt.c',
-- 'gzip/ftgzip.c',
-- 'base/ftmac.c',
-- ]
--
--freetype2_dirs = [
-- 'autofit',
-- 'base',
-- 'bdf',
-- 'cache',
-- 'cff',
-- 'cid',
-- 'gxvalid',
-- 'gzip',
-- 'lzw',
-- 'otvalid',
-- 'pcf',
-- 'pfr',
-- 'psaux',
-- 'pshinter',
-- 'psnames',
-- 'raster',
-- 'sfnt',
-- 'smooth',
-- 'tools',
-- 'truetype',
-- 'type1',
-- 'type42',
-- 'winfonts',
-- 'gzip'
-- ]
--
--
--
- def configuration(parent_package='',top_path=None):
- from numpy.distutils.misc_util import Configuration
- from numpy.distutils.system_info import dict_append, get_info
-@@ -85,45 +32,11 @@
- plat = 'x11' # use with gtk2, it's slow but reliable
- #plat = 'gdkpixbuf2'
-
--
-- #-------------------------------------------------------------------------
-- # Add the freetype library (agg 2.4 links against this)
-- #-------------------------------------------------------------------------
--
-- prefix = config.paths('freetype2/src')[0]
-- freetype_lib = 'freetype2_src'
--
-- def get_ft2_sources((lib_name, build_info), build_dir):
-- sources = [prefix + "/" + s for s in freetype2_sources]
-- if sys.platform=='darwin':
-- return sources[:]
-- return sources[:-1]
--
-- 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':
-- ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
--
-- config.add_library(freetype_lib,
-- sources = [get_ft2_sources],
-- include_dirs = ft2_incl_dirs,
--
-- # This macro was introduced in Freetype 2.2; if it is
-- # not defined, then the ftheader.h file (one of the
-- # primary headers) won't pull in any additional internal
-- # Freetype headers, and the library will mysteriously
-- # fail to build.
-- macros = [("FT2_BUILD_LIBRARY", None)],
--
-- depends = ['freetype2'],
-- )
--
- #-------------------------------------------------------------------------
- # Add the Agg sources
- #-------------------------------------------------------------------------
-
-- 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,
-@@ -137,7 +50,7 @@
- if sys.platform == 'darwin':
- define_macros = [('__DARWIN__', None)]
- macros = [('__DARWIN__', None)]
-- extra_link_args = ['-framework', 'Carbon']
-+ extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
- else:
- define_macros = []
- macros = []
-@@ -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"]
- if sys.platform == "win32":
- build_libraries += ["opengl32", "glu32"]
- elif sys.platform == "darwin":
Copied: packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff (from rev 18371, packages/python-enable/trunk/debian/patches/freetype2.diff)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/patches/freetype2.diff 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1,140 @@
+Author: Varun Hiremath <varun at debian.org>
+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
+===================================================================
+--- 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
+@@ -4,59 +4,6 @@
+ import re
+ import platform
+
+-freetype2_sources =['autofit/autofit.c',
+- 'base/ftbase.c','base/ftsystem.c','base/ftinit.c',
+- 'base/ftglyph.c','base/ftmm.c','base/ftbdf.c',
+- 'base/ftbbox.c','base/ftdebug.c','base/ftxf86.c',
+- 'base/fttype1.c',
+- 'bdf/bdf.c',
+- 'cff/cff.c',
+- 'cid/type1cid.c',
+- 'lzw/ftlzw.c',
+- 'pcf/pcf.c','pfr/pfr.c',
+- 'psaux/psaux.c',
+- 'pshinter/pshinter.c',
+- 'psnames/psnames.c',
+- 'raster/raster.c',
+- 'sfnt/sfnt.c',
+- 'smooth/smooth.c',
+- 'truetype/truetype.c',
+- 'type1/type1.c',
+- 'type42/type42.c',
+- 'winfonts/winfnt.c',
+- 'gzip/ftgzip.c',
+- 'base/ftmac.c',
+- ]
+-
+-freetype2_dirs = [
+- 'autofit',
+- 'base',
+- 'bdf',
+- 'cache',
+- 'cff',
+- 'cid',
+- 'gxvalid',
+- 'gzip',
+- 'lzw',
+- 'otvalid',
+- 'pcf',
+- 'pfr',
+- 'psaux',
+- 'pshinter',
+- 'psnames',
+- 'raster',
+- 'sfnt',
+- 'smooth',
+- 'tools',
+- 'truetype',
+- 'type1',
+- 'type42',
+- 'winfonts',
+- 'gzip'
+- ]
+-
+-
+-
+ 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 @@
+
+
+ #-------------------------------------------------------------------------
+- # Add the freetype library (agg 2.4 links against this)
+- #-------------------------------------------------------------------------
+-
+- prefix = config.paths('freetype2/src')[0]
+- freetype_lib = 'freetype2_src'
+-
+- def get_ft2_sources((lib_name, build_info), build_dir):
+- sources = [prefix + "/" + s for s in freetype2_sources]
+- if sys.platform=='darwin':
+- return sources[:]
+- return sources[:-1]
+-
+- 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':
+- ft2_incl_dirs.append("/Developer/Headers/FlatCarbon")
+-
+- config.add_library(freetype_lib,
+- sources = [get_ft2_sources],
+- include_dirs = ft2_incl_dirs,
+-
+- # This macro was introduced in Freetype 2.2; if it is
+- # not defined, then the ftheader.h file (one of the
+- # primary headers) won't pull in any additional internal
+- # Freetype headers, and the library will mysteriously
+- # fail to build.
+- macros = [("FT2_BUILD_LIBRARY", None)],
+-
+- depends = ['freetype2'],
+- )
+-
+- #-------------------------------------------------------------------------
+ # Add the Agg sources
+ #-------------------------------------------------------------------------
+
+- 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 @@
+ if sys.platform == 'darwin':
+ define_macros = [('__DARWIN__', None)]
+ macros = [('__DARWIN__', None)]
+- extra_link_args = ['-framework', 'Carbon']
++ extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
+ else:
+ define_macros = []
+ macros = []
+@@ -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", "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)
Deleted: packages/python-enable/tags/4.1.0-1/debian/patches/series
===================================================================
--- packages/python-enable/trunk/debian/patches/series 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/patches/series 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,2 +0,0 @@
-sike.diff
-freetype2.diff
Copied: packages/python-enable/tags/4.1.0-1/debian/patches/series (from rev 17761, packages/python-enable/trunk/debian/patches/series)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/patches/series (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/patches/series 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1 @@
+freetype2.diff
Deleted: packages/python-enable/tags/4.1.0-1/debian/patches/sike.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/sike.diff 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/patches/sike.diff 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,20 +0,0 @@
-Index: python-enable-3.3.2/enthought/savage/compliance/sike.py
-===================================================================
---- python-enable-3.3.2.orig/enthought/savage/compliance/sike.py 2010-10-13 17:49:01.000000000 -0400
-+++ python-enable-3.3.2/enthought/savage/compliance/sike.py 2010-10-21 18:15:32.000000000 -0400
-@@ -1,5 +1,7 @@
- #!/usr/bin/env python
- # -*- coding: UTF-8 -*-
-+# import with keyword
-+from __future__ import with_statement
-
- from collections import defaultdict
- import os
-@@ -10,7 +12,6 @@
- from enthought.traits.ui import api as tui
- from enthought.traits.ui.tabular_adapter import TabularAdapter
-
--
- class SuperTuple(tuple):
- """ Generic super-tuple using pre-defined attribute names.
- """
Copied: packages/python-enable/tags/4.1.0-1/debian/pydist-overrides (from rev 21399, packages/python-enable/trunk/debian/pydist-overrides)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/pydist-overrides (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/pydist-overrides 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1 @@
+pil python-imaging
Deleted: packages/python-enable/tags/4.1.0-1/debian/rules
===================================================================
--- packages/python-enable/trunk/debian/rules 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/rules 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,24 +0,0 @@
-#!/usr/bin/make -f
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_COMPRESS_EXCLUDE := .py
-DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
-DEB_INSTALL_CHANGELOGS_ALL += docs/CHANGES.txt
-PYSHARED =$(DEB_DESTDIR)/usr/share/pyshared
-EXAMPLES =$(DEB_DESTDIR)/usr/share/doc/python-enable
-
-install/python-enable::
- find $(DEB_DESTDIR) -name 'LICENSE.txt' -delete
- find $(DEB_DESTDIR) -name 'setup.py' -delete
-
-binary-predeb/python-enable::
- find $(PYSHARED) -type f | xargs sed -i '/^#!/d'
- find $(PYSHARED) -type f | xargs chmod 644
- find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'
- find $(EXAMPLES) -type f | xargs chmod 644
- find $(EXAMPLES) -name 'CHANGES.txt' -delete
-
-get-orig-source:
- -uscan --upstream-version 0 --rename
Copied: packages/python-enable/tags/4.1.0-1/debian/rules (from rev 21399, packages/python-enable/trunk/debian/rules)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/rules (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/rules 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
+
+DEB_COMPRESS_EXCLUDE := .py
+DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+DEB_INSTALL_CHANGELOGS_ALL += docs/CHANGES.txt
+PYSHARED =$(DEB_DESTDIR)/usr/share/pyshared
+EXAMPLES =$(DEB_DESTDIR)/usr/share/doc/python-enable
+
+install/python-enable::
+ find $(DEB_DESTDIR) -name 'LICENSE.txt' -delete
+ find $(DEB_DESTDIR) -name 'image_LICENSE.txt' -delete
+ find $(DEB_DESTDIR) -name 'setup.py' -delete
+ dh_numpy
+
+binary-predeb/python-enable::
+ find $(PYSHARED) -type f | xargs sed -i '/^#!/d'
+ find $(PYSHARED) -type f | xargs chmod 644
+ find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'
+ find $(EXAMPLES) -type f | xargs chmod 644
+ find $(EXAMPLES) -name '.gitignore' -delete
+ find $(EXAMPLES) -name 'CHANGES.txt.gz' -delete
+
+get-orig-source:
+ -uscan --force-download --rename
Deleted: packages/python-enable/tags/4.1.0-1/debian/watch
===================================================================
--- packages/python-enable/trunk/debian/watch 2011-07-08 21:04:31 UTC (rev 17758)
+++ packages/python-enable/tags/4.1.0-1/debian/watch 2012-04-24 04:04:58 UTC (rev 21406)
@@ -1,4 +0,0 @@
-version=3
-opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://www.enthought.com/repo/ets/Enable-(.*).tar.gz \
-debian debian/orig-tar.sh
Copied: packages/python-enable/tags/4.1.0-1/debian/watch (from rev 21399, packages/python-enable/trunk/debian/watch)
===================================================================
--- packages/python-enable/tags/4.1.0-1/debian/watch (rev 0)
+++ packages/python-enable/tags/4.1.0-1/debian/watch 2012-04-24 04:04:58 UTC (rev 21406)
@@ -0,0 +1,4 @@
+version=3
+opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
+http://pypi.python.org/pypi/enable .*enable-(.*).tar.gz \
+debian debian/orig-tar.sh
More information about the Python-modules-commits
mailing list