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

[varun-guest at users.alioth.debian.org]

    Date: Friday, December 7, 2007 @ 02:43:40
  Author: varun-guest
Revision: 397

  + install using setup files.

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

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2007-12-07 01:01:18 UTC (rev 396)
+++ packages/mayavi2/trunk/debian/changelog	2007-12-07 02:43:40 UTC (rev 397)
@@ -8,6 +8,7 @@
   * debian/rules:
     + add clean target
     + fix executable permissions of some files
+    + install using setup files.
   * Install upstream provided manpage.
   * Install examples and docs.
 

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2007-12-07 01:01:18 UTC (rev 396)
+++ packages/mayavi2/trunk/debian/rules	2007-12-07 02:43:40 UTC (rev 397)
@@ -16,15 +16,17 @@
 	find -type d | grep build$ | xargs $(RM) -r
 
 python-install-%:
-	mkdir -p $(SITE_PACKAGES)
-	cp -r build/enthought $(SITE_PACKAGES)
+	for file in $(CURDIR)/*/setup.py; do \
+	  DIR=`dirname $$file`; \
+	  cd $$DIR && python setup.py install --root $(CURDIR)/debian/mayavi2; \
+	done;
 	mkdir -p $(DEB_DESTDIR)usr/bin
 	$(RM) $(DEB_DESTDIR)usr/bin/mayavi2
-	sed -i '/^#!/d' $(SITE_PACKAGES)/enthought/tvtk/setup.py
-	sed -i '/^#!/d' $(SITE_PACKAGES)/enthought/mayavi/scripts/mayavi2.py
 	ln -s /usr/lib/python2.4/site-packages/enthought/mayavi/scripts/mayavi2 $(DEB_DESTDIR)usr/bin/mayavi2
 
 binary-predeb/mayavi2::
+	sed -i '/^#!/d' $(SITE_PACKAGES)/enthought/tvtk/setup.py
+	sed -i '/^#!/d' $(SITE_PACKAGES)/enthought/mayavi/scripts/mayavi2.py
 	$(RM) $(DEB_DESTDIR)usr/share/doc/mayavi2/mayavi2.man*
 
 get-orig-source: