Package: trilinos
Version: 9.0.2.dfsg-4
Severity: wishlist
Tags: patch
User: ubuntu-de...@lists.ubuntu.com
Usertags: origin-ubuntu jaunty ubuntu-patch
This package needs some adaptation to be ready for python2.6, that are
compatible with python2.5. Here is the patch.
*** /tmp/tmpUtIw5z
In Ubuntu, we've applied the attached patch to achieve the following:
* 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
We thought you might be interested in doing the same.
-- System Information:
Debian Release: 5.0
APT prefers jaunty-updates
APT policy: (500, 'jaunty-updates'), (500, 'jaunty-security'), (500, 'jaunty')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.28-13-generic (SMP w/2 CPU cores)
Locale: LANG=C, LC_CTYPE=C (charmap=ANSI_X3.4-1968)
Shell: /bin/sh linked to /bin/dash
diff -u trilinos-9.0.2.dfsg/debian/python-pytrilinos.install trilinos-9.0.2.dfsg/debian/python-pytrilinos.install
--- trilinos-9.0.2.dfsg/debian/python-pytrilinos.install
+++ trilinos-9.0.2.dfsg/debian/python-pytrilinos.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/python2.5 /usr/lib
+debian/tmp/usr/lib/python* /usr/lib
diff -u trilinos-9.0.2.dfsg/debian/rules trilinos-9.0.2.dfsg/debian/rules
--- trilinos-9.0.2.dfsg/debian/rules
+++ trilinos-9.0.2.dfsg/debian/rules
@@ -9,6 +9,7 @@
DEB_MAKE_BUILD_TARGET := default
DEB_COMPRESS_EXCLUDE := .pdf
DEB_MAKE_INSTALL_TARGET = install $(DEB_DESTDIR)
+PYVER = $(shell pyversions -dv)
#ENABLE_NOX=--disable-nox-epetra --disable-nox --disable-loca
ENABLE_NOX=--enable-nox-epetra
@@ -62,8 +63,8 @@
--enable-pytrilinos\
--disable-examples --disable-tests \
--with-mpi-incdir=/usr/include/mpi \
- --with-libs="-lsuperlu -lumfpack -lamd -lpython2.5" \
- --with-incdirs="-I/usr/include/python2.5 -I/usr/include/superlu -I/usr/include/suitesparse" \
+ --with-libs="-lsuperlu -lumfpack -lamd -lpython$(PYVER)" \
+ --with-incdirs="-I/usr/include/superlu -I/usr/include/suitesparse -I/usr/include/python$(PYVER)" \
# --enable-shared \
# --enable-anasazi\
diff -u trilinos-9.0.2.dfsg/debian/control trilinos-9.0.2.dfsg/debian/control
--- trilinos-9.0.2.dfsg/debian/control
+++ trilinos-9.0.2.dfsg/debian/control
@@ -1,9 +1,10 @@
Source: trilinos
Section: math
Priority: extra
-Maintainer: Debian Scientific Computing Team <pkg-scicomp-de...@lists.alioth.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-m...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Scientific Computing Team <pkg-scicomp-de...@lists.alioth.debian.org>
Uploaders: Christophe Prud'homme <prudh...@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/
diff -u trilinos-9.0.2.dfsg/debian/patches/series trilinos-9.0.2.dfsg/debian/patches/series
--- trilinos-9.0.2.dfsg/debian/patches/series
+++ trilinos-9.0.2.dfsg/debian/patches/series
@@ -2,0 +3 @@
+python_2.6.patch
only in patch2:
unchanged:
--- trilinos-9.0.2.dfsg.orig/debian/patches/python_2.6.patch
+++ trilinos-9.0.2.dfsg/debian/patches/python_2.6.patch
@@ -0,0 +1,84 @@
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.in
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/shared/Makefile.in 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.in 2009-06-15 22:42:28.000000000 +0200
+@@ -510,7 +510,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install:
+- $(PYTHON) $(srcdir)/setup.py install --destdir=$(DESTDIR)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --destdir=$(DESTDIR)
+
+ uninstall:
+ $(PYTHON) $(srcdir)/setup.py uninstall
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.am
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/shared/Makefile.am 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/shared/Makefile.am 2009-06-15 22:42:28.000000000 +0200
+@@ -250,7 +250,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install:
+- $(PYTHON) $(srcdir)/setup.py install --destdir=$(DESTDIR)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --destdir=$(DESTDIR)
+
+ uninstall:
+ $(PYTHON) $(srcdir)/setup.py uninstall
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.am
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/src/Makefile.am 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.am 2009-06-15 22:42:28.000000000 +0200
+@@ -325,9 +325,9 @@
+
+ install: package
+ if test -z '$(DESTDIR)'; then \
+- $(PYTHON) $(srcdir)/setup.py install --prefix $(PYTHON_PREFIX); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix $(PYTHON_PREFIX); \
+ else \
+- $(PYTHON) $(srcdir)/setup.py install --root $(DESTDIR); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --root $(DESTDIR); \
+ fi
+
+ uninstall:
+Index: trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.in
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/PyTrilinos/src/Makefile.in 2009-06-15 22:27:13.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/PyTrilinos/src/Makefile.in 2009-06-15 22:42:28.000000000 +0200
+@@ -708,9 +708,9 @@
+
+ install: package
+ if test -z '$(DESTDIR)'; then \
+- $(PYTHON) $(srcdir)/setup.py install --prefix $(PYTHON_PREFIX); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix $(PYTHON_PREFIX); \
+ else \
+- $(PYTHON) $(srcdir)/setup.py install --root $(DESTDIR); \
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --root $(DESTDIR); \
+ fi
+
+ uninstall:
+Index: trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.am
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/Sundance/python/src/Makefile.am 2009-06-15 22:42:42.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.am 2009-06-15 22:43:14.000000000 +0200
+@@ -75,7 +75,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install: build
+- $(PYTHON) $(srcdir)/setup.py install --prefix=$(PYTHON_PREFIX)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix=$(PYTHON_PREFIX)
+
+ clean-local:
+ $(PYTHON) $(srcdir)/setup.py clean
+Index: trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.in
+===================================================================
+--- trilinos-9.0.2.dfsg.orig/packages/Sundance/python/src/Makefile.in 2009-06-15 22:42:38.000000000 +0200
++++ trilinos-9.0.2.dfsg/packages/Sundance/python/src/Makefile.in 2009-06-15 22:42:57.000000000 +0200
+@@ -479,7 +479,7 @@
+ $(PYTHON) $(srcdir)/setup.py build
+
+ install: build
+- $(PYTHON) $(srcdir)/setup.py install --prefix=$(PYTHON_PREFIX)
++ $(PYTHON) $(srcdir)/setup.py install --install-layout=deb --prefix=$(PYTHON_PREFIX)
+
+ clean-local:
+ $(PYTHON) $(srcdir)/setup.py clean
