[Python-modules-commits] r9454 - in packages/scitools/trunk/debian (8 files)
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Tue Aug 25 11:21:11 UTC 2009
Date: Tuesday, August 25, 2009 @ 11:21:10
Author: johannr-guest
Revision: 9454
Switch to pysupport, remove pycompat, remove build-dep on python-numpy and python-gnuplot (added patch).
Added:
packages/scitools/trunk/debian/patches/
packages/scitools/trunk/debian/patches/scitools_init.patch
packages/scitools/trunk/debian/pyversions
Modified:
packages/scitools/trunk/debian/compat
packages/scitools/trunk/debian/control
packages/scitools/trunk/debian/copyright
packages/scitools/trunk/debian/rules
Deleted:
packages/scitools/trunk/debian/pycompat
Modified: packages/scitools/trunk/debian/compat
===================================================================
--- packages/scitools/trunk/debian/compat 2009-08-25 09:41:00 UTC (rev 9453)
+++ packages/scitools/trunk/debian/compat 2009-08-25 11:21:10 UTC (rev 9454)
@@ -1 +1 @@
-5
+7
Modified: packages/scitools/trunk/debian/control
===================================================================
--- packages/scitools/trunk/debian/control 2009-08-25 09:41:00 UTC (rev 9453)
+++ packages/scitools/trunk/debian/control 2009-08-25 11:21:10 UTC (rev 9454)
@@ -3,9 +3,8 @@
Priority: extra
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Johannes Ring <johannr at simula.no>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 5), python-all, python-central (>= 0.6.0), python-numpy, python-gnuplot
+Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-dev, python-support
Standards-Version: 3.8.2
-XS-Python-Version: >= 2.5
Vcs-Svn: svn://svn.debian.org/python-modules/packages/scitools/trunk
Vcs-Browser: http://svn.debian.org/viewsvn/python-modules/packages/scitools/trunk/
Homepage: http://scitools.googlecode.com
@@ -15,7 +14,8 @@
XB-Python-Version: ${python:Versions}
Depends: python-numpy, python-gnuplot, ${python:Depends}, ${misc:Depends}
Recommends: python-scipy, python-scientific, imagemagick
-Suggests: python-matplotlib, python-vtk, python-pyx, python-pmw, blt, python-tk, netpbm, ffmpeg, mencoder, python-numeric, python-numarray
+Suggests: python-matplotlib, python-vtk, python-pyx, python-pmw, blt,
+ python-tk, netpbm, ffmpeg, mencoder, python-numeric, python-numarray
Description: Python library for scientific computing
SciTools is a Python package containing lots of useful tools for scientific
computing in Python. The package is built on top of other widely used
Modified: packages/scitools/trunk/debian/copyright
===================================================================
--- packages/scitools/trunk/debian/copyright 2009-08-25 09:41:00 UTC (rev 9453)
+++ packages/scitools/trunk/debian/copyright 2009-08-25 11:21:10 UTC (rev 9454)
@@ -12,7 +12,7 @@
Copyright:
- Copyright (C) 2007-2009 Hans Petter Langtangen <hpl at simula.no> and Simula
+ Copyright © 2007-2009 Hans Petter Langtangen <hpl at simula.no> and Simula
Research Laboratory.
License:
@@ -35,8 +35,9 @@
On Debian systems, the complete text of the BSD License can be
found in `/usr/share/common-licenses/BSD'.
-The Debian packaging is (C) 2008, Johannes Ring <johannr at simula.no> and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian packaging is © 2008-2009, Johannes Ring <johannr at simula.no> and
+is licensed under the GPL version 2 or later, see
+`/usr/share/common-licenses/GPL-2'.
Files or directories which have a different copyright/license attached:
Added: packages/scitools/trunk/debian/patches/scitools_init.patch
===================================================================
--- packages/scitools/trunk/debian/patches/scitools_init.patch (rev 0)
+++ packages/scitools/trunk/debian/patches/scitools_init.patch 2009-08-25 11:21:10 UTC (rev 9454)
@@ -0,0 +1,40 @@
+This removes the dependency on NumPy and Gnuplot.py when running setup.py.
+
+diff -Nru scitools-0.6.orig/lib/scitools/__init__.py scitools-0.6/lib/scitools/__init__.py
+--- scitools-0.6.orig/lib/scitools/__init__.py 2009-08-25 11:30:19.000000000 +0200
++++ scitools-0.6/lib/scitools/__init__.py 2009-08-25 11:31:29.000000000 +0200
+@@ -63,18 +63,21 @@
+ 'Allen B. Downey', 'Imri Goldberg', \
+ 'Fred L. Drake', 'Gael Varoquaux',
+
+-# for backward compatibility:
+-import sys, std
+-sys.modules['scitools.all'] = std
+ try:
+- import TkGUI
+- sys.modules['scitools.CanvasCoords'] = TkGUI
+- sys.modules['scitools.DrawFunction'] = TkGUI
+- sys.modules['scitools.FuncDependenceViz'] = TkGUI
+- sys.modules['scitools.FunctionSelector'] = TkGUI
+- sys.modules['scitools.ParameterInterface'] = TkGUI
+- del TkGUI
+-except:
+- pass # Pmw and other graphics might be missing - this is not crucial
++ # for backward compatibility:
++ import sys, std
++ sys.modules['scitools.all'] = std
++ try:
++ import TkGUI
++ sys.modules['scitools.CanvasCoords'] = TkGUI
++ sys.modules['scitools.DrawFunction'] = TkGUI
++ sys.modules['scitools.FuncDependenceViz'] = TkGUI
++ sys.modules['scitools.FunctionSelector'] = TkGUI
++ sys.modules['scitools.ParameterInterface'] = TkGUI
++ del TkGUI
++ except:
++ pass # Pmw and other graphics might be missing - this is not crucial
+
+-del std, sys
++ del std, sys
++except:
++ pass
Deleted: packages/scitools/trunk/debian/pycompat
===================================================================
--- packages/scitools/trunk/debian/pycompat 2009-08-25 09:41:00 UTC (rev 9453)
+++ packages/scitools/trunk/debian/pycompat 2009-08-25 11:21:10 UTC (rev 9454)
@@ -1 +0,0 @@
-2
Added: packages/scitools/trunk/debian/pyversions
===================================================================
--- packages/scitools/trunk/debian/pyversions (rev 0)
+++ packages/scitools/trunk/debian/pyversions 2009-08-25 11:21:10 UTC (rev 9454)
@@ -0,0 +1 @@
+2.5-
Modified: packages/scitools/trunk/debian/rules
===================================================================
--- packages/scitools/trunk/debian/rules 2009-08-25 09:41:00 UTC (rev 9453)
+++ packages/scitools/trunk/debian/rules 2009-08-25 11:21:10 UTC (rev 9454)
@@ -1,9 +1,10 @@
#!/usr/bin/make -f
-DEB_PYTHON_SYSTEM = pycentral
+DEB_PYTHON_SYSTEM = pysupport
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_COMPRESS_EXCLUDE := .py
More information about the Python-modules-commits
mailing list