r44443 - in /packages/fenics/dolfin/trunk/debian: changelog control rules

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

Author: johannr-guest
Date: Tue Jan 31 07:19:16 2012
New Revision: 44443

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44443
Log:
Updates for PETSc/SLEPc 3.2.

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    packages/fenics/dolfin/trunk/debian/rules

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=44443&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Tue Jan 31 07:19:16 2012
@@ -1,3 +1,15 @@
+dolfin (1.0.0-2) unstable; urgency=low
+
+  * debian/control:
+    - Replace libpetsc3.1-dev and libslepc3.1-dev with libpetsc3.2-dev
+      and libslepc3.2-dev, respectively.
+    - Require libptscotch-dev, libpetsc3.2-dev and libslepc3.2-dev on
+      all arches.
+  * debian/rules: Help CMake find version 3.2 of PETSc and SLEPc by
+    defining PETSC_DIR and SLEPC_DIR variables, respectively.
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 30 Jan 2012 11:45:31 +0100
+
 dolfin (1.0.0-1) unstable; urgency=low
 
   * New upstream release.

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=44443&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Tue Jan 31 07:19:16 2012
@@ -22,9 +22,9 @@
  libsuitesparse-dev,
  ufc (>= 2.0.5),
  python-ufc (>= 2.0.5),
- libptscotch-dev [!armel !mips !mipsel !s390 !sparc],
- libpetsc3.1-dev [!armel !hurd-i386 !mips !mipsel !s390 !sparc],
- libslepc3.1-dev [!armel !hurd-i386 !ia64 !mips !mipsel !s390 !sparc],
+ libptscotch-dev,
+ libpetsc3.2-dev,
+ libslepc3.2-dev,
  libarmadillo-dev
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.5
@@ -48,9 +48,9 @@
  libboost-mpi-dev,
  libboost-math-dev,
  libsuitesparse-dev,
- libptscotch-dev [!armel !mips !mipsel !s390 !sparc],
- libpetsc3.1-dev [!armel !hurd-i386 !mips !mipsel !s390 !sparc],
- libslepc3.1-dev [!armel !hurd-i386 !ia64 !mips !mipsel !s390 !sparc],
+ libptscotch-dev,
+ libpetsc3.2-dev,
+ libslepc3.2-dev,
  libarmadillo-dev,
  cmake (>= 2.8.0),
  ufc (>= 2.0.5),

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=44443&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Tue Jan 31 07:19:16 2012
@@ -36,6 +36,8 @@
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
 	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig2.0 \
         -D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \
+	-D PETSC_DIR:PATH=/usr/lib/petscdir/3.2 \
+	-D SLEPC_DIR:PATH=/usr/lib/slepcdir/3.2 \
 	..
 
 USCAN_DESTDIR := $(CURDIR)