[Python-modules-commits] r12045 - in packages/python-enable/trunk/debian (8 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Sun Feb 28 20:33:20 UTC 2010
Date: Sunday, February 28, 2010 @ 20:33:11
Author: varun
Revision: 12045
* New upstream release
* Bump Standards-Version to 3.8.4
* Switch to source format 3.0
* Update patches/freetype2.diff
Added:
packages/python-enable/trunk/debian/source/
packages/python-enable/trunk/debian/source/format
Modified:
packages/python-enable/trunk/debian/changelog
packages/python-enable/trunk/debian/compat
packages/python-enable/trunk/debian/control
packages/python-enable/trunk/debian/patches/freetype2.diff
packages/python-enable/trunk/debian/rules
packages/python-enable/trunk/debian/watch
Modified: packages/python-enable/trunk/debian/changelog
===================================================================
--- packages/python-enable/trunk/debian/changelog 2010-02-28 19:46:19 UTC (rev 12044)
+++ packages/python-enable/trunk/debian/changelog 2010-02-28 20:33:11 UTC (rev 12045)
@@ -1,3 +1,12 @@
+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
Modified: packages/python-enable/trunk/debian/compat
===================================================================
--- packages/python-enable/trunk/debian/compat 2010-02-28 19:46:19 UTC (rev 12044)
+++ packages/python-enable/trunk/debian/compat 2010-02-28 20:33:11 UTC (rev 12045)
@@ -1 +1 @@
-6
+7
Modified: packages/python-enable/trunk/debian/control
===================================================================
--- packages/python-enable/trunk/debian/control 2010-02-28 19:46:19 UTC (rev 12044)
+++ packages/python-enable/trunk/debian/control 2010-02-28 20:33:11 UTC (rev 12045)
@@ -3,10 +3,10 @@
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, debhelper(>= 6), python-all-dev, python-central,
+Build-Depends: cdbs, debhelper(>= 7), python-all-dev, python-central,
python-setuptools, python-setupdocs, python-numpy, python-pyrex, swig,
- libfreetype6-dev, libx11-dev, libglu1-mesa-dev, quilt
-Standards-Version: 3.8.2
+ libfreetype6-dev, libx11-dev, libglu1-mesa-dev
+Standards-Version: 3.8.4
XS-Python-Version: >=2.4
Homepage: http://pypi.python.org/pypi/Enable
Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-enable/trunk
Modified: packages/python-enable/trunk/debian/patches/freetype2.diff
===================================================================
--- packages/python-enable/trunk/debian/patches/freetype2.diff 2010-02-28 19:46:19 UTC (rev 12044)
+++ packages/python-enable/trunk/debian/patches/freetype2.diff 2010-02-28 20:33:11 UTC (rev 12045)
@@ -1,20 +1,24 @@
-Index: python-enable-3.0.1/enthought/kiva/agg/setup.py
+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.0.1.orig/enthought/kiva/agg/setup.py 2008-09-27 00:07:39.000000000 -0400
-+++ python-enable-3.0.1/enthought/kiva/agg/setup.py 2008-09-27 00:11:45.000000000 -0400
-@@ -5,39 +5,6 @@
+--- 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 =['autohint/autohint.c',
+-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',
+- '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',
@@ -31,9 +35,29 @@
- ]
-
-freetype2_dirs = [
-- 'base','bdf','cache','cff','cid','pcf','pfr',
-- 'psaux','pshinter','psnames','raster','sfnt',
-- 'smooth','truetype','type1','type42','winfonts',
+- 'autofit',
+- 'base',
+- 'bdf',
+- 'cache',
+- 'cff',
+- 'cid',
+- 'gxvalid',
+- 'gzip',
+- 'lzw',
+- 'otvalid',
+- 'pcf',
+- 'pfr',
+- 'psaux',
+- 'pshinter',
+- 'psnames',
+- 'raster',
+- 'sfnt',
+- 'smooth',
+- 'tools',
+- 'truetype',
+- 'type1',
+- 'type42',
+- 'winfonts',
- 'gzip'
- ]
-
@@ -42,10 +66,12 @@
def configuration(parent_package='',top_path=None):
from numpy.distutils.misc_util import Configuration
from numpy.distutils.system_info import dict_append, get_info
-@@ -68,35 +35,10 @@
+@@ -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)
- #-------------------------------------------------------------------------
-
@@ -67,10 +93,18 @@
- config.add_library(freetype_lib,
- sources = [get_ft2_sources],
- include_dirs = ft2_incl_dirs,
-- depends = ['freetype2']
+-
+- # 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
#-------------------------------------------------------------------------
@@ -79,7 +113,7 @@
agg_sources = [agg_dir+'/src/*.cpp',
agg_dir+'/font_freetype/*.cpp']
config.add_library(agg_lib,
-@@ -110,7 +52,7 @@
+@@ -137,7 +50,7 @@
if sys.platform == 'darwin':
define_macros = [('__DARWIN__', None)]
macros = [('__DARWIN__', None)]
@@ -88,7 +122,7 @@
else:
define_macros = []
macros = []
-@@ -163,7 +105,7 @@
+@@ -191,7 +104,7 @@
build_info = {}
kiva_lib = 'kiva_src'
Modified: packages/python-enable/trunk/debian/rules
===================================================================
--- packages/python-enable/trunk/debian/rules 2010-02-28 19:46:19 UTC (rev 12044)
+++ packages/python-enable/trunk/debian/rules 2010-02-28 20:33:11 UTC (rev 12045)
@@ -4,10 +4,10 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
DEB_COMPRESS_EXCLUDE := .py
DEB_PYTHON_INSTALL_ARGS_ALL += --single-version-externally-managed
+DEB_INSTALL_CHANGELOGS_ALL += docs/CHANGES.txt
PYSHARED=$(DEB_DESTDIR)/`pycentral pycentraldir python-enable`
EXAMPLES=$(DEB_DESTDIR)/usr/share/doc/python-enable
@@ -19,6 +19,7 @@
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
Added: packages/python-enable/trunk/debian/source/format
===================================================================
--- packages/python-enable/trunk/debian/source/format (rev 0)
+++ packages/python-enable/trunk/debian/source/format 2010-02-28 20:33:11 UTC (rev 12045)
@@ -0,0 +1 @@
+3.0 (quilt)
Modified: packages/python-enable/trunk/debian/watch
===================================================================
--- packages/python-enable/trunk/debian/watch 2010-02-28 19:46:19 UTC (rev 12044)
+++ packages/python-enable/trunk/debian/watch 2010-02-28 20:33:11 UTC (rev 12045)
@@ -1,4 +1,4 @@
version=3
opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://pypi.python.org/packages/source/E/Enable/Enable-(.*).tar.gz \
+http://www.enthought.com/repo/ets/Enable-(.*).tar.gz \
debian debian/orig-tar.sh
More information about the Python-modules-commits
mailing list