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

johannr-guest at users.alioth.debian.org johannr-guest at users.alioth.debian.org
Fri Apr 15 07:44:41 UTC 2011 

Author: johannr-guest
Date: Fri Apr 15 07:44:35 2011
New Revision: 38384

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=38384
Log:
* Move from python-central to dh_python2.
* Build for all supported Python versions.
* Remove some unnecessary packages in Depends for binary packages
  libdolfin0 and libdolfin0-dev.
* Add ufc and python-ufc in Depends for binary package libdolfin0-dev.
* Add python-ufc, python-ffc, python-viper, python-ufl python-instant,
  and python-numpy in Depends for binary package python-dolfin.
* Disable building with PETSc and SLEPc on some architectures.
* Remove old Provides field for binary package python-dolfin.

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=38384&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Fri Apr 15 07:44:35 2011
@@ -1,3 +1,23 @@
+dolfin (0.9.10-2) unstable; urgency=low
+
+  * Move from python-central to dh_python2 (closes: #616793).
+    - Remove python-central from Build-Depends.
+    - Bump minimum required python-all-dev package version to 2.6.6-3~.
+    - Remove XB-Python-Version line.
+    - Bump minimum required cdbs version to 0.4.90~.
+    - Replace XS-Python-Version with X-Python-Version.
+    - Replace call to dh_pycentral with dh_python2 in debian/rules.
+  * Build for all supported Python versions.
+  * Remove some unnecessary packages in Depends for binary packages
+    libdolfin0 and libdolfin0-dev.
+  * Add ufc and python-ufc in Depends for binary package libdolfin0-dev.
+  * Add python-ufc, python-ffc, python-viper, python-ufl python-instant,
+    and python-numpy in Depends for binary package python-dolfin.
+  * Disable building with PETSc and SLEPc on some architectures.
+  * Remove old Provides field for binary package python-dolfin.
+
+ -- Johannes Ring <johannr at simula.no>  Fri, 15 Apr 2011 09:17:37 +0200
+
 dolfin (0.9.10-1) unstable; urgency=low
 
   * New upstream release. This release fixes bug "FTBFS: error:

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=38384&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Fri Apr 15 07:44:35 2011
@@ -3,16 +3,29 @@
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Johannes Ring <johannr at simula.no>
-Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-all-dev, 
- python-central (>= 0.5.6), cmake (>= 2.8.0), swig (>= 1.3.35), python-numpy, pkg-config,
- libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
- python-ufc (>= 2.0.0), libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
- libslepc3.1-dev | libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7), libarmadillo-dev,
- libboost-filesystem-dev, libboost-program-options-dev,
- libtrilinos-dev[!armel !mips !mipsel !s390 !hppa !hurd-i386],
- libboost-thread-dev
+Build-Depends: cdbs (>= 0.4.90~),
+ debhelper (>= 7),
+ python-all-dev (>= 2.6.6-3~),
+ cmake (>= 2.8.0),
+ swig (>= 1.3.35),
+ python-numpy,
+ pkg-config,
+ libxml2-dev,
+ libboost-dev,
+ libboost-program-options-dev,
+ libboost-filesystem-dev,
+ libboost-serialization-dev,
+ libboost-thread-dev,
+ libsuitesparse-dev,
+ ufc (>= 2.0.0),
+ python-ufc (>= 2.0.0),
+ libptscotch-dev,
+ libpetsc3.1-dev [!hurd-i386 !s390],
+ libslepc3.1-dev [!armel !hurd-i386 !ia64 !mips !s390 !sparc],
+ libarmadillo-dev,
+ libtrilinos-dev [!armel !hurd-i386 !mips !mipsel !s390]
 Standards-Version: 3.9.1
-XS-Python-Version: >= 2.5
+X-Python-Version: >= 2.5
 Homepage: http://www.fenicsproject.org
 DM-Upload-Allowed: yes
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/fenics/dolfin/trunk
@@ -21,15 +34,23 @@
 Package: libdolfin0-dev
 Section: libdevel
 Architecture: any
-XB-Python-Version: ${python:Versions}
-Depends: libdolfin0 (= ${binary:Version}), libxml2-dev, pkg-config,
- libboost-dev, libboost-program-options-dev, libboost-filesystem-dev,
- libboost-serialization-dev, libsuitesparse-dev, python-dev, python-numpy,
- libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
- libslepc3.1-dev | libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7), libarmadillo-dev,
- python-ufl (>= 0.9.0-1), cmake (>= 2.8.0),
- libtrilinos-dev[!armel !mips !mipsel !s390 !hppa !hurd-i386],
+Depends: libdolfin0 (= ${binary:Version}),
+ libxml2-dev,
+ pkg-config,
+ libboost-dev,
+ libboost-program-options-dev,
+ libboost-filesystem-dev,
+ libboost-serialization-dev,
  libboost-thread-dev,
+ libsuitesparse-dev,
+ libptscotch-dev,
+ libpetsc3.1-dev [!hurd-i386 !s390],
+ libslepc3.1-dev [!armel !hurd-i386 !ia64 !mips !s390 !sparc],
+ libarmadillo-dev,
+ cmake (>= 2.8.0),
+ libtrilinos-dev [!armel !hurd-i386 !mips !mipsel !s390],
+ ufc (>= 2.0.0),
+ python-ufc (>= 2.0.0),
  ${misc:Depends}
 Description: Shared links and header files for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
@@ -40,7 +61,6 @@
 Package: dolfin-dev
 Section: libdevel
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Depends: libdolfin0-dev, ${misc:Depends}
 Description: Empty package depending on latest DOLFIN development package
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
@@ -52,8 +72,7 @@
 Package: libdolfin0
 Section: libs
 Architecture: any
-Depends: ufc (>= 2.0.0), python-ffc (>= 0.9.9), python-viper (>= 0.4.7),
- ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Suggests: dolfin-doc, libdolfin0-dbg, python-dolfin
 Description: shared libraries for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
@@ -64,7 +83,6 @@
 Package: libdolfin0-dbg
 Section: debug
 Architecture: any
-XB-Python-Version: ${python:Versions}
 Depends: libdolfin0 (= ${binary:Version}), ${misc:Depends}
 Description: Shared libraries with debugging symbols for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
@@ -75,12 +93,18 @@
 Package: python-dolfin
 Section: python
 Architecture: any
-XB-Python-Version: ${python:Versions}
 Depends: libdolfin0-dev (= ${binary:Version}),
  libdolfin0 (= ${binary:Version}),
- python-pytrilinos[!armel !mips !mipsel !s390 !hppa !hurd-i386],
- ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
-Provides: python-pydolfin0, ${python:Provides}
+ python-ufc (>= 2.0.0),
+ python-ffc (>= 0.9.9),
+ python-viper (>= 0.4.7),
+ python-ufl (>= 0.9.0),
+ python-instant (>= 0.9.9),
+ python-numpy,
+ python-pytrilinos [!armel !hurd-i386 !mips !mipsel !s390],
+ ${python:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
 Suggests: dolfin-doc
 Description: Python interface for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
@@ -90,10 +114,10 @@
 
 Package: dolfin-doc
 Architecture: all
-XB-Python-Version: ${python:Versions}
 Section: doc
 Depends: libdolfin0-dev (>= ${source:Version}),
- python-dolfin (>= ${source:Version}), ${misc:Depends}
+ python-dolfin (>= ${source:Version}),
+ ${misc:Depends}
 Suggests: cmake (>= 2.8.0)
 Description: Documentation and demo programs for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
@@ -103,8 +127,8 @@
 
 Package: dolfin-bin
 Architecture: all
-XB-Python-Version: ${python:Versions}
-Depends: python-dolfin (>= ${source:Version}), ${python:Depends},
+Depends: python-dolfin (>= ${source:Version}),
+ ${python:Depends},
  ${misc:Depends}
 Description: Executable scripts for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=38384&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Fri Apr 15 07:44:35 2011
@@ -25,15 +25,32 @@
 	-D DOLFIN_ENABLE_MTL4:BOOL=OFF \
 	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
+	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig \
 	..
 
 USCAN_DESTDIR := $(CURDIR)
 
+PY_VERSIONS = $(shell pyversions --requested debian/control | tac -s' ')
+
+install-stamp-%:
+	cd $(DEB_BUILDDIR) && rm CMakeCache.txt && \
+	  cmake -D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/$* \
+	    -D PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$*.so \
+	    -D PYTHON_INCLUDE_DIR:PATH=/usr/include/$* \
+	    $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS)
+	make -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
+	touch $@
+
+install/python-dolfin:: $(addprefix install-stamp-, $(PY_VERSIONS))
+
 binary-install/python-dolfin::
-	dh_pycentral -p$(cdbs_curpkg)
+	dh_python2 -p$(cdbs_curpkg)
 
 binary-install/dolfin-bin::
-	dh_pycentral -p$(cdbs_curpkg)
+	dh_python2 -p$(cdbs_curpkg)
+
+clean::
+	-rm -rf $(addprefix install-stamp-, $(PY_VERSIONS))
 
 get-orig-source:
 	uscan --force-download --verbose --destdir $(USCAN_DESTDIR) \

More information about the debian-science-commits mailing list