[Python-apps-commits] r3171 - in packages/mayavi2/trunk/debian (8 files)

varun at users.alioth.debian.org varun at users.alioth.debian.org
Wed Jun 24 09:49:09 UTC 2009 

    Date: Wednesday, June 24, 2009 @ 09:49:02
  Author: varun
Revision: 3171

* debian/rules: Reset PYTHONPATH as a temporary fix for bug in
  python-vtk #529961, which fixes FTBFS (Closes: #533946)
* Add patches/manpage.diff to fix a lintian warning
* Add patches/wxversion.diff to set the default wx version to 2.8 
  (Closes: #478870)

Added:
  packages/mayavi2/trunk/debian/patches/
  packages/mayavi2/trunk/debian/patches/manpage.diff
  packages/mayavi2/trunk/debian/patches/series
  packages/mayavi2/trunk/debian/patches/wxversion.diff
Modified:
  packages/mayavi2/trunk/debian/changelog
  packages/mayavi2/trunk/debian/control
  packages/mayavi2/trunk/debian/copyright
  packages/mayavi2/trunk/debian/rules

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2009-06-23 22:39:08 UTC (rev 3170)
+++ packages/mayavi2/trunk/debian/changelog	2009-06-24 09:49:02 UTC (rev 3171)
@@ -1,4 +1,4 @@
-mayavi2 (3.2.0-2) UNRELEASED; urgency=low
+mayavi2 (3.2.0-2) unstable; urgency=low
 
   [ Marco Rodrigues ]
   * Bump Standards-Version to 3.8.1 (no changes).
@@ -7,8 +7,15 @@
     + Remove version check in python-vtk at Depends.
   * Remove myself from Uploaders.
 
- -- Marco Rodrigues <gothicx at sapo.pt>  Sun, 31 May 2009 11:56:42 +0100
+  [ Varun Hiremath ]
+  * debian/rules: Reset PYTHONPATH as a temporary fix for bug in
+    python-vtk #529961, which fixes FTBFS (Closes: #533946)
+  * Add patches/manpage.diff to fix a lintian warning
+  * Add patches/wxversion.diff to set the default wx version to 2.8 
+    (Closes: #478870)
 
+ -- Varun Hiremath <varun at debian.org>  Wed, 24 Jun 2009 05:43:17 -0400
+
 mayavi2 (3.2.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control	2009-06-23 22:39:08 UTC (rev 3170)
+++ packages/mayavi2/trunk/debian/control	2009-06-24 09:49:02 UTC (rev 3171)
@@ -2,10 +2,10 @@
 Section: science
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
-Uploaders: Ondrej Certik <ondrej at certik.cz>, Marco Rodrigues <gothicx at sapo.pt>, Varun Hiremath <varun at debian.org>
+Uploaders: Ondrej Certik <ondrej at certik.cz>, Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 6), python-all-dev, python-central (>= 0.6.0),
- python-setuptools, python-setupdocs, python-vtk, python-numpy
-Standards-Version: 3.8.1
+ python-setuptools, python-setupdocs, python-vtk, python-numpy, quilt
+Standards-Version: 3.8.2
 XS-Python-Version: current
 Homepage: http://code.enthought.com/projects/mayavi/
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/mayavi2/trunk

Modified: packages/mayavi2/trunk/debian/copyright
===================================================================
--- packages/mayavi2/trunk/debian/copyright	2009-06-23 22:39:08 UTC (rev 3170)
+++ packages/mayavi2/trunk/debian/copyright	2009-06-24 09:49:02 UTC (rev 3171)
@@ -5,7 +5,7 @@
 
 Upstream Author: Enthought, Inc <info at enthought.com>
 
-Copyright: (c) 2006, Enthought, Inc. <info at enthought.com>
+Copyright: © 2006, Enthought, Inc. <info at enthought.com>
 
 License:
     Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,7 @@
     to reproduce, analyze, test, perform and/or display publicly, prepare
     derivative works, distribute, and otherwise use matplotlib 0.91.2svn
     alone or in any derivative version, provided, however, that JDH's
-    License Agreement and JDH's notice of copyright, i.e., "Copyright (c)
+    License Agreement and JDH's notice of copyright, i.e., "Copyright ©
     2002-2004 John D. Hunter; All Rights Reserved" are retained in
     matplotlib 0.91.2svn alone or in any derivative version prepared by
     Licensee.
@@ -100,7 +100,7 @@
     
     Version 1.1
     
-    Copyright (c) 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania 
+    Copyright © 2002 Cynthia Brewer, Mark Harrower, and The Pennsylvania 
     State University. All rights reserved. Redistribution and use in source 
     and binary forms, with or without modification, are permitted provided 
     that the following conditions are met:
@@ -141,7 +141,7 @@
 # evolution of the GIST package, both by David H. Munro. They are
 # released under a BSD-like license:
 
-Copyright: (c) 1996 The Regents of the University of California.
+Copyright: © 1996 The Regents of the University of California.
 	       	    All rights reserved.
 
 License: BSD-style license for gist/yorick colormaps.
@@ -204,7 +204,7 @@
 released under a 3 clause BSD license.
 
 On Debian systems, the complete text of the LGPL License can be 
-found in `/usr/share/common-licenses/LGPL'.
+found in `/usr/share/common-licenses/LGPL-2'.
 
 On Debian systems, the complete text of the BSD License can be 
 found in `/usr/share/common-licenses/BSD'.
@@ -426,6 +426,6 @@
     a jury trial in any resulting litigation.
 ---------------------------------------------------------------------------
 
-The Debian packaging is (C) 2007, Ondrej Certik <ondrej at certik.cz>,
+The Debian packaging is © 2007, Ondrej Certik <ondrej at certik.cz>,
 Varun Hiremath <varun at debian.org> and is licensed under the GPL, see
-`/usr/share/common-licenses/GPL'.
+`/usr/share/common-licenses/GPL-3'.

Added: packages/mayavi2/trunk/debian/patches/manpage.diff
===================================================================
--- packages/mayavi2/trunk/debian/patches/manpage.diff	                        (rev 0)
+++ packages/mayavi2/trunk/debian/patches/manpage.diff	2009-06-24 09:49:02 UTC (rev 3171)
@@ -0,0 +1,15 @@
+Author: Varun Hiremath <vh63 at cornell.edu>
+Description: Fix lintian warning hyphen-used-as-minus-sign
+Index: mayavi2-3.2.0/docs/mayavi2.man
+===================================================================
+--- mayavi2-3.2.0.orig/docs/mayavi2.man	2009-06-24 05:27:50.000000000 -0400
++++ mayavi2-3.2.0/docs/mayavi2.man	2009-06-24 05:28:18.000000000 -0400
+@@ -166,7 +166,7 @@
+ 
+ Execute the expression on the last created object\&.  For example, if
+ the previous object was a module, and we want to set the color of that
+-object one can do -s "actor\&.property\&.color = (1,0,0)".  One should
++object one can do \-s "actor\&.property\&.color = (1,0,0)".  One should
+ use quotes for the expression. Also available with \fB\-\-set\fP\&.  For
+ example: 
+ 

Added: packages/mayavi2/trunk/debian/patches/series
===================================================================
--- packages/mayavi2/trunk/debian/patches/series	                        (rev 0)
+++ packages/mayavi2/trunk/debian/patches/series	2009-06-24 09:49:02 UTC (rev 3171)
@@ -0,0 +1,2 @@
+manpage.diff
+wxversion.diff

Added: packages/mayavi2/trunk/debian/patches/wxversion.diff
===================================================================
--- packages/mayavi2/trunk/debian/patches/wxversion.diff	                        (rev 0)
+++ packages/mayavi2/trunk/debian/patches/wxversion.diff	2009-06-24 09:49:02 UTC (rev 3171)
@@ -0,0 +1,17 @@
+Author: Varun Hiremath <vh63 at cornell.edu>
+Description: Set default version of wx to 2.8
+Index: mayavi2-3.2.0/enthought/mayavi/scripts/mayavi2.py
+===================================================================
+--- mayavi2-3.2.0.orig/enthought/mayavi/scripts/mayavi2.py	2009-06-24 05:29:24.000000000 -0400
++++ mayavi2-3.2.0/enthought/mayavi/scripts/mayavi2.py	2009-06-24 05:32:44.000000000 -0400
+@@ -21,6 +21,10 @@
+ import logging
+ from os.path import splitext, exists, join, abspath
+ 
++# Set wx version to 2.8
++import wxversion
++wxversion.select('2.8')
++
+ # Local imports.
+ from enthought.mayavi.__version__ import __version__
+ from enthought.mayavi.scripts.util import get_data_dir

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2009-06-23 22:39:08 UTC (rev 3170)
+++ packages/mayavi2/trunk/debian/rules	2009-06-24 09:49:02 UTC (rev 3171)
@@ -1,13 +1,16 @@
 #!/usr/bin/make -f
 
 DEB_PYTHON_SYSTEM=pycentral
+export PYTHONPATH=$PYTHONPATH:/usr/lib/python-support/python-vtk/python2.5/vtk
 
 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 .vtu .vti .vtk .wrl .js
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
 PYSHARED			 = $(DEB_DESTDIR)`pycentral pycentraldir mayavi2`
+JQUERY				 = /usr/share/javascript/jquery/jquery.js
 
 install/mayavi2::
 	find $(DEB_DESTDIR) -name 'image_LICENSE.txt' -delete
@@ -18,11 +21,12 @@
 
 binary-predeb/mayavi2::
 	$(RM) $(DEB_DESTDIR)usr/share/doc/mayavi2/docs/mayavi/mayavi2.man*
-	dh_link /usr/share/javascript/jquery/jquery.js `pycentral pycentraldir mayavi2`/enthought/mayavi/html/_static/jquery.js
-	dh_link /usr/share/javascript/jquery/jquery.js `pycentral pycentraldir mayavi2`/enthought/tvtk/html/_static/jquery.js
-	dh_link /usr/share/javascript/jquery/jquery.js `pycentral pycentraldir mayavi2`/enthought/docs/html/mayavi/_static/jquery.js
-	dh_link /usr/share/javascript/jquery/jquery.js `pycentral pycentraldir mayavi2`/enthought/docs/html/tvtk/_static/jquery.js
+	dh_link $(JQUERY) `pycentral pycentraldir mayavi2`/enthought/mayavi/html/_static/jquery.js
+	dh_link $(JQUERY) `pycentral pycentraldir mayavi2`/enthought/tvtk/html/_static/jquery.js
+	dh_link $(JQUERY) `pycentral pycentraldir mayavi2`/enthought/docs/html/mayavi/_static/jquery.js
+	dh_link $(JQUERY) `pycentral pycentraldir mayavi2`/enthought/docs/html/tvtk/_static/jquery.js
 	chmod +x $(PYSHARED)/enthought/mayavi/scripts/mayavi2.py
+	chmod -x $(PYSHARED)/enthought/mayavi/tests/data/cellsnd.ascii.inp
 	dh_link `pycentral pycentraldir mayavi2`/enthought/mayavi/scripts/mayavi2.py /usr/bin/mayavi2
 
 get-orig-source:

More information about the Python-apps-commits mailing list