[Pkg-scicomp-commits] trilinos/trunk/debian

Johannes Ring johannr at simula.no
Tue Jan 12 06:46:57 UTC 2010


SVN commit 4775 by johannr-guest:

Fix PyTrilinos issues.

 M  +7 -7      trilinos/trunk/debian/changelog  
 M  +3 -2      trilinos/trunk/debian/control  
 D             trilinos/trunk/debian/patches/python2.6.patch  
 M  +0 -1      trilinos/trunk/debian/patches/series  
 D             trilinos/trunk/debian/python-pytrilinos.install  
 M  +10 -2     trilinos/trunk/debian/rules  


--- trilinos/trunk/debian/changelog #4774:4775
@@ -5,13 +5,13 @@
   * debian/control: updated Standard-Version to 3.8.3 (no changes)
 
   [Johannes Ring]
-  * debian/patches: 
-    - Update patches for 10.0.4 release.
-    - Add patch for Python 2.6.
-  * debian/control: Add XB-Python-Version to binary package
-    python-pytrilinos.
-  * Add back debian/python-pytrilinos.install for installing
-    PyTrilinos.
+  * debian/patches: Update patches for 10.0.4 release.
+  * debian/control: 
+    - Add XS-Python-Version field to source package and
+      XB-Python-Version field to binary package python-pytrilinos.
+    - Add python-numpy to Depends for binary package python-pytrilinos.
+  * debian/rules: Fix issue with PyTrilinos and Python 2.6.
+  * Switch from python-support to python-central.
 
  -- Christophe Prud'homme <prudhomm at debian.org>  Sun, 03 Jan 2010 08:25:23 +0100
 
--- trilinos/trunk/debian/control #4774:4775
@@ -3,8 +3,9 @@
 Priority: extra
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>
-Build-Depends: cdbs, quilt, debhelper (>= 7), cmake, gfortran, libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev, swig1.3, python-numpy, libexpat1-dev, libxml2-dev, python-support
+Build-Depends: cdbs, quilt, debhelper (>= 7), cmake, gfortran, libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev, swig1.3, python-numpy, libexpat1-dev, libxml2-dev, python-central
 Standards-Version: 3.8.2
+XS-Python-Version: >= 2.5
 Homepage: http://trilinos.sandia.gov/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/trilinos/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-scicomp/trilinos/
@@ -67,7 +68,7 @@
 Section: python
 Architecture: any
 XB-Python-Version: ${python:Versions}
-Depends: libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: python-numpy, libtrilinos (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
 Conflicts: python-pytrilinos7.0, python-pytrilinos8.0
 Replaces: python-pytrilinos7.0, python-pytrilinos8.0
 Description:  parallel solver libraries within an object-oriented software framework
--- trilinos/trunk/debian/patches/series #4774:4775
@@ -1,3 +1,2 @@
 soname.patch
 libname.patch
-python2.6.patch
--- trilinos/trunk/debian/rules #4774:4775
@@ -40,8 +40,16 @@
 	-find $(CURDIR) -name "Makefile.orig" | xargs rm -f
 
 install/python-pytrilinos::
-	-find $(CURDIR)/debian/python-pytrilinos -name "*.pyc" | xargs rm -f
-	dh_pysupport -ppython-pytrilinos
+	if [ $(PYVER) = "2.6" ]; then \
+	  dh_install -ppython-pytrilinos -X.pyc \
+	    debian/tmp/usr/lib/python$(PYVER)/site-packages/PyTrilinos \
+	    usr/lib/python$(PYVER)/dist-packages; \
+	else \
+	  dh_install -ppython-pytrilinos -X.pyc \
+	    debian/tmp/usr/lib/python$(PYVER)/site-packages/PyTrilinos \
+	    usr/lib/python$(PYVER)/site-packages; \
+	fi
+	dh_pycentral -ppython-pytrilinos
 
 install/libtrilinos-doc::
 	-chmod -x packages/didasko/doc/DoxyfileWeb



More information about the Pkg-scicomp-commits mailing list