[Python-apps-commits] r7282 - in packages/mayavi2/trunk/debian (4 files)

[varun at users.alioth.debian.org]

    Date: Saturday, July 9, 2011 @ 05:32:42
  Author: varun
Revision: 7282

* New upstream release
* debian/control:
  - Bump Standards-Version to 3.9.2
  - Set X-Python-Version: 2.6, fixes FTBFS (Closes: #625148)
  - Update Depends
* Update debian/watch file

Modified:
  packages/mayavi2/trunk/debian/changelog
  packages/mayavi2/trunk/debian/control
  packages/mayavi2/trunk/debian/rules
  packages/mayavi2/trunk/debian/watch

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2011-07-08 16:10:37 UTC (rev 7281)
+++ packages/mayavi2/trunk/debian/changelog	2011-07-09 05:32:42 UTC (rev 7282)
@@ -1,3 +1,14 @@
+mayavi2 (4.0.0-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Bump Standards-Version to 3.9.2
+    - Set X-Python-Version: 2.6, fixes FTBFS (Closes: #625148)
+    - Update Depends
+  * Update debian/watch file
+
+ -- Varun Hiremath <varun at debian.org>  Sat, 09 Jul 2011 01:18:36 -0400
+
 mayavi2 (3.4.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control	2011-07-08 16:10:37 UTC (rev 7281)
+++ packages/mayavi2/trunk/debian/control	2011-07-09 05:32:42 UTC (rev 7282)
@@ -5,8 +5,8 @@
 Uploaders: Varun Hiremath <varun at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), python-all-dev (>= 2.6.6-3~), 
  python-setuptools, python-setupdocs, python-vtk, python-numpy (>= 1:1.4.1-4~)
-Standards-Version: 3.9.1
-X-Python-Version: >= 2.6
+Standards-Version: 3.9.2
+X-Python-Version: 2.6
 Homepage: http://code.enthought.com/projects/mayavi/
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/mayavi2/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/mayavi2/trunk/
@@ -14,10 +14,9 @@
 Package: mayavi2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-traits, python-traitsgui, python-wxgtk2.8, python-numpy,
- python-vtk (>= 5.4.2-5), python-pkg-resources, python-envisagecore,
- python-envisageplugins, python-apptools, libjs-jquery,
- python-configobj
+ python-traits, python-traitsui, python-wxgtk2.8, python-numpy,
+ python-vtk (>= 5.4.2-5), python-pkg-resources, python-envisage,
+ python-apptools, libjs-jquery, python-configobj
 Suggests: python-scipy, ipython
 Description: A scientific visualization package for 2-D and 3-D data
  MayaVi2 is a cross-platform tool for 2-D and 3-D scientific data

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2011-07-08 16:10:37 UTC (rev 7281)
+++ packages/mayavi2/trunk/debian/rules	2011-07-09 05:32:42 UTC (rev 7282)
@@ -10,7 +10,7 @@
 
 override_dh_clean:
 	dh_clean
-	rm -rf ./enthought/mayavi/images/m2_about.jpg
+	rm -rf ./mayavi/images/m2_about.jpg
 
 override_dh_install:
 	dh_install
@@ -24,17 +24,15 @@
 
 override_dh_installdeb:
 	dh_installdeb
-	dh_link $(JQUERY) /usr/share/pyshared/enthought/mayavi/html/_static/jquery.js
-	dh_link $(JQUERY) /usr/share/pyshared/enthought/tvtk/html/_static/jquery.js
-	dh_link $(JQUERY) /usr/share/pyshared/enthought/docs/html/mayavi/_static/jquery.js
-	dh_link $(JQUERY) /usr/share/pyshared/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 /usr/share/pyshared/enthought/mayavi/scripts/mayavi2.py /usr/bin/mayavi2
+	dh_link $(JQUERY) /usr/share/pyshared/mayavi/html/_static/jquery.js
+	dh_link $(JQUERY) /usr/share/pyshared/tvtk/html/_static/jquery.js
+	chmod +x $(PYSHARED)/mayavi/scripts/mayavi2.py
+	chmod -x $(PYSHARED)/mayavi/tests/data/cellsnd.ascii.inp
+	dh_link /usr/share/pyshared/mayavi/scripts/mayavi2.py /usr/bin/mayavi2
 	# create symlinks for html docs
 	mkdir $(DEB_DESTDIR)/$(HTMLDOCS)
-	dh_link /usr/share/pyshared/enthought/mayavi/html/ $(HTMLDOCS)/mayavi2
-	dh_link /usr/share/pyshared/enthought/tvtk/html/ $(HTMLDOCS)/tvtk
+	dh_link /usr/share/pyshared/mayavi/html/ $(HTMLDOCS)/mayavi2
+	dh_link /usr/share/pyshared/tvtk/html/ $(HTMLDOCS)/tvtk
 
 get-orig-source:
 	-uscan --force-download --rename

Modified: packages/mayavi2/trunk/debian/watch
===================================================================
--- packages/mayavi2/trunk/debian/watch	2011-07-08 16:10:37 UTC (rev 7281)
+++ packages/mayavi2/trunk/debian/watch	2011-07-09 05:32:42 UTC (rev 7282)
@@ -1,5 +1,5 @@
 version=3
 opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://www.enthought.com/repo/ets/Mayavi-(.*).tar.gz \
+http://www.enthought.com/repo/ets/mayavi-(.*).tar.gz \
 debian debian/orig-tar.sh