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

[varun at users.alioth.debian.org]

    Date: Sunday, March 23, 2008 @ 05:29:36
  Author: varun
Revision: 835

* Change Build-Depends: python-central (>= 0.6.0) (Closes: #472032)
* debian/rules: Switch to new directory structure of python-central

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	2008-03-22 16:17:08 UTC (rev 834)
+++ packages/mayavi2/trunk/debian/changelog	2008-03-23 05:29:36 UTC (rev 835)
@@ -1,3 +1,10 @@
+mayavi2 (2.1.1-2) unstable; urgency=low
+
+  * Change Build-Depends: python-central (>= 0.6.0) (Closes: #472032)
+  * debian/rules: Switch to new directory structure of python-central
+
+ -- Varun Hiremath <varun at debian.org>  Sun, 23 Mar 2008 11:11:49 +0530
+
 mayavi2 (2.1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control	2008-03-22 16:17:08 UTC (rev 834)
+++ packages/mayavi2/trunk/debian/control	2008-03-23 05:29:36 UTC (rev 835)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Python Applications Packaging Team <python-apps-team at lists.alioth.debian.org>
 Uploaders: Ondrej Certik <ondrej at certik.cz>, Marco Rodrigues <gothicx at sapo.pt>, Varun Hiremath <varun at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), python-all-dev, python-central,
+Build-Depends: cdbs, debhelper (>= 5), python-all-dev, python-central (>= 0.6.0),
  python-setuptools, python-vtk, python-numpy
 Standards-Version: 3.7.3
 Vcs-Svn: svn://svn.debian.org/svn/python-apps/packages/mayavi2/trunk

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2008-03-22 16:17:08 UTC (rev 834)
+++ packages/mayavi2/trunk/debian/rules	2008-03-23 05:29:36 UTC (rev 835)
@@ -1,5 +1,4 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
 
 DEB_PYTHON_SYSTEM=pycentral
 
@@ -8,7 +7,7 @@
 
 DEB_COMPRESS_EXCLUDE		:= .py .vtu .vti .vtk .wrl
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
-SITE_PACKAGES=$(DEB_DESTDIR)usr/share/pycentral/mayavi2/site-packages
+PYSHARED			 = $(DEB_DESTDIR)`pycentral pycentraldir mayavi2`
 
 clean::
 	find -type d | grep build$ | xargs $(RM) -r
@@ -24,14 +23,13 @@
 	  DIR=`dirname $$file`; \
 	  cd $$DIR && python$* setup.py install --root $(DEB_DESTDIR); \
 	done
+	touch $(DEB_DESTDIR)/usr/lib/python$*/site-packages/enthought/plugins/__init__.py
 
 binary-predeb/mayavi2::
-	dh_link /usr/share/pycentral/mayavi2/site-packages/enthought/mayavi/scripts/mayavi2 /usr/bin/mayavi2
-	find $(SITE_PACKAGES) -type f | grep nspkg.pth$ | xargs $(RM)
-	sed -i '/^#!/d' $(SITE_PACKAGES)/enthought/tvtk/setup.py
-	sed -i '/^#!/d' $(SITE_PACKAGES)/enthought/mayavi/scripts/mayavi2.py
-	touch $(SITE_PACKAGES)/enthought/plugins/__init__.py
+	sed -i '/^#!/d' $(PYSHARED)/enthought/tvtk/setup.py
+	sed -i '/^#!/d' $(PYSHARED)/enthought/mayavi/scripts/mayavi2.py
 	$(RM) $(DEB_DESTDIR)usr/share/doc/mayavi2/docs/mayavi/mayavi2.man*
+	dh_link `pycentral pycentraldir mayavi2`/enthought/mayavi/scripts/mayavi2 /usr/bin/mayavi2
 
 get-orig-source:
 	sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION)