r46695 - in /packages/fenics/dolfin/trunk/debian: changelog control libdolfin1.3-dev.install libdolfin1.3.install libdolfin1.4-dev.install libdolfin1.4.install patches/series patches/workaround-boost-error.patch rules
johannr-guest at users.alioth.debian.org
johannr-guest at users.alioth.debian.org
Wed Jun 4 10:19:50 UTC 2014
Author: johannr-guest
Date: Wed Jun 4 10:19:50 2014
New Revision: 46695
URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46695
Log:
* New upstream release.
* debian/control:
- Update package names for new SONAME 1.3 (libdolfin1.3 ->
libdolfin1.4, libdolfin1.3-dbg -> libdolfin1.4-dbg and
libdolfin1.3-dev -> libdolfin1.4-dev).
- Bump minimum required version for python-instant, python-ufl and
python-ffc to 1.4.0.
- Add python-ffc to Build-Depends.
- Replace swig2.0 with swig in Build-Depends.
- Remove ufc and python-ufc from Build-Depends and from Depends for
binary package libdolfin1.4-dev and python-dolfin.
* Move debian/libdolfin1.3.install -> debian/libdolfin1.4.install
and debian/libdolfin1.3-dev.install -> debian/libdolfin1.4-dev.install.
* debian/rules:
- Enable CGAL again (accidentally disabled in last upload).
- No longer needed to remove .pyc files in get-orig-source target.
* Remove patch for bug in Boost (fixed).
Added:
packages/fenics/dolfin/trunk/debian/libdolfin1.4-dev.install
- copied unchanged from r46687, packages/fenics/dolfin/trunk/debian/libdolfin1.3-dev.install
packages/fenics/dolfin/trunk/debian/libdolfin1.4.install
- copied unchanged from r46687, packages/fenics/dolfin/trunk/debian/libdolfin1.3.install
Removed:
packages/fenics/dolfin/trunk/debian/libdolfin1.3-dev.install
packages/fenics/dolfin/trunk/debian/libdolfin1.3.install
packages/fenics/dolfin/trunk/debian/patches/workaround-boost-error.patch
Modified:
packages/fenics/dolfin/trunk/debian/changelog
packages/fenics/dolfin/trunk/debian/control
packages/fenics/dolfin/trunk/debian/patches/series
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=46695&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Wed Jun 4 10:19:50 2014
@@ -1,3 +1,25 @@
+dolfin (1.4.0+dfsg-1) unstable; urgency=medium
+
+ * New upstream release.
+ * debian/control:
+ - Update package names for new SONAME 1.3 (libdolfin1.3 ->
+ libdolfin1.4, libdolfin1.3-dbg -> libdolfin1.4-dbg and
+ libdolfin1.3-dev -> libdolfin1.4-dev).
+ - Bump minimum required version for python-instant, python-ufl and
+ python-ffc to 1.4.0.
+ - Add python-ffc to Build-Depends.
+ - Replace swig2.0 with swig in Build-Depends.
+ - Remove ufc and python-ufc from Build-Depends and from Depends for
+ binary package libdolfin1.4-dev and python-dolfin.
+ * Move debian/libdolfin1.3.install -> debian/libdolfin1.4.install
+ and debian/libdolfin1.3-dev.install -> debian/libdolfin1.4-dev.install.
+ * debian/rules:
+ - Enable CGAL again (accidentally disabled in last upload).
+ - No longer needed to remove .pyc files in get-orig-source target.
+ * Remove patch for bug in Boost (fixed).
+
+ -- Johannes Ring <johannr at simula.no> Wed, 04 Jun 2014 09:56:04 +0200
+
dolfin (1.3.0+dfsg-2) unstable; urgency=medium
* debian/control:
Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=46695&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Wed Jun 4 10:19:50 2014
@@ -6,7 +6,7 @@
Build-Depends: debhelper (>= 9),
python-dev,
cmake (>= 2.8.0),
- swig2.0,
+ swig,
python-numpy,
pkg-config,
libxml2-dev,
@@ -21,8 +21,6 @@
libboost-timer-dev,
libboost-chrono-dev,
libsuitesparse-dev,
- ufc (>= 2.3.0),
- python-ufc (>= 2.3.0),
libptscotch-dev,
libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
@@ -33,17 +31,18 @@
libvtk5-qt4-dev,
libqt4-dev,
python-ply,
- libeigen3-dev
+ libeigen3-dev,
+ python-ffc
Standards-Version: 3.9.5
X-Python-Version: >= 2.5
Homepage: http://fenicsproject.org
Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/fenics/dolfin/trunk
Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/fenics/dolfin/trunk/
-Package: libdolfin1.3-dev
+Package: libdolfin1.4-dev
Section: libdevel
Architecture: any
-Depends: libdolfin1.3 (= ${binary:Version}),
+Depends: libdolfin1.4 (= ${binary:Version}),
libxml2-dev,
pkg-config,
libboost-dev,
@@ -62,8 +61,6 @@
libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
libarmadillo-dev,
cmake (>= 2.8.0),
- ufc (>= 2.3.0),
- python-ufc (>= 2.3.0),
libcgal-dev [!armel !armhf !mips],
libhdf5-mpi-dev,
libvtk5-dev,
@@ -87,7 +84,7 @@
Package: dolfin-dev
Section: libdevel
Architecture: all
-Depends: libdolfin1.3-dev, ${misc:Depends}
+Depends: libdolfin1.4-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
@@ -101,11 +98,11 @@
libdolfinX-dev (X=version), so if you install it then you will get
upgrades automatically.
-Package: libdolfin1.3
+Package: libdolfin1.4
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: dolfin-doc, libdolfin1.3-dbg, python-dolfin
+Suggests: dolfin-doc, libdolfin1.4-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
@@ -117,10 +114,10 @@
.
This package contains the shared libraries.
-Package: libdolfin1.3-dbg
+Package: libdolfin1.4-dbg
Section: debug
Architecture: any
-Depends: libdolfin1.3 (= ${binary:Version}), ${misc:Depends}
+Depends: libdolfin1.4 (= ${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
@@ -135,12 +132,11 @@
Package: python-dolfin
Section: python
Architecture: any
-Depends: libdolfin1.3-dev (= ${binary:Version}),
- libdolfin1.3 (= ${binary:Version}),
- python-ufc (>= 2.3.0),
- python-ffc (>= 1.3.0),
- python-ufl (>= 1.3.0),
- python-instant (>= 1.3.0),
+Depends: libdolfin1.4-dev (= ${binary:Version}),
+ libdolfin1.4 (= ${binary:Version}),
+ python-ffc (>= 1.4.0),
+ python-ufl (>= 1.4.0),
+ python-instant (>= 1.4.0),
python-numpy,
python-netcdf,
python-ply,
@@ -183,7 +179,7 @@
Package: dolfin-doc
Architecture: all
Section: doc
-Depends: libdolfin1.3-dev (>= ${source:Version}),
+Depends: libdolfin1.4-dev (>= ${source:Version}),
python-dolfin (>= ${source:Version}),
${misc:Depends}
Suggests: cmake (>= 2.8.0)
Modified: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=46695&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series (original)
+++ packages/fenics/dolfin/trunk/debian/patches/series Wed Jun 4 10:19:50 2014
@@ -1,2 +1 @@
CSGCGALMeshGenerator3D-oom.patch
-workaround-boost-error.patch
Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=46695&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Wed Jun 4 10:19:50 2014
@@ -38,7 +38,7 @@
-D CMAKE_SKIP_RPATH:BOOL=ON \
-D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
-D DOLFIN_ENABLE_TRILINOS:BOOL=OFF \
- -D DOLFIN_ENABLE_CGAL:BOOL=$(ENABLE_CGAL) \
+ -D DOLFIN_ENABLE_CGAL:BOOL=ON \
-D DOLFIN_ENABLE_HDF5:BOOL=ON \
-D DOLFIN_ENABLE_VTK:BOOL=ON \
-D DOLFIN_ENABLE_QT:BOOL=ON \
@@ -112,7 +112,7 @@
dh_gencontrol
override_dh_strip:
- dh_strip -a --package=libdolfin1.3 --dbg-package=libdolfin1.3-dbg -Xpython
+ dh_strip -a --package=libdolfin1.4 --dbg-package=libdolfin1.4-dbg -Xpython
dh_strip -a --package=python-dolfin --dbg-package=python-dolfin-dbg
override_dh_installman:
@@ -132,7 +132,6 @@
uscan --force-download --check-dirname-level 0 --destdir "$$TMPDIR" --download-version $(DEB_STRIPPED_UPSTREAM_VERSION) --upstream-version $(DEB_STRIPPED_UPSTREAM_VERSION); \
tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
rm -rf "$$TMPDIR"/demo/undocumented/waveguide/waveguide_TM_cutoff_modes.pdf ; \
- find "$$TMPDIR" -name "*.pyc" | xargs rm ; \
rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
mv "$$TMPDIR" $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
GZIP=-9 tar -czf $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
More information about the debian-science-commits
mailing list