[Python-apps-commits] r1925 - in packages/mayavi2/trunk/debian (10 files)

varun at users.alioth.debian.org varun at users.alioth.debian.org
Sun Oct 26 04:49:03 UTC 2008 

    Date: Sunday, October 26, 2008 @ 04:49:00
  Author: varun
Revision: 1925

* New upstream release
* Upstream source split into many sub-packages 
* debian/control: add python-envisagecore, python-envisageplugins,
  python-apptools, libjs-jquery to Depends
* Update debian/watch and debian/orig-tar.sh files
* Cleanup debian/rules file

Modified:
  packages/mayavi2/trunk/debian/changelog
  packages/mayavi2/trunk/debian/compat
  packages/mayavi2/trunk/debian/control
  packages/mayavi2/trunk/debian/copyright
  packages/mayavi2/trunk/debian/install
  packages/mayavi2/trunk/debian/manpages
  packages/mayavi2/trunk/debian/orig-tar.sh
  packages/mayavi2/trunk/debian/rules
  packages/mayavi2/trunk/debian/watch
Deleted:
  packages/mayavi2/trunk/debian/README.Debian-source

Deleted: packages/mayavi2/trunk/debian/README.Debian-source
===================================================================
--- packages/mayavi2/trunk/debian/README.Debian-source	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/README.Debian-source	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,22 +0,0 @@
-mayavi2
-=======
-
-The orig.tar.gz used for packaging mayavi2 has been created by merging
-source tarballs of the following enthought projects:
-
-  enthought.debug
-  enthought.envisage
-  enthought.logger     
-  enthought.mayavi
-  enthought.persistence
-  enthought.plugins.debug
-  enthought.plugins.python_shell
-  enthought.plugins.refresh_code
-  enthought.plugins.text_editor
-  enthought.tvtk
-    
-Please use the rules/get-orig-source target to create the orig.tar.gz.
-For more details on repackaging of upstream sources please see the
-debian/orig-tar.sh file.
-
- -- Varun Hiremath <varun at debian.org>, Tue,  8 Jan 2008 00:32:04 +0530

Modified: packages/mayavi2/trunk/debian/changelog
===================================================================
--- packages/mayavi2/trunk/debian/changelog	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/changelog	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,10 +1,19 @@
-mayavi2 (2.2.0-2) UNRELEASED; urgency=low
+mayavi2 (3.0.3-1) experimental; urgency=low
 
+  [ Marco Rodrigues ]
   * debian/control:
     + Fix Homepage field to the new URL.
 
- -- Marco Rodrigues <gothicx at sapo.pt>  Sun, 14 Sep 2008 10:28:44 +0100
+  [ Varun Hiremath ]
+  * New upstream release
+  * Upstream source split into many sub-packages 
+  * debian/control: add python-envisagecore, python-envisageplugins,
+    python-apptools, libjs-jquery to Depends
+  * Update debian/watch and debian/orig-tar.sh files
+  * Cleanup debian/rules file
 
+ -- Varun Hiremath <varun at debian.org>  Sun, 26 Oct 2008 00:47:48 -0400
+
 mayavi2 (2.2.0-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/mayavi2/trunk/debian/compat
===================================================================
--- packages/mayavi2/trunk/debian/compat	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/compat	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1 +1 @@
-5
+6

Modified: packages/mayavi2/trunk/debian/control
===================================================================
--- packages/mayavi2/trunk/debian/control	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/control	2008-10-26 04:49:00 UTC (rev 1925)
@@ -14,8 +14,9 @@
 Package: mayavi2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-enthought-traits, python-enthought-traits-ui, python-wxgtk2.6,
- python-numpy, python-vtk, python-pkg-resources
+ python-traits, python-traitsgui, python-wxgtk2.8, python-numpy,
+ python-vtk, python-pkg-resources, python-envisagecore,
+ python-envisageplugins, python-apptools, libjs-jquery
 Suggests: python-scipy
 XB-Python-Version: ${python:Versions}
 Description: A scientific visualization package for 2-D and 3-D data
@@ -34,6 +35,7 @@
  applications natively.  Alternatively, it may be used as a
  visualization engine for any application.
  .
- This package actually bundles several useful packages from the
- Enthought Tool Suite -- tvtk (traited VTK), Envisage and various
- handy envisage plugins used by the default mayavi application.
+ This package also provides TVTK, which wraps VTK objects to provide a
+ convenient, Pythonic API, while supporting Traits attributes and
+ NumPy/SciPy arrays. TVTK is implemented mostly in pure Python, except
+ for a small extension module.

Modified: packages/mayavi2/trunk/debian/copyright
===================================================================
--- packages/mayavi2/trunk/debian/copyright	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/copyright	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,4 +1,5 @@
-This package was debianized by Ondrej Certik <ondrej at certik.cz>
+This package was debianized by Ondrej Certik <ondrej at certik.cz> and
+Varun Hiremath <varun at debian.org>
 
 It was downloaded from http://code.enthought.com/enstaller/eggs/source/
 
@@ -197,6 +198,7 @@
     Nuvola: LGPL
     Crystal: LGPL
     OOo: LGPL
+    GV: Gael Varoquaux: BSD-licensed
 
 Unless stated explicitly, icons are work of enthought, and are
 released under a 3 clause BSD license.
@@ -425,5 +427,5 @@
 ---------------------------------------------------------------------------
 
 The Debian packaging is (C) 2007, Ondrej Certik <ondrej at certik.cz>,
-Varun Hiremath <varunhiremath at gmail.com> and is licensed under the
-GPL, see `/usr/share/common-licenses/GPL'.
+Varun Hiremath <varun at debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL'.

Modified: packages/mayavi2/trunk/debian/install
===================================================================
--- packages/mayavi2/trunk/debian/install	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/install	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,4 +1,2 @@
-enthought.mayavi/examples/*		/usr/share/doc/mayavi2/examples/mayavi/
-enthought.tvtk/examples/*		/usr/share/doc/mayavi2/examples/tvtk/
-enthought.mayavi/docs/*			/usr/share/doc/mayavi2/docs/mayavi/
-enthought.tvtk/docs/*			/usr/share/doc/mayavi2/docs/tvtk/
+examples/*		/usr/share/doc/mayavi2/examples/
+docs/*			/usr/share/doc/mayavi2/docs/

Modified: packages/mayavi2/trunk/debian/manpages
===================================================================
--- packages/mayavi2/trunk/debian/manpages	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/manpages	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,2 +1,2 @@
-enthought.mayavi/docs/mayavi2.man
+docs/mayavi2.man
 debian/tvtk_doc.1

Modified: packages/mayavi2/trunk/debian/orig-tar.sh
===================================================================
--- packages/mayavi2/trunk/debian/orig-tar.sh	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/orig-tar.sh	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,44 +1,8 @@
 #!/bin/sh -e
 
-# $1 version
-TAR=../mayavi2_$1.orig.tar.gz
-DIR=mayavi2_$1.orig
-
-# package list
-PACKAGE_LIST="
-enthought.debug-2.0.4.tar.gz
-enthought.envisage-2.0.4.tar.gz
-enthought.logger-2.0.4.tar.gz
-enthought.mayavi-2.2.0.tar.gz
-enthought.persistence-2.1.0.tar.gz
-enthought.plugins.debug-2.0.4.tar.gz
-enthought.plugins.python_shell-2.0.4.tar.gz
-enthought.plugins.refresh_code-2.0.4.tar.gz
-enthought.plugins.text_editor-2.0.5.tar.gz
-enthought.tvtk-2.1.0.tar.gz
-"
-
-# download the tarballs
-REPO=http://code.enthought.com/enstaller/eggs/source/
-mkdir $DIR
-(cd $DIR; \
-for package in $PACKAGE_LIST
-do
-    wget $REPO/$package;
-    name=`echo $package | sed -e 's/-.*//'`;
-    dir=`echo $package | sed -e 's/\.tar.*//'`;
-    tar zxf $package;
-    mv $dir $name;
-    rm $package;
-done )
-
-# create the tarball
-GZIP=--best tar -c -z -f $TAR $DIR
-rm -rf $DIR
-
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then
   . .svn/deb-layout
-  mv $TAR $origDir
-  echo "moved $TAR to $origDir"
+  mv $3 $origDir
+  echo "moved $3 to $origDir"
 fi

Modified: packages/mayavi2/trunk/debian/rules
===================================================================
--- packages/mayavi2/trunk/debian/rules	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/rules	2008-10-26 04:49:00 UTC (rev 1925)
@@ -5,31 +5,20 @@
 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
+DEB_COMPRESS_EXCLUDE		:= .py .vtu .vti .vtk .wrl .js
 DEB_PYTHON_INSTALL_ARGS_ALL 	+= --single-version-externally-managed
 PYSHARED			 = $(DEB_DESTDIR)`pycentral pycentraldir mayavi2`
 
-clean::
-	find -type d | grep build$ | xargs $(RM) -r
+install/mayavi2::
+	find $(DEB_DESTDIR) -name 'image_LICENSE.txt' -delete
+	find $(DEB_DESTDIR) -name '*.idx' -delete
 
-python-build-stamp-%:
-	for file in $(CURDIR)/*/setup.py; do \
-	  DIR=`dirname $$file`; \
-	  cd $$DIR && python$* setup.py build; \
-	done
+binary-post-install/mayavi2::
+	find $(DEB_DESTDIR) -name 'jquery.js*' -delete
 
-python-install-%:
-	for file in $(CURDIR)/*/setup.py; do \
-	  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::
-	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)
+	dh_link /usr/share/javascript/jquery/jquery.js `pycentral pycentraldir mayavi2`/enthought/mayavi/html/_static/jquery.js
+	dh_link /usr/share/javascript/jquery/jquery.js `pycentral pycentraldir mayavi2`/enthought/tvtk/html/_static/jquery.js
+	chmod +x $(PYSHARED)/enthought/mayavi/scripts/mayavi2.py
+	dh_link `pycentral pycentraldir mayavi2`/enthought/mayavi/scripts/mayavi2.py /usr/bin/mayavi2

Modified: packages/mayavi2/trunk/debian/watch
===================================================================
--- packages/mayavi2/trunk/debian/watch	2008-10-26 04:27:28 UTC (rev 1924)
+++ packages/mayavi2/trunk/debian/watch	2008-10-26 04:49:00 UTC (rev 1925)
@@ -1,3 +1,6 @@
 version=3
 opts="uversionmangle=s/([ab])/~$1/,dversionmangle=s/\+.*//" \
-http://code.enthought.com/enstaller/eggs/source/enthought.mayavi-(.*)\.tar\.gz
+http://pypi.python.org/packages/source/M/Mayavi/Mayavi-(.*).tar.gz \
+debian debian/orig-tar.sh
+
+

More information about the Python-apps-commits mailing list