r45516 - in /packages/fenics/dolfin/trunk/debian: changelog control libdolfin1.0-dev.install libdolfin1.0.install libdolfin1.1-dev.install libdolfin1.1.install patches/ rules
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Fri Jan 11 07:46:27 UTC 2013
Author: johannr-guest
Date: Fri Jan 11 07:46:27 2013
New Revision: 45516
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=45516
Log:
* New upstream release.
* debian/control:
- Replace libdolfin1.0 with libdolfin1.1 and libdolfin1.0-dev with
libdolfin1.1-dev to follow library soname.
- Bump required version for ufc, python-ufc, python-ffc, python-ufl,
and python-instant.
- Add libdolfin1.0-dev to Conflicts and Depends for binary package
libdolfin1.1-dev.
- Add libvtk5-dev, libvtk5-qt4-dev, libqt4-dev, libhdf5-mpi-dev,
libboost-timer-dev and libboost-chrono-dev to Build-Depends and in
Depends field for binary package libdolfin1.1-dev.
- Remove python-viper from Depends for binary package python-dolfin.
* debian/rules: Enable building with HDF5, VTK, and QT.
* Move debian/libdolfin1.0.install to debian/libdolfin1.1.install and
debian/libdolfin1.0-dev.install to debian/libdolfin1.1-dev.install
to follow library soname.
* debian/patches: Remove patches now fixed upstream.
* Determine swig2.0 version at build time (closes: #692852). Thanks to
Stefano Riviera for the patch.
Added:
packages/fenics/dolfin/trunk/debian/libdolfin1.1-dev.install
- copied unchanged from r45513, packages/fenics/dolfin/trunk/debian/libdolfin1.0-dev.install
packages/fenics/dolfin/trunk/debian/libdolfin1.1.install
- copied unchanged from r45513, packages/fenics/dolfin/trunk/debian/libdolfin1.0.install
Removed:
packages/fenics/dolfin/trunk/debian/libdolfin1.0-dev.install
packages/fenics/dolfin/trunk/debian/libdolfin1.0.install
packages/fenics/dolfin/trunk/debian/patches/
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=45516&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Fri Jan 11 07:46:27 2013
@@ -1,3 +1,27 @@
+dolfin (1.1.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * debian/control:
+ - Replace libdolfin1.0 with libdolfin1.1 and libdolfin1.0-dev with
+ libdolfin1.1-dev to follow library soname.
+ - Bump required version for ufc, python-ufc, python-ffc, python-ufl,
+ and python-instant.
+ - Add libdolfin1.0-dev to Conflicts and Depends for binary package
+ libdolfin1.1-dev.
+ - Add libvtk5-dev, libvtk5-qt4-dev, libqt4-dev, libhdf5-mpi-dev,
+ libboost-timer-dev and libboost-chrono-dev to Build-Depends and in
+ Depends field for binary package libdolfin1.1-dev.
+ - Remove python-viper from Depends for binary package python-dolfin.
+ * debian/rules: Enable building with HDF5, VTK, and QT.
+ * Move debian/libdolfin1.0.install to debian/libdolfin1.1.install and
+ debian/libdolfin1.0-dev.install to debian/libdolfin1.1-dev.install
+ to follow library soname.
+ * debian/patches: Remove patches now fixed upstream.
+ * Determine swig2.0 version at build time (closes: #692852). Thanks to
+ Stefano Riviera for the patch.
+
+ -- Johannes Ring <johannr at simula.no> Thu, 10 Jan 2013 11:28:21 +0100
+
dolfin (1.0.0-7) unstable; urgency=low
* debian/control:
Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=45516&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Fri Jan 11 07:46:27 2013
@@ -19,14 +19,20 @@
libboost-iostreams-dev,
libboost-mpi-dev,
libboost-math-dev,
+ libboost-timer-dev,
+ libboost-chrono-dev,
libsuitesparse-dev,
- ufc (>= 2.0.5-3),
- python-ufc (>= 2.0.5-3),
+ ufc (>= 2.1.0),
+ python-ufc (>= 2.1.0),
libptscotch-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
libpetsc3.2-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
libslepc3.2-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
libarmadillo-dev,
- libcgal-dev
+ libcgal-dev,
+ libhdf5-mpi-dev,
+ libvtk5-dev,
+ libvtk5-qt4-dev,
+ libqt4-dev
Standards-Version: 3.9.3
X-Python-Version: >= 2.5
Homepage: http://fenicsproject.org
@@ -34,10 +40,10 @@
Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/fenics/dolfin/trunk
Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/
-Package: libdolfin1.0-dev
+Package: libdolfin1.1-dev
Section: libdevel
Architecture: any
-Depends: libdolfin1.0 (= ${binary:Version}),
+Depends: libdolfin1.1 (= ${binary:Version}),
libxml2-dev,
pkg-config,
libboost-dev,
@@ -48,18 +54,24 @@
libboost-iostreams-dev,
libboost-mpi-dev,
libboost-math-dev,
+ libboost-timer-dev,
+ libboost-chrono-dev,
libsuitesparse-dev,
libptscotch-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
libpetsc3.2-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
libslepc3.2-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
libarmadillo-dev,
cmake (>= 2.8.0),
- ufc (>= 2.0.5-3),
- python-ufc (>= 2.0.5-3),
+ ufc (>= 2.1.0),
+ python-ufc (>= 2.1.0),
libcgal-dev,
+ libhdf5-mpi-dev,
+ libvtk5-dev,
+ libvtk5-qt4-dev,
+ libqt4-dev,
${misc:Depends}
-Conflicts: libdolfin0-dev
-Replaces: libdolfin0-dev
+Conflicts: libdolfin1.0-dev, libdolfin0-dev
+Replaces: libdolfin1.0-dev, libdolfin0-dev
Description: Shared links and header files for DOLFIN
DOLFIN is the Python and C++ interface of the FEniCS project for the
automated solution of differential equations, providing a consistent
@@ -74,7 +86,7 @@
Package: dolfin-dev
Section: libdevel
Architecture: all
-Depends: libdolfin1.0-dev, ${misc:Depends}
+Depends: libdolfin1.1-dev, ${misc:Depends}
Description: Empty package depending on latest DOLFIN development package
DOLFIN is the Python and C++ interface of the FEniCS project for the
automated solution of differential equations, providing a consistent
@@ -88,11 +100,11 @@
libdolfinX-dev (X=version), so if you install it then you will get
upgrades automatically.
-Package: libdolfin1.0
+Package: libdolfin1.1
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: dolfin-doc, libdolfin1.0-dbg, python-dolfin
+Suggests: dolfin-doc, libdolfin1.1-dbg, python-dolfin
Description: Shared libraries for DOLFIN
DOLFIN is the Python and C++ interface of the FEniCS project for the
automated solution of differential equations, providing a consistent
@@ -104,10 +116,10 @@
.
This package contains the shared libraries.
-Package: libdolfin1.0-dbg
+Package: libdolfin1.1-dbg
Section: debug
Architecture: any
-Depends: libdolfin1.0 (= ${binary:Version}), ${misc:Depends}
+Depends: libdolfin1.1 (= ${binary:Version}), ${misc:Depends}
Description: Shared libraries with debugging symbols for DOLFIN
DOLFIN is the Python and C++ interface of the FEniCS project for the
automated solution of differential equations, providing a consistent
@@ -122,16 +134,15 @@
Package: python-dolfin
Section: python
Architecture: any
-Depends: libdolfin1.0-dev (= ${binary:Version}),
- libdolfin1.0 (= ${binary:Version}),
- python-ufc (>= 2.0.5-3),
- python-ffc (>= 1.0.0),
- python-viper (>= 1.0.0),
- python-ufl (>= 1.0.0),
- python-instant (>= 1.0.0),
+Depends: libdolfin1.1-dev (= ${binary:Version}),
+ libdolfin1.1 (= ${binary:Version}),
+ python-ufc (>= 2.1.0),
+ python-ffc (>= 1.1.0),
+ python-ufl (>= 1.1.0),
+ python-instant (>= 1.1.0),
python-numpy,
- swig2.0 (>= 2.0.7), swig2.0 (<< 2.0.8~),
python-netcdf,
+ ${swig:Depends},
${python:Depends},
${shlibs:Depends},
${misc:Depends}
@@ -150,7 +161,7 @@
Package: dolfin-doc
Architecture: all
Section: doc
-Depends: libdolfin1.0-dev (>= ${source:Version}),
+Depends: libdolfin1.1-dev (>= ${source:Version}),
python-dolfin (>= ${source:Version}),
${misc:Depends}
Suggests: cmake (>= 2.8.0)
Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=45516&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Fri Jan 11 07:46:27 2013
@@ -33,8 +33,11 @@
-D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
-D DOLFIN_ENABLE_TRILINOS:BOOL=OFF \
-D DOLFIN_ENABLE_CGAL:BOOL=ON \
- -D DOLFIN_ENABLE_MTL4:BOOL=OFF \
+ -D DOLFIN_ENABLE_HDF5:BOOL=ON \
+ -D DOLFIN_ENABLE_VTK:BOOL=ON \
+ -D DOLFIN_ENABLE_QT:BOOL=ON \
-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
+ -D DOLFIN_ENABLE_PASTIX:BOOL=OFF \
-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig2.0 \
-D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \
@@ -61,6 +64,13 @@
install/python-dolfin:: $(addprefix install-stamp-, $(PY_VERSIONS))
+binary-predeb/python-dolfin::
+ # We have a tight dependency on swig2.0 - #675207
+ set -e; \
+ swig_version=$$(dpkg-query -W swig2.0 | cut -f 2 | cut -d- -f 1); \
+ next_swig_version="$${swig_version%.*}.$$(($${swig_version##*.} + 1))"; \
+ echo "swig:Depends=swig2.0 (>= $$swig_version), swig2.0 (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
+
binary-install/python-dolfin::
dh_python2 -p$(cdbs_curpkg)
dh_numpy -p$(cdbs_curpkg)
More information about the debian-science-commits
mailing list