[Python-apps-commits] r4694 - in packages/mayavi2/trunk/debian (9 files)

Sat Feb 6 06:06:39 UTC 2010

Date: Saturday, February 6, 2010 @ 06:06:15
  Author: varun
Revision: 4694

* debian/control:
  - Depends: replace libvtk5.2 with libvtk5.4 (Closes: #568471)
  - Bump Standards-Version to 3.8.4
* debian/patches:
  - Remove wxversion.diff -- merged upstream
* Switch to source format 3.0 (quilt)
  - Add source/format file
* debian/rules:
  - Remove references to quilt, not needed anymore
  - Remove PYTHONPATH, python-vtk bug #529961 fixed now

Added:
  packages/mayavi2/trunk/debian/source/
  packages/mayavi2/trunk/debian/source/format
Modified:
  packages/mayavi2/trunk/debian/changelog
  packages/mayavi2/trunk/debian/compat
  packages/mayavi2/trunk/debian/control
  packages/mayavi2/trunk/debian/patches/series
  packages/mayavi2/trunk/debian/rules
Deleted:
  packages/mayavi2/trunk/debian/README.source
  packages/mayavi2/trunk/debian/patches/wxversion.diff

Deleted: packages/mayavi2/trunk/debian/README.source
===================================================================

--- packages/mayavi2/trunk/debian/README.source	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/README.source	2010-02-06 06:06:15 UTC (rev 4694)
@@ -1,8 +0,0 @@
-This package uses quilt to manage all modifications to the upstream
-source.  Changes are stored in the source package as diffs in
-debian/patches and applied during the build.  Please see:
-
-    /usr/share/doc/quilt/README.source
-
-for more information on how to apply the patches, modify patches, or
-remove a patch.

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/changelog	2010-02-06 06:06:15 UTC (rev 4694)
@@ -1,19 +1,28 @@
-mayavi2 (3.3.0-2) UNRELEASED; urgency=low
+mayavi2 (3.3.0-2) unstable; urgency=low
 
   [ Sandro Tosi ]
   * debian/control
     - removed Ondrej from Uploaders: thanks for your work!
 
-  [ Ryan Kavanagh ]
-  * Added a README.source, as required by Debian Policy Manual section 4.14
+  [ Varun Hiremath ]
+  * debian/control:
+    - Depends: replace libvtk5.2 with libvtk5.4 (Closes: #568471)
+    - Bump Standards-Version to 3.8.4
+  * debian/patches:
+    - Remove wxversion.diff -- merged upstream
+  * Switch to source format 3.0 (quilt)
+    - Add source/format file
+  * debian/rules:
+    - Remove references to quilt, not needed anymore
+    - Remove PYTHONPATH, python-vtk bug #529961 fixed now
 
- -- Ryan Kavanagh <ryanakca at kubuntu.org>  Sun, 15 Nov 2009 10:56:49 -0500
+ -- Varun Hiremath <varun at debian.org>  Fri, 05 Feb 2010 23:49:39 -0500
 
 mayavi2 (3.3.0-1) unstable; urgency=low
 
-  * New upstream release	
+  * New upstream release
   * debian/control: Add ipython to Suggests
-  * debian/rules: fix build process by adding a workaround for 
+  * debian/rules: fix build process by adding a workaround for
     m2_about.jpg image created before build
   * Add patches/build_doc.diff to fix documentation generation
 

Modified: packages/mayavi2/trunk/debian/compat
===================================================================
--- packages/mayavi2/trunk/debian/compat	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/compat	2010-02-06 06:06:15 UTC (rev 4694)
@@ -1 +1 @@
-6
+7

Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/control	2010-02-06 06:06:15 UTC (rev 4694)
@@ -3,9 +3,9 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-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.0),
- python-setuptools, python-setupdocs, python-vtk, python-numpy, quilt
-Standards-Version: 3.8.2
+Build-Depends: cdbs, debhelper (>= 7), python-all-dev, python-central (>= 0.6.0),
+ python-setuptools, python-setupdocs, python-vtk, python-numpy
+Standards-Version: 3.8.4
 XS-Python-Version: current
 Homepage: http://code.enthought.com/projects/mayavi/
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/mayavi2/trunk
@@ -17,7 +17,7 @@
  python-traits, python-traitsgui, python-wxgtk2.8, python-numpy,
  python-vtk, python-pkg-resources, python-envisagecore,
  python-envisageplugins, python-apptools, libjs-jquery,
- python-configobj, libvtk5.2
+ python-configobj, libvtk5.4
 Suggests: python-scipy, ipython
 XB-Python-Version: ${python:Versions}
 Description: A scientific visualization package for 2-D and 3-D data

Modified: packages/mayavi2/trunk/debian/patches/series
===================================================================
--- packages/mayavi2/trunk/debian/patches/series	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/patches/series	2010-02-06 06:06:15 UTC (rev 4694)
@@ -1,3 +1,3 @@
 build_doc.diff
 manpage.diff
-wxversion.diff
+

Deleted: packages/mayavi2/trunk/debian/patches/wxversion.diff
===================================================================
--- packages/mayavi2/trunk/debian/patches/wxversion.diff	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/patches/wxversion.diff	2010-02-06 06:06:15 UTC (rev 4694)
@@ -1,17 +0,0 @@
-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	2010-02-06 01:32:41 UTC (rev 4693)
+++ packages/mayavi2/trunk/debian/rules	2010-02-06 06:06:15 UTC (rev 4694)
@@ -1,11 +1,9 @@
 #!/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 .html
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
@@ -42,6 +40,6 @@
 	mkdir $(DEB_DESTDIR)/$(HTMLDOCS)
 	dh_link `pycentral pycentraldir mayavi2`/enthought/mayavi/html/ $(HTMLDOCS)/mayavi2
 	dh_link `pycentral pycentraldir mayavi2`/enthought/tvtk/html/ $(HTMLDOCS)/tvtk
-	
+
 get-orig-source:
 	-uscan --force-download --rename

Added: packages/mayavi2/trunk/debian/source/format
===================================================================
--- packages/mayavi2/trunk/debian/source/format	                        (rev 0)
+++ packages/mayavi2/trunk/debian/source/format	2010-02-06 06:06:15 UTC (rev 4694)
@@ -0,0 +1 @@
+3.0 (quilt)


