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

[varun at users.alioth.debian.org]

    Date: Friday, December 9, 2011 @ 04:32:05
  Author: varun
Revision: 7924

* d/rules: Remove extraneous directories from installing (Closes: #649906)
* Add patches/help.diff to fix mayavi2 html documentation directory

Added:
  packages/mayavi2/trunk/debian/patches/help.diff
Modified:
  packages/mayavi2/trunk/debian/changelog
  packages/mayavi2/trunk/debian/patches/series
  packages/mayavi2/trunk/debian/rules

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2011-12-08 20:32:01 UTC (rev 7923)
+++ packages/mayavi2/trunk/debian/changelog	2011-12-09 04:32:05 UTC (rev 7924)
@@ -1,10 +1,11 @@
 mayavi2 (4.0.0-3) unstable; urgency=low
 
   * d/control: Add version depends on python-apptools (Closes: #633992)
-  * d/rules: Remove the extraneous examples directory (Closes: #649906)
+  * d/rules: Remove extraneous directories from installing (Closes: #649906)
   * Add patches/ipython.diff to updated docs to IPython 0.11 (Closes: #636465)
+  * Add patches/help.diff to fix mayavi2 html documentation directory
 
- -- Varun Hiremath <varun at debian.org>  Thu, 08 Dec 2011 03:58:08 -0500
+ -- Varun Hiremath <varun at debian.org>  Thu, 08 Dec 2011 20:40:04 -0500
 
 mayavi2 (4.0.0-2) unstable; urgency=low
 

Added: packages/mayavi2/trunk/debian/patches/help.diff
===================================================================
--- packages/mayavi2/trunk/debian/patches/help.diff	                        (rev 0)
+++ packages/mayavi2/trunk/debian/patches/help.diff	2011-12-09 04:32:05 UTC (rev 7924)
@@ -0,0 +1,14 @@
+Index: mayavi2-4.0.0/mayavi/action/help.py
+===================================================================
+--- mayavi2-4.0.0.orig/mayavi/action/help.py	2011-12-08 20:35:30.000000000 -0500
++++ mayavi2-4.0.0/mayavi/action/help.py	2011-12-08 20:38:33.000000000 -0500
+@@ -25,7 +25,8 @@
+ # standard place.  If that directory doesn't exist, assume you
+ # are running from the source.
+ local_dir = dirname(mayavi.api.__file__)
+-HTML_DIR = join(local_dir, 'html')
++# Varun Hiremath: set debian mayavi2 html docs directory
++HTML_DIR='/usr/share/doc/mayavi2/docs/build/mayavi/html'
+ if not path.exists(HTML_DIR):
+     HTML_DIR = join(dirname(dirname(local_dir)),
+                                     'build', 'docs', 'html', 'mayavi')

Modified: packages/mayavi2/trunk/debian/patches/series
===================================================================
--- packages/mayavi2/trunk/debian/patches/series	2011-12-08 20:32:01 UTC (rev 7923)
+++ packages/mayavi2/trunk/debian/patches/series	2011-12-09 04:32:05 UTC (rev 7924)
@@ -1 +1,2 @@
+help.diff
 ipython.diff

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2011-12-08 20:32:01 UTC (rev 7923)
+++ packages/mayavi2/trunk/debian/rules	2011-12-09 04:32:05 UTC (rev 7924)
@@ -4,6 +4,7 @@
 PYSHARED			 = $(DEB_DESTDIR)/usr/share/pyshared
 JQUERY				 = /usr/share/javascript/jquery/jquery.js
 HTMLDOCS                         = /usr/share/doc/mayavi2/html/
+PYVERS                           = $(shell pyversions -r -v)
 
 %:
 	dh --with python2 $@
@@ -23,15 +24,19 @@
 	find  $(DEB_DESTDIR)usr/share/doc -name "*LICENSE*" -delete
 
 override_dh_installdeb:
+	# remove extraneous directories
+	rm -rf $(PYSHARED)/examples
+	rm -rf $(PYSHARED)/docs
+	rm -rf $(PYSHARED)/integrationtests
+	for py in $(PYVERS); do\
+		rm -rf $(DEB_DESTDIR)/usr/lib/python$$py/dist-packages/examples;\
+		rm -rf $(DEB_DESTDIR)/usr/lib/python$$py/dist-packages/docs;\
+		rm -rf $(DEB_DESTDIR)/usr/lib/python$$py/dist-packages/integrationtests;\
+	done
 	dh_installdeb
-	$(RM) $(PYSHARED)/examples
 	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/mayavi/html/ $(HTMLDOCS)/mayavi2
-	dh_link /usr/share/pyshared/tvtk/html/ $(HTMLDOCS)/tvtk
 
 get-orig-source:
 	-uscan --force-download --rename