r44195 - in /packages/sfepy/trunk/debian: changelog control copyright patches/mayavi.patch rules sfepy-release.debhelper.log sfepy-release.postinst.debhelper sfepy-release.preinst.debhelper sfepy-release.prerm.debhelper sfepy-release.substvars

Mon Dec 19 10:29:04 UTC 2011

Author: trophime-guest
Date: Mon Dec 19 10:29:04 2011
New Revision: 44195

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44195
Log:
update to 2011.4

Added:
    packages/sfepy/trunk/debian/patches/mayavi.patch
Removed:
    packages/sfepy/trunk/debian/sfepy-release.debhelper.log
    packages/sfepy/trunk/debian/sfepy-release.postinst.debhelper
    packages/sfepy/trunk/debian/sfepy-release.preinst.debhelper
    packages/sfepy/trunk/debian/sfepy-release.prerm.debhelper
    packages/sfepy/trunk/debian/sfepy-release.substvars
Modified:
    packages/sfepy/trunk/debian/changelog
    packages/sfepy/trunk/debian/control
    packages/sfepy/trunk/debian/copyright
    packages/sfepy/trunk/debian/rules

Modified: packages/sfepy/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/sfepy/trunk/debian/changelog?rev=44195&op=diff
==============================================================================

--- packages/sfepy/trunk/debian/changelog (original)
+++ packages/sfepy/trunk/debian/changelog Mon Dec 19 10:29:04 2011
@@ -1,8 +1,8 @@
-sfepy (2010.4-1) unstable; urgency=low
+sfepy (2011.4-1) unstable; urgency=low
 
   * debian/control: add swig to builddepends
   * debian/rules: modify get-orig-sources
   * Remove lintian warnings
   * Initial release (Closes: #588340)
 
- -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Wed, 19 Jan 2011 10:43:16 +0100
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Thu, 15 Dec 2011 10:23:16 +0100

Modified: packages/sfepy/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/sfepy/trunk/debian/control?rev=44195&op=diff
==============================================================================
--- packages/sfepy/trunk/debian/control (original)
+++ packages/sfepy/trunk/debian/control Mon Dec 19 10:29:04 2011
@@ -1,15 +1,17 @@
 Source: sfepy
 Section: math
 Priority: extra
-Maintainer: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
-Build-Depends: cdbs, debhelper (>= 7), quilt, 
- python-all-dev, python-central (>= 0.5.6), 
+Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
+Uploaders: Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>
+Build-Depends: cdbs (>= 0.4.90~), debhelper (>= 7), quilt, 
+ python-all-dev (>=2.6.6-3~), 
  swig, python-numpy, python-scipy, python-tables, 
- python-pyparsing, python-matplotlib, python-sympy
+ python-pyparsing, python-matplotlib, python-sympy,
+ mayavi2, ipython, cython
 #,python-pysparse, gmsh, tetgen, python-multiprocessing, ipython
 # mayavi2 
-Standards-Version: 3.9.1
-XS-Python-Version: all
+Standards-Version: 3.9.2
+X-Python-Version: all
 Homepage: http://code.google.com/p/sfepy
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/sfepy
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/sfepy

Modified: packages/sfepy/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/sfepy/trunk/debian/copyright?rev=44195&op=diff
==============================================================================
--- packages/sfepy/trunk/debian/copyright (original)
+++ packages/sfepy/trunk/debian/copyright Mon Dec 19 10:29:04 2011
@@ -1,6 +1,6 @@
 This work was packaged for Debian by:
 
-    Christophe Trophime <christophe.trophime at grenoble.cnrs.fr> on Fri, 20 Nov 2009 16:51:26 +0100
+    Christophe Trophime <christophe.trophime at lncmi.cnrs.fr> on Fri, 20 Nov 2009 16:51:26 +0100
 
 It was downloaded from http://code.google.com/p/sfepy
 

Added: packages/sfepy/trunk/debian/patches/mayavi.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/sfepy/trunk/debian/patches/mayavi.patch?rev=44195&op=file
==============================================================================
--- packages/sfepy/trunk/debian/patches/mayavi.patch (added)
+++ packages/sfepy/trunk/debian/patches/mayavi.patch Mon Dec 19 10:29:04 2011
@@ -1,0 +1,13 @@
+Index: sfepy-2011.4/setup.py
+===================================================================
+--- sfepy-2011.4.orig/setup.py	2011-12-01 12:18:47.000000000 +0100
++++ sfepy-2011.4/setup.py	2011-12-15 10:47:25.000000000 +0100
+@@ -108,7 +108,7 @@
+                         : '%s was not found: '
+                         'isfepy will use regular Python shell',
+                         'opt suffix' : ''})
+-package_check(('enthought.mayavi', 'mayavi'),
++package_check(('mayavi', 'mayavi'),
+               INFO.MAYAVI_MIN_VERSION,
+               optional=True,
+               version_getter=_mayavi_version)

Modified: packages/sfepy/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/sfepy/trunk/debian/rules?rev=44195&op=diff
==============================================================================
--- packages/sfepy/trunk/debian/rules (original)
+++ packages/sfepy/trunk/debian/rules Mon Dec 19 10:29:04 2011
@@ -1,6 +1,4 @@
 #!/usr/bin/make -f
-
-DEB_PYTHON_SYSTEM = pycentral
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
@@ -12,7 +10,7 @@
 
 # common additional install options for all binary packages
 #   ('--root' option is always set)
-#DEB_PYTHON_INSTALL_ARGS_ALL =
+DEB_PYTHON_INSTALL_ARGS_ALL = --install-layout=deb
 
 DEB_INSTALL_MANPAGES=sfepy.1
 
@@ -31,9 +29,9 @@
 	done
 	dh_installdocs -ppython-sfepy  doc/sfepy_manual.pdf 
 	dh_installman debian/isfepy.1
-	find $(DEB_DESTDIR) -name Makefile.dist | xargs rm 
+	find $(DEB_DESTDIR) -name Makefile.dist | xargs -r rm
 	rm -rf  $(DEB_DESTDIR)usr/share/sfepy/doc/
-	find $(DEB_DESTDIR) -name LICENSE | xargs rm
+	find $(DEB_DESTDIR) -name LICENSE | xargs -r rm
 	
 clean/python-sfepy::
 	make clean


