[Python-modules-commits] r4397 - in packages/enthought-chaco2/trunk/debian (8 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Sun Jan 20 07:54:20 UTC 2008
Date: Sunday, January 20, 2008 @ 07:54:20
Author: varun
Revision: 4397
* Remove freetype2 sources from orig tarball, and add
patches/freetype2.diff to build enthought.kiva using the existing
freetype2 library in Debian
* Update debian/copyright file
Added:
packages/enthought-chaco2/trunk/debian/patches/
packages/enthought-chaco2/trunk/debian/patches/freetype2.diff
packages/enthought-chaco2/trunk/debian/patches/series
Modified:
packages/enthought-chaco2/trunk/debian/changelog
packages/enthought-chaco2/trunk/debian/control
packages/enthought-chaco2/trunk/debian/copyright
packages/enthought-chaco2/trunk/debian/orig-tar.sh
packages/enthought-chaco2/trunk/debian/rules
Modified: packages/enthought-chaco2/trunk/debian/changelog
===================================================================
--- packages/enthought-chaco2/trunk/debian/changelog 2008-01-20 07:47:16 UTC (rev 4396)
+++ packages/enthought-chaco2/trunk/debian/changelog 2008-01-20 07:54:20 UTC (rev 4397)
@@ -5,6 +5,10 @@
* Add debian/orig-tar.sh to create orig.tar.gz
* Merge enable2 and kive into chaco2
* Install examples and docs
+ * Remove freetype2 sources from orig tarball, and add
+ patches/freetype2.diff to build enthought.kiva using the existing
+ freetype2 library in Debian
+ * Update debian/copyright file
[ Kumar Appaiah ]
* debian/control:
@@ -18,4 +22,4 @@
- removed /svn/ from Vcs-Svn
- added op=log to Vcs-Browser
- -- Sandro Tosi <matrixhasu at gmail.com> Wed, 02 Jan 2008 16:27:05 +0100
+ -- Varun Hiremath <varun at debian.org> Sun, 20 Jan 2008 12:42:57 +0530
Modified: packages/enthought-chaco2/trunk/debian/control
===================================================================
--- packages/enthought-chaco2/trunk/debian/control 2008-01-20 07:47:16 UTC (rev 4396)
+++ packages/enthought-chaco2/trunk/debian/control 2008-01-20 07:54:20 UTC (rev 4397)
@@ -2,8 +2,9 @@
Section: python
Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
-Uploaders: Varun Hiremath <varunhiremath at gmail.com>
-Build-Depends: cdbs, debhelper(>= 5), python-all-dev, python-support, python-setuptools
+Uploaders: Varun Hiremath <varun at debian.org>
+Build-Depends: cdbs, debhelper(>= 5), python-all-dev, python-support,
+ python-setuptools, libfreetype6-dev, quilt
Standards-Version: 3.7.3
Homepage: http://code.enthought.com/chaco/
Vcs-Svn: svn://svn.debian.org/python-modules/packages/enthought-chaco2/trunk
@@ -11,7 +12,8 @@
Package: python-enthought-chaco2
Architecture: any
-Depends: ${python:Depends}, python-numpy, python-enthought-traits-ui
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+ python-numpy, python-enthought-traits-ui
XB-Python-Version: ${python:Versions}
Description: interactive plotting application toolkit
Chaco is a Python plot application toolkit. It is meant to facilitate
Modified: packages/enthought-chaco2/trunk/debian/copyright
===================================================================
--- packages/enthought-chaco2/trunk/debian/copyright 2008-01-20 07:47:16 UTC (rev 4396)
+++ packages/enthought-chaco2/trunk/debian/copyright 2008-01-20 07:54:20 UTC (rev 4397)
@@ -5,12 +5,19 @@
Copyright: © 2006, Enthought, Inc. <info at enthought.com>
Files: debian/*
-Copyright: © 2007, Varun Hiremath <varunhiremath at gmail.com>
+Copyright: © 2007, Varun Hiremath <varun at debian.org>
License: GPL-2+
The Debian packaging information is under the GPL, version 2.
-Files chaco2/*
+Files: *
Copyright: © 2006, 2007 Enthought, Inc. <info at enthought.com>
+ © 2002-2005 John D. Hunter
+ © 2004, 2005 Paul Barrett
+ © 1998 Just van Rossum <just at letterror.com>
+ © 2002 Space Telescope Science Institute
+ © 2001 ReportLab Inc.
+ © ActiveState
+ © 1991-1995 Stichting Mathematisch Centrum, Amsterdam
License: other-BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -47,7 +54,7 @@
reproduced below:
.
LICENSE AGREEMENT FOR MATPLOTLIB 0.83.2
- --------------------------------------
+ ---------------------------------------
.
1. This LICENSE AGREEMENT is between the John D. Hunter ("JDH"), and the
Individual or Organization ("Licensee") accessing and otherwise using
@@ -96,5 +103,65 @@
Licensee agrees to be bound by the terms and conditions of this License
Agreement.
+Files: enthought.chaco2/docs/scipy_tutorial/Scripts/shCore.uncompressed.js
+Copyright: © 2004 Alex Gorbatchev
+License: LGPL-2.1+
+
+Files: enthought.kiva/enthought/kiva/agg/*
+Copyright: © 2002-2005 Maxim Shemanarev (McSeem)
+ © 2005 Tony Juricic (tonygeek at yahoo.com)
+License: other-BSD | other
+ The Anti-Grain Geometry Project
+ A high quality rendering engine for C++
+ http://antigrain.com
+
+ Anti-Grain Geometry has dual licensing model.
+
+ Note that the Modified BSD license DOES NOT restrict your rights
+ if you choose the Anti-Grain Geometry Public License.
+
+ Anti-Grain Geometry Public License
+ ====================================================
+ Permission to copy, use, modify, sell and distribute this software
+ is granted provided this copyright notice appears in all copies.
+ This software is provided "as is" without express or implied
+ warranty, and with no claim as to its suitability for any purpose.
+
+ Modified BSD License
+ ====================================================
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ 3. The name of the author may not be used to endorse or promote
+ products derived from this software without specific prior
+ written permission.
+
+Files: enthought.kiva/enthought/kiva/agg/agg-24/gpc/*
+Copyright: © 1997-1999, Advanced Interfaces Group, University of Manchester.
+License: other
+ This software is free for non-commercial use. It may be copied,
+ modified, and redistributed provided that this copyright notice is
+ preserved on all copies. The intellectual property rights of the
+ algorithms used reside with the University of Manchester Advanced
+ Interfaces Group.
+
+ You may not use this software, in whole or in part, in support of
+ any commercial product without the express consent of the author.
+
+ There is no warranty or other guarantee of fitness of this software
+ for any purpose. It is provided solely "as is".
+
On Debian GNU/Linux systems, the complete text of the GNU General
-Public License 2 can be found in `/usr/share/common-licenses/GPL-2'
+Public License can be found in `/usr/share/common-licenses/GPL', the
+complete text of the GNU Lesser General Public License can be found in
+`/usr/share/common-licenses/LGPL', and the complete text of the BSD
+License can be found in `/usr/share/common-licenses/BSD'
Modified: packages/enthought-chaco2/trunk/debian/orig-tar.sh
===================================================================
--- packages/enthought-chaco2/trunk/debian/orig-tar.sh 2008-01-20 07:47:16 UTC (rev 4396)
+++ packages/enthought-chaco2/trunk/debian/orig-tar.sh 2008-01-20 07:54:20 UTC (rev 4397)
@@ -25,6 +25,9 @@
rm $package;
done )
+# remove freetype2 source from enthought.kiva
+(cd $DIR; rm -rf enthought.kiva/enthought/kiva/agg/freetype2)
+
# create the tarball
GZIP=--best tar -c -z -f $TAR $DIR
rm -rf $DIR
Added: packages/enthought-chaco2/trunk/debian/patches/freetype2.diff
===================================================================
--- packages/enthought-chaco2/trunk/debian/patches/freetype2.diff (rev 0)
+++ packages/enthought-chaco2/trunk/debian/patches/freetype2.diff 2008-01-20 07:54:20 UTC (rev 4397)
@@ -0,0 +1,101 @@
+diff -urN enthought-chaco2_2.0.1b1.orig/enthought.kiva/enthought/kiva/agg/setup.py enthought-chaco2_2.0.1b1/enthought.kiva/enthought/kiva/agg/setup.py
+--- enthought-chaco2_2.0.1b1.orig/enthought.kiva/enthought/kiva/agg/setup.py 2007-10-25 10:58:45.000000000 +0530
++++ enthought-chaco2_2.0.1b1/enthought.kiva/enthought/kiva/agg/setup.py 2008-01-20 12:29:08.000000000 +0530
+@@ -3,41 +3,6 @@
+ import os
+ import os.path
+
+-
+-
+-
+-
+-freetype2_sources =['autohint/autohint.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',
+- '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 = [
+- 'base','bdf','cache','cff','cid','pcf','pfr',
+- 'psaux','pshinter','psnames','raster','sfnt',
+- 'smooth','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
+@@ -62,31 +27,7 @@
+ plat = 'x11' # use with gtk2, it's slow but reliable
+ #plat = 'gdkpixbuf2'
+
+- # freetype2_src library:
+- prefix = config.paths('freetype2/src')[0]
+-
+- 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('freetype2_src',
+- sources = [get_ft2_sources],
+- include_dirs = ft2_incl_dirs,
+- depends = ['freetype2']
+- )
+-
+-
+- agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ft2_incl_dirs
+- freetype_lib = 'freetype2_src'
+-
++ agg_include_dirs = [agg_dir+'/include',agg_dir+'/font_freetype'] + ["/usr/include/freetype2/"]
+
+ agg_sources = [agg_dir+'/src/*.cpp',
+ agg_dir+'/font_freetype/*.cpp']
+@@ -103,7 +44,7 @@
+
+ if sys.platform == 'darwin':
+ define_macros = [('__DARWIN__', None)]
+- extra_link_args = ['-framework', 'Carbon']
++ extra_link_args = ['-framework', 'Carbon', '-Wl,-search_paths_first']
+ else:
+ define_macros = []
+ extra_link_args = []
+@@ -115,11 +56,11 @@
+ # XXX: test whether numpy has weakref support
+
+ build_info = {}
+-
++
+ dict_append(build_info,
+ sources = ['agg.i'],
+ include_dirs = kiva_include_dirs,
+- libraries = ['kiva_src', agg_lib, freetype_lib],
++ libraries = ['kiva_src', agg_lib, "freetype"],
+ depends = ['src/*.[ih]'],
+ extra_compile_args = extra_compile_args,
+ extra_link_args = extra_link_args,
Added: packages/enthought-chaco2/trunk/debian/patches/series
===================================================================
--- packages/enthought-chaco2/trunk/debian/patches/series (rev 0)
+++ packages/enthought-chaco2/trunk/debian/patches/series 2008-01-20 07:54:20 UTC (rev 4397)
@@ -0,0 +1 @@
+freetype2.diff
Modified: packages/enthought-chaco2/trunk/debian/rules
===================================================================
--- packages/enthought-chaco2/trunk/debian/rules 2008-01-20 07:47:16 UTC (rev 4396)
+++ packages/enthought-chaco2/trunk/debian/rules 2008-01-20 07:54:20 UTC (rev 4397)
@@ -4,6 +4,7 @@
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
@@ -35,6 +36,5 @@
find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'
find $(EXAMPLES) -type f | xargs chmod 644
-.PHONY: get-orig-source
get-orig-source:
sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
More information about the Python-modules-commits
mailing list