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

[Christophe Prud'homme]

SVN commit 4511 by prudhomm:

apply patch by fabrice


 M  +12 -3     trilinos/trunk/debian/changelog  
 M  +1 -1      trilinos/trunk/debian/control  
 A             trilinos/trunk/debian/patches/python_2.6.patch  
 M  +1 -0      trilinos/trunk/debian/patches/series  
 M  +1 -1      trilinos/trunk/debian/python-pytrilinos.install  


--- trilinos/trunk/debian/changelog #4510:4511
@@ -1,9 +1,18 @@
-trilinos (9.0.3.dfsg-1) unstable; urgency=low
+trilinos (9.0.2.dfsg-5) unstable; urgency=low
 
-  * New upstream release
+  [Fabrice Coutadeur]
+  * Adapt package to python2.6 (LP: #386625):
+    - debian/python-pytrilinos.install: changed python2.5 to python*
+    - debian/control: changed build dependency from python2.5-dev to python-dev
+    - debian/rules: changed reference to python2.5 to python2.6
+    - debian/patches/python_2.6.patch: add --install-layout=deb to setup.py
+      call in Makefile.in and Makefile.am for Packages/PyTrilinos/shared,
+      packages/PyTrilinos/src and packages/Sundance/python/src
+
+  [Christophe Prud'homme]
   * debian/rules: fix some lintian warnings
 
- -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 22 May 2009 13:51:13 +0200
+ -- Christophe Prud'homme <prudhomm at debian.org>  Fri, 03 Jul 2009 07:26:37 +0200
 
 trilinos (9.0.2.dfsg-4) unstable; urgency=low
 
--- trilinos/trunk/debian/control #4510:4511
@@ -3,7 +3,7 @@
 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), automake, autoconf, gfortran, libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python2.5-dev, swig1.3, python-numpy, python-numeric, libexpat1-dev, libxml2-dev
+Build-Depends: cdbs, quilt, debhelper (>= 7), automake, autoconf, gfortran, libopenmpi-dev, libsuperlu3-dev, libsuitesparse-dev, python-dev, swig1.3, python-numpy, python-numeric, libexpat1-dev, libxml2-dev
 Standards-Version: 3.8.1
 Homepage: http://trilinos.sandia.gov/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-scicomp/trilinos/trunk/
--- trilinos/trunk/debian/patches/series #4510:4511
@@ -1,2 +1,3 @@
 gcc44.patch
 gcc43.patch
+python_2.6.patch
--- trilinos/trunk/debian/python-pytrilinos.install #4510:4511
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python2.5 /usr/lib
+debian/tmp/usr/lib/python* /usr/lib