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

[varun at users.alioth.debian.org]

    Date: Tuesday, June 17, 2014 @ 06:36:47
  Author: varun
Revision: 10963

d/rules: remove references to pyshared (Closes: #746762)

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

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2014-06-16 08:46:12 UTC (rev 10962)
+++ packages/mayavi2/trunk/debian/changelog	2014-06-17 06:36:47 UTC (rev 10963)
@@ -1,3 +1,9 @@
+mayavi2 (4.3.1-3) UNRELEASED; urgency=medium
+
+  * d/rules: remove references to pyshared (Closes: #746762)
+
+ -- Varun Hiremath <varun at debian.org>  Tue, 17 Jun 2014 00:44:56 -0400
+
 mayavi2 (4.3.1-2) unstable; urgency=low
 
   [ Varun Hiremath ]

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2014-06-16 08:46:12 UTC (rev 10962)
+++ packages/mayavi2/trunk/debian/rules	2014-06-17 06:36:47 UTC (rev 10963)
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
 DEB_DESTDIR			 = $(CURDIR)/debian/mayavi2/
-PYSHARED			 = $(DEB_DESTDIR)/usr/share/pyshared
 JQUERY				 = /usr/share/javascript/jquery/jquery.js
 HTMLDOCS                         = /usr/share/doc/mayavi2/html/
 PYVERS                           = $(shell pyversions -r -v)
+PYINSTALL			 = /usr/lib/python2.7/dist-packages/
 
 %:
 	dh --with python2 $@
@@ -25,18 +25,15 @@
 
 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
-	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
+	chmod +x $(DEB_DESTDIR)/$(PYINSTALL)/mayavi/scripts/mayavi2.py
+	chmod -x $(DEB_DESTDIR)/$(PYINSTALL)/mayavi/tests/data/cellsnd.ascii.inp
+	dh_link $(PYINSTALL)/mayavi/scripts/mayavi2.py /usr/bin/mayavi2
 	dh_link $(JQUERY) /usr/share/doc/mayavi2/docs/build/mayavi/html/jquery.js
 	dh_link $(JQUERY) /usr/share/doc/mayavi2/docs/build/tvtk/html/jquery.js