[Python-apps-commits] r6904 - in packages/mayavi2/trunk/debian (changelog control rules)

[varun at users.alioth.debian.org]

    Date: Thursday, April 7, 2011 @ 03:18:49
  Author: varun
Revision: 6904

* New upstream release
* Convert to dh_python2 (Closes: #616884)
* Convert from cdbs to debhelper

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

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2011-04-06 22:35:28 UTC (rev 6903)
+++ packages/mayavi2/trunk/debian/changelog	2011-04-07 03:18:49 UTC (rev 6904)
@@ -1,3 +1,11 @@
+mayavi2 (3.4.1-1) unstable; urgency=low
+
+  * New upstream release
+  * Convert to dh_python2 (Closes: #616884)
+  * Convert from cdbs to debhelper
+
+ -- Varun Hiremath <varun at debian.org>  Wed, 06 Apr 2011 22:14:48 -0400
+
 mayavi2 (3.4.0-2) unstable; urgency=low
 
   * d/control: remove dependency on libvtk* (Closes: #618666)

Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control	2011-04-06 22:35:28 UTC (rev 6903)
+++ packages/mayavi2/trunk/debian/control	2011-04-07 03:18:49 UTC (rev 6904)
@@ -3,10 +3,10 @@
 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 (>= 7), python-all-dev, python-central (>= 0.6.0),
+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
-XS-Python-Version: current
+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/
@@ -19,7 +19,6 @@
  python-envisageplugins, python-apptools, libjs-jquery,
  python-configobj
 Suggests: python-scipy, ipython
-XB-Python-Version: ${python:Versions}
 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
  visualization.  Its features include:

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2011-04-06 22:35:28 UTC (rev 6903)
+++ packages/mayavi2/trunk/debian/rules	2011-04-07 03:18:49 UTC (rev 6904)
@@ -1,50 +1,40 @@
 #!/usr/bin/make -f
 
-DEB_PYTHON_SYSTEM=pycentral
-
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
-
-DEB_COMPRESS_EXCLUDE		:= .py .vtu .vti .vtk .wrl .js .html
-DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
-PYSHARED			 = $(DEB_DESTDIR)`pycentral pycentraldir mayavi2`
+DEB_DESTDIR			 = $(CURDIR)/debian/mayavi2/
+PYSHARED			 = $(DEB_DESTDIR)/usr/share/pyshared
 JQUERY				 = /usr/share/javascript/jquery/jquery.js
 HTMLDOCS                         = /usr/share/doc/mayavi2/html/
 
-clean::
-	rm ./enthought/mayavi/images/m2_about.jpg
+%:
+	dh --with python2 $@
 
-post-patches::
-	cp ./docs/source/mayavi/m2_about.jpg ./enthought/mayavi/images/
-	mkdir -p docs/source/mayavi/auto
-	cp -f docs/CHANGES.txt docs/source/mayavi/auto/changes.rst
+override_dh_clean:
+	dh_clean
+	rm -rf ./enthought/mayavi/images/m2_about.jpg
 
-install/mayavi2::
+override_dh_install:
+	dh_install
+	dh_numpy
 	find $(DEB_DESTDIR) -name 'image_LICENSE.txt' -delete
 	find $(DEB_DESTDIR) -name '*.idx' -delete
-
-
-binary-install/mayavi2::
-	dh_numpy
-
-binary-post-install/mayavi2::
 	find $(DEB_DESTDIR) -name 'jquery.js*' -delete
-
-binary-predeb/mayavi2::
 	$(RM) $(DEB_DESTDIR)usr/share/doc/mayavi2/docs/mayavi2.man*
 	$(RM) $(DEB_DESTDIR)usr/share/doc/mayavi2/docs/html.zip
 	find  $(DEB_DESTDIR)usr/share/doc -name "*LICENSE*" -delete
-	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
+
+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 `pycentral pycentraldir mayavi2`/enthought/mayavi/scripts/mayavi2.py /usr/bin/mayavi2
+	dh_link /usr/share/pyshared/enthought/mayavi/scripts/mayavi2.py /usr/bin/mayavi2
 	# create symlinks for html docs
 	mkdir $(DEB_DESTDIR)/$(HTMLDOCS)
-	dh_link `pycentral pycentraldir mayavi2`/enthought/mayavi/html/ $(HTMLDOCS)/mayavi2
-	dh_link `pycentral pycentraldir mayavi2`/enthought/tvtk/html/ $(HTMLDOCS)/tvtk
+	dh_link /usr/share/pyshared/enthought/mayavi/html/ $(HTMLDOCS)/mayavi2
+	dh_link /usr/share/pyshared/enthought/tvtk/html/ $(HTMLDOCS)/tvtk
 
 get-orig-source:
 	-uscan --force-download --rename