[Python-modules-commits] r4002 - in packages/petsc4py/trunk/debian (6 files)

[certik-guest at users.alioth.debian.org]

    Date: Thursday, December 20, 2007 @ 18:29:15
  Author: certik-guest
Revision: 4002

Fixes a FTBFS bug

Added:
  packages/petsc4py/trunk/debian/patches/
  packages/petsc4py/trunk/debian/patches/openmpi.patch
  packages/petsc4py/trunk/debian/patches/series
Modified:
  packages/petsc4py/trunk/debian/changelog
  packages/petsc4py/trunk/debian/control
  packages/petsc4py/trunk/debian/rules

Modified: packages/petsc4py/trunk/debian/changelog
===================================================================
--- packages/petsc4py/trunk/debian/changelog	2007-12-20 09:24:54 UTC (rev 4001)
+++ packages/petsc4py/trunk/debian/changelog	2007-12-20 18:29:15 UTC (rev 4002)
@@ -1,8 +1,11 @@
 petsc4py (0.7.5-5) unstable; urgency=low
 
   * DM-Upload-Allowed changed to XS-DM-Upload-Allowed
+  * pycentral changed to pysupport
+  * source were patched with Manuel's patch to compile against the latest
+    openmpi (Closes: #456869)
 
- -- Ondrej Certik <ondrej at certik.cz>  Tue, 04 Dec 2007 22:29:32 +0100
+ -- Ondrej Certik <ondrej at certik.cz>  Thu, 20 Dec 2007 17:47:06 +0100
 
 petsc4py (0.7.5-4) unstable; urgency=low
 

Modified: packages/petsc4py/trunk/debian/control
===================================================================
--- packages/petsc4py/trunk/debian/control	2007-12-20 09:24:54 UTC (rev 4001)
+++ packages/petsc4py/trunk/debian/control	2007-12-20 18:29:15 UTC (rev 4002)
@@ -3,10 +3,9 @@
 Priority: extra
 Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
 Uploaders: Ondrej Certik <ondrej at certik.cz>
-Build-Depends: cdbs (>=0.4.41), debhelper (>= 5), python-central (>= 0.5), python-all-dev (>=2.3.5-11), python-numpy (>=1:1.0.3-1), libpetsc2.3.3-dev (>= 2.3.3-3), dpatch (>= 2.0.10), chrpath (>= 0.13-2)
+Build-Depends: cdbs (>=0.4.41), debhelper (>= 5), python-support (>= 0.7.5), python-all-dev (>=2.3.5-11), python-numpy (>=1:1.0.3-1), libpetsc2.3.3-dev (>= 2.3.3-3), dpatch (>= 2.0.10), chrpath (>= 0.13-2), quilt
 Standards-Version: 3.7.2
 Homepage: http://code.google.com/p/petsc4py/
-XS-Python-Version: all
 Vcs-Svn: svn://svn.debian.org/python-modules/packages/petsc4py/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/python-modules/packages/petsc4py/?op=log
 XS-DM-Upload-Allowed: yes

Added: packages/petsc4py/trunk/debian/patches/openmpi.patch
===================================================================
--- packages/petsc4py/trunk/debian/patches/openmpi.patch	                        (rev 0)
+++ packages/petsc4py/trunk/debian/patches/openmpi.patch	2007-12-20 18:29:15 UTC (rev 4002)
@@ -0,0 +1,25 @@
+Index: petsc4py-0.7.5/setup.py
+===================================================================
+--- petsc4py-0.7.5.orig/setup.py	2007-12-20 19:11:36.952612313 +0100
++++ petsc4py-0.7.5/setup.py	2007-12-20 19:12:05.454236693 +0100
+@@ -55,17 +55,18 @@
+     seprepl = lambda p: p.replace(pathsep,'/').replace(extsep,'.')
+     depends = map(seprepl, depends)
+     extdir  = 'petsc/lib/ext'
++    mpidir  = '/usr/include/mpi'
+     petsc_c   = Extension('petsc4py.lib._petscext',
+                           sources=[extdir + '/' + 'petscext_c.i',
+                                    extdir + '/' + 'petsclib.c'],
+                           depends=depends,
+-                          include_dirs=[extdir],
++                          include_dirs=[extdir, mpidir],
+                           language='c')
+     petsc_cxx = Extension('petsc4py.lib._petscext',
+                           sources=[extdir + '/' + 'petscext_cpp.i',
+                                    extdir + '/' + 'petsclib.cpp'],
+                           depends=depends,
+-                          include_dirs=[extdir],
++                          include_dirs=[extdir, mpidir],
+                           language='c++')
+     return [petsc_c, petsc_cxx]
+ 

Added: packages/petsc4py/trunk/debian/patches/series
===================================================================
--- packages/petsc4py/trunk/debian/patches/series	                        (rev 0)
+++ packages/petsc4py/trunk/debian/patches/series	2007-12-20 18:29:15 UTC (rev 4002)
@@ -0,0 +1 @@
+openmpi.patch

Modified: packages/petsc4py/trunk/debian/rules
===================================================================
--- packages/petsc4py/trunk/debian/rules	2007-12-20 09:24:54 UTC (rev 4001)
+++ packages/petsc4py/trunk/debian/rules	2007-12-20 18:29:15 UTC (rev 4002)
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-DEB_PYTHON_SYSTEM=pycentral
+DEB_PYTHON_SYSTEM=pysupport
 
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/python-distutils.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 
 python-build-stamp-%:
 	cd $(DEB_SRCDIR) && PETSC_DIR=/usr/lib/petsc PETSC_ARCH=linux-gnu-c-opt python$* $(DEB_PYTHON_SETUP_CMD) build $(DEB_PYTHON_BUILD_ARGS)