[Python-modules-commits] r6733 - in packages/enthought-chaco2/trunk/debian (11 files)
varun at users.alioth.debian.org
varun at users.alioth.debian.org
Sun Oct 26 05:20:30 UTC 2008
Date: Sunday, October 26, 2008 @ 05:20:29
Author: varun
Revision: 6733
* New upstream release
* Rename the package to match upstream naming conventions
* Package split into many sub-packages
* debian/control: add python-traitsgui, python-enable to Depends
* Update debian/watch and debian/orig-tar.sh files
* Cleanup debian/rules file
Added:
packages/enthought-chaco2/trunk/debian/examples
(from rev 5949, packages/enthought-chaco2/trunk/debian/install)
Modified:
packages/enthought-chaco2/trunk/debian/changelog
packages/enthought-chaco2/trunk/debian/control
packages/enthought-chaco2/trunk/debian/copyright
packages/enthought-chaco2/trunk/debian/docs
packages/enthought-chaco2/trunk/debian/orig-tar.sh
packages/enthought-chaco2/trunk/debian/rules
packages/enthought-chaco2/trunk/debian/watch
Deleted:
packages/enthought-chaco2/trunk/debian/README.Debian-source
packages/enthought-chaco2/trunk/debian/install
packages/enthought-chaco2/trunk/debian/patches/
Deleted: packages/enthought-chaco2/trunk/debian/README.Debian-source
===================================================================
--- packages/enthought-chaco2/trunk/debian/README.Debian-source 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/README.Debian-source 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,22 +0,0 @@
-enthought-chaco2
-================
-
-The orig.tar.gz used for packaging enthought-traits has been created
-by merging source tarballs of the following enthought projects:
-
- enthought.chaco2-2.0.1b1.tar.gz
- enthought.enable2-2.0.1b1.tar.gz
- enthought.kiva-2.0.0b2.tar.gz
-
-All freetype2 sources in enthought.kiva/enthought/kiva/agg/freetype2
-have been removed to avoid duplicating sources as freetype 2 libraries
-are already available in libfreetype6 package.
-
-Files in enthought.kiva/enthought/kiva/agg/agg-24/gpc/* have been
-removed due to non-free license.
-
-Please use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
- -- Varun Hiremath <varun at debian.org>, Sat, 26 Jan 2008 00:58:10 +0530
Modified: packages/enthought-chaco2/trunk/debian/changelog
===================================================================
--- packages/enthought-chaco2/trunk/debian/changelog 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/changelog 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,3 +1,14 @@
+python-chaco (3.0.0-1) experimental; urgency=low
+
+ * New upstream release
+ * Rename the package to match upstream naming conventions
+ * Package split into many sub-packages
+ * debian/control: add python-traitsgui, python-enable to Depends
+ * Update debian/watch and debian/orig-tar.sh files
+ * Cleanup debian/rules file
+
+ -- Varun Hiremath <varun at debian.org> Sun, 26 Oct 2008 01:19:08 -0400
+
enthought-chaco2 (2.0.5-1) unstable; urgency=low
* New upstream release
Modified: packages/enthought-chaco2/trunk/debian/control
===================================================================
--- packages/enthought-chaco2/trunk/debian/control 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/control 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,22 +1,23 @@
-Source: enthought-chaco2
+Source: python-chaco
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, debhelper(>= 6), python-all-dev, python-central (>= 0.6),
- python-setuptools, python-numpy, swig, libfreetype6-dev, libx11-dev,
- quilt
+ python-setuptools, python-numpy
Standards-Version: 3.8.0
XS-Python-Version: >=2.4
-Homepage: http://code.enthought.com/chaco/
-Vcs-Svn: svn://svn.debian.org/python-modules/packages/enthought-chaco2/trunk
-Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/enthought-chaco2/trunk/?op=log
+Homepage: http://pypi.python.org/pypi/Chaco/
+Vcs-Svn: svn://svn.debian.org/python-modules/packages/python-chaco/trunk
+Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/python-chaco/trunk/?op=log
-Package: python-enthought-chaco2
+Package: python-chaco
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-numpy, python-enthought-traits-ui, python-wxgtk2.6,
+ python-numpy, python-traitsgui, python-enable, python-wxgtk2.8,
python-pkg-resources
+Conflicts: python-enthought-chaco2 (<< 3.0.0)
+Replaces: python-enthought-chaco2 (<< 3.0.0)
XB-Python-Version: ${python:Versions}
Description: interactive plotting application toolkit
Chaco is a Python plotting application toolkit and a part of
@@ -27,9 +28,10 @@
generates nice static plots for publication and presentation
purposes, its components are all designed to be work well for
interactive data visualization.
- .
- This package also includes Kiva and Enable packages from the
- Enthought Tool Suite which are multi-platform DisplayPDF drawing
- engines that support multiple output backends, including Windows,
- GTK+, and Macintosh native windowing systems, a variety of raster
- image formats, PDF, and Postscript.
+
+Package: python-enthought-chaco2
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-chaco
+Description: interactive plotting application toolkit (Transition package)
+ This is a dummy package to ease the transition to the new
+ python-chaco package. This package can be safely removed.
Modified: packages/enthought-chaco2/trunk/debian/copyright
===================================================================
--- packages/enthought-chaco2/trunk/debian/copyright 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/copyright 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,4 +1,4 @@
-Original source available at: http://code.enthought.com/enstaller/eggs/source/
+Original source available at: http://pypi.python.org/pypi/Chaco/
Upstream Author: Enthought, Inc <info at enthought.com>
@@ -10,14 +10,7 @@
The Debian packaging information is under the GPL, version 2.
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
+Copyright: © 2006, 2008 Enthought, Inc. <info at enthought.com>
License: other-BSD
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
@@ -41,110 +34,11 @@
ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- .
- .
- DISCLOSURE: Under the terms of the Matplotlib 0.83.2 License Agreement,
- Enthought must disclose where the Matplotlib source code has been used:
- * Chaco makes use of some code from Matplotlib for creating linear
- segmented colormaps. This code from Matplotlib has been incorporated
- directly into the Chaco LinearSegmentedColormap class and is marked
- with the tag #### matplotlib ####.
- * The "contour" module is also from the Matplotlib project.
- The above code is licensed under the terms of the Matplotlib license,
- 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
- matplotlib software in source or binary form and its associated
- documentation.
- .
- 2. Subject to the terms and conditions of this License Agreement, JDH
- hereby grants Licensee a nonexclusive, royalty-free, world-wide license
- to reproduce, analyze, test, perform and/or display publicly, prepare
- derivative works, distribute, and otherwise use matplotlib 0.83.2
- alone or in any derivative version, provided, however, that JDH's
- License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
- 2002-2004 John D. Hunter; All Rights Reserved" are retained in
- matplotlib 0.83.2 alone or in any derivative version prepared by
- Licensee.
- .
- 3. In the event Licensee prepares a derivative work that is based on or
- incorporates matplotlib 0.83.2 or any part thereof, and wants to
- make the derivative work available to others as provided herein, then
- Licensee hereby agrees to include in any such work a brief summary of
- the changes made to matplotlib 0.83.2.
- .
- 4. JDH is making matplotlib 0.83.2 available to Licensee on an "AS
- IS" basis. JDH MAKES NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR
- IMPLIED. BY WAY OF EXAMPLE, BUT NOT LIMITATION, JDH MAKES NO AND
- DISCLAIMS ANY REPRESENTATION OR WARRANTY OF MERCHANTABILITY OR FITNESS
- FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF MATPLOTLIB 0.83.2
- WILL NOT INFRINGE ANY THIRD PARTY RIGHTS.
- .
- 5. JDH SHALL NOT BE LIABLE TO LICENSEE OR ANY OTHER USERS OF MATPLOTLIB
- 0.83.2 FOR ANY INCIDENTAL, SPECIAL, OR CONSEQUENTIAL DAMAGES OR
- LOSS AS A RESULT OF MODIFYING, DISTRIBUTING, OR OTHERWISE USING
- MATPLOTLIB 0.83.2, OR ANY DERIVATIVE THEREOF, EVEN IF ADVISED OF
- THE POSSIBILITY THEREOF.
- .
- 6. This License Agreement will automatically terminate upon a material
- breach of its terms and conditions.
- .
- 7. Nothing in this License Agreement shall be deemed to create any
- relationship of agency, partnership, or joint venture between JDH and
- Licensee. This License Agreement does not grant permission to use JDH
- trademarks or trade name in a trademark sense to endorse or promote
- products or services of Licensee, or any third party.
- .
- 8. By copying, installing or otherwise using matplotlib 0.83.2,
- 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.
-
On Debian GNU/Linux systems, the complete text of the GNU General
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
Modified: packages/enthought-chaco2/trunk/debian/docs
===================================================================
--- packages/enthought-chaco2/trunk/debian/docs 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/docs 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,2 +1 @@
-enthought.chaco2/docs/*.pdf
-enthought.chaco2/docs/*.txt
+docs/*
Copied: packages/enthought-chaco2/trunk/debian/examples (from rev 5949, packages/enthought-chaco2/trunk/debian/install)
===================================================================
--- packages/enthought-chaco2/trunk/debian/examples (rev 0)
+++ packages/enthought-chaco2/trunk/debian/examples 2008-10-26 05:20:29 UTC (rev 6733)
@@ -0,0 +1 @@
+examples/*
Property changes on: packages/enthought-chaco2/trunk/debian/examples
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: packages/enthought-chaco2/trunk/debian/install
===================================================================
--- packages/enthought-chaco2/trunk/debian/install 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/install 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,3 +0,0 @@
-enthought.chaco2/examples/* /usr/share/doc/python-enthought-chaco2/examples/chaco2/
-enthought.enable2/examples/* /usr/share/doc/python-enthought-chaco2/examples/enable2/
-enthought.kiva/examples/* /usr/share/doc/python-enthought-chaco2/examples/kiva/
Modified: packages/enthought-chaco2/trunk/debian/orig-tar.sh
===================================================================
--- packages/enthought-chaco2/trunk/debian/orig-tar.sh 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/orig-tar.sh 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,44 +1,8 @@
#!/bin/sh -e
-# $1 version
-TAR=../enthought-chaco2_$1.orig.tar.gz
-DIR=enthought-chaco2_$1.orig
-
-# package list
-PACKAGE_LIST="
-enthought.chaco2-2.0.5.tar.gz
-enthought.enable-1.9.4.tar.gz
-enthought.enable2-2.0.5.tar.gz
-enthought.kiva-2.0.4.tar.gz
-"
-
-# download the tarballs
-REPO=http://code.enthought.com/enstaller/eggs/source/
-mkdir $DIR
-(cd $DIR; \
-for package in $PACKAGE_LIST
-do
- wget $REPO/$package;
- name=`echo $package | sed -e 's/-.*//'`;
- dir=`echo $package | sed -e 's/\.tar.*//'`;
- tar zxf $package;
- mv $dir $name;
- rm $package;
-done )
-
-# remove freetype2 source from enthought.kiva
-(cd $DIR; rm -rf enthought.kiva/enthought/kiva/agg/freetype2)
-
-# remove non-free gpc sources
-(cd $DIR; rm -rf enthought.kiva/enthought/kiva/agg/agg-24/gpc)
-
-# create the tarball
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-
# move to directory 'tarballs'
if [ -r .svn/deb-layout ]; then
. .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
+ mv $3 $origDir
+ echo "moved $3 to $origDir"
fi
Modified: packages/enthought-chaco2/trunk/debian/rules
===================================================================
--- packages/enthought-chaco2/trunk/debian/rules 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/rules 2008-10-26 05:20:29 UTC (rev 6733)
@@ -4,37 +4,19 @@
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_DESTDIR = $(CURDIR)/debian/python-chaco
+PYSHARED = $(DEB_DESTDIR)`pycentral pycentraldir python-chaco`
+EXAMPLES = $(DEB_DESTDIR)/usr/share/doc/python-chaco
-SITE_PACKAGES=$(DEB_DESTDIR)`pycentral pycentraldir python-enthought-chaco2`
-EXAMPLES=$(DEB_DESTDIR)/usr/share/doc/python-enthought-chaco2/examples
+install/python-chaco::
+ find $(DEB_DESTDIR) -name 'LICENSE' -delete
-clean::
- find -type d | grep build$ | xargs $(RM) -r
- $(RM) debian/python-build-stamp-*
+binary-predeb/python-chaco::
+ find $(PYSHARED) -type f -print0 | xargs -0 chmod 644
+ find $(EXAMPLES) -type f -print0 | xargs -0 chmod 644
-python-build-stamp-%:
- for file in $(CURDIR)/*/setup.py; do \
- DIR=`dirname $$file`; \
- cd $$DIR && python$* setup.py build; \
- done;
- touch $@
-
-python-install-%:
- for file in $(CURDIR)/*/setup.py; do \
- DIR=`dirname $$file`; \
- cd $$DIR && python$* setup.py install --root $(DEB_DESTDIR); \
- done;
- find $(CURDIR)/debian/python-enthought-chaco2 -name 'LICENSE*' -delete
-
-binary-predeb/python-enthought-chaco2::
- find $(SITE_PACKAGES) -type f | xargs sed -i '/^#!/d'
- find $(SITE_PACKAGES) -type f | xargs chmod 644
- find $(EXAMPLES) -type f | xargs sed -i '/^#!/d'
- find $(EXAMPLES) -type f | xargs chmod 644
-
get-orig-source:
- sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)
+ -uscan --upstream-version 0 --rename
Modified: packages/enthought-chaco2/trunk/debian/watch
===================================================================
--- packages/enthought-chaco2/trunk/debian/watch 2008-10-26 04:56:45 UTC (rev 6732)
+++ packages/enthought-chaco2/trunk/debian/watch 2008-10-26 05:20:29 UTC (rev 6733)
@@ -1,2 +1,4 @@
version=3
-http://code.enthought.com/enstaller/eggs/source/enthought.chaco2-(.*)\.tar\.gz
+opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
+http://pypi.python.org/packages/source/C/Chaco/Chaco-(.*).tar.gz \
+debian debian/orig-tar.sh
More information about the Python-modules-commits
mailing list