[dolfin] 03/03: Update for 2016.1 release

[Johannes Ring]

This is an automated email from the git hooks/post-receive script.

johannr-guest pushed a commit to branch master
in repository dolfin.

commit 235d3ddc7aac153c843f7555a22c793977db3ac1
Author: Johannes Ring <johannr at simula.no>
Date:   Mon Jul 4 14:12:55 2016 +0200

    Update for 2016.1 release
---
 debian/changelog                                     | 13 +++++++++++++
 debian/control                                       | 20 ++++++++++----------
 ...{libdolfin1.6.install => libdolfin2016.1.install} |  0
 debian/rules                                         |  4 +++-
 4 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c380847..2dc175b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+dolfin (2016.1.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    - Update package names for new SONAME 2016.1 (libdolfin1.6 ->
+      libdolfin2016.1 and libdolfin1.6-dbg -> libdolfin2016.1-dbg).
+    - Bump minimum required version for python-instant, python-ufl and
+      python-ffc to 2016.1.
+  * Move debian/libdolfin1.6.install -> debian/libdolfin2016.1.install.
+  * debian/rules: Add -fpermissive to CXX flags.
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 27 Jun 2016 12:21:01 +0200
+
 dolfin (1.6.0-5) unstable; urgency=medium
 
   * Depends: libpetsc3.6-dev rather than petsc-dev.
diff --git a/debian/control b/debian/control
index cdd34fa..5d4502f 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends:
  libslepc3.6-dev (>= 3.6.3.dfsg1-6) [!kfreebsd-amd64 !kfreebsd-i386],
  pkg-config,
  python-dev,
- python-ffc (>= 1.6.0),
+ python-ffc (>= 2016.1.0),
  python-numpy,
  python-ply,
  swig3.0 (>= 3.0.3)
@@ -57,7 +57,7 @@ Depends:
  libboost-serialization-dev,
  libboost-thread-dev,
  libboost-timer-dev,
- libdolfin1.6 (= ${binary:Version}),
+ libdolfin2016.1 (= ${binary:Version}),
  libeigen3-dev,
  libhdf5-mpi-dev,
  libsuitesparse-dev,
@@ -93,11 +93,11 @@ Description: Shared links and header files for DOLFIN
  .
  This package contains the development files.
 
-Package: libdolfin1.6
+Package: libdolfin2016.1
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Suggests: dolfin-doc, libdolfin1.6-dbg, python-dolfin
+Suggests: dolfin-doc, libdolfin2016.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
@@ -109,10 +109,10 @@ Description: Shared libraries for DOLFIN
  .
  This package contains the shared libraries.
 
-Package: libdolfin1.6-dbg
+Package: libdolfin2016.1-dbg
 Section: debug
 Architecture: any
-Depends: libdolfin1.6 (= ${binary:Version}), ${misc:Depends}
+Depends: libdolfin2016.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
@@ -129,14 +129,14 @@ Section: python
 Architecture: any
 Depends:
  libdolfin-dev (= ${binary:Version}),
- libdolfin1.6 (= ${binary:Version}),
- python-ffc (>= 1.6.0),
- python-instant (>= 1.6.0),
+ libdolfin2016.1 (= ${binary:Version}),
+ python-ffc (>= 2016.1.0),
+ python-instant (>= 2016.1.0),
  python-numpy,
  python-ply,
  python-six,
  python-sympy,
- python-ufl (>= 1.6.0),
+ python-ufl (>= 2016.1.0),
  ${misc:Depends},
  ${python:Depends},
  ${shlibs:Depends},
diff --git a/debian/libdolfin1.6.install b/debian/libdolfin2016.1.install
similarity index 100%
rename from debian/libdolfin1.6.install
rename to debian/libdolfin2016.1.install
diff --git a/debian/rules b/debian/rules
index 454b387..95cfc2f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,7 @@ CMAKE_OPTS := \
 	-D SLEPC_DIR:PATH=$(SLEPSC_DIR) \
 	-D DOLFIN_LIB_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH) \
 	-D DOLFIN_PKGCONFIG_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH)/pkgconfig \
+	-D CMAKE_CXX_FLAGS:STRING="-fpermissive" \
 	$(DOLFIN_HOME)
 
 ifeq (,$(DISTRIBUTION))
@@ -109,6 +110,7 @@ override_dh_auto_install:
 	sed -i "s/-Wno-deprecated//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 	sed -i "s|-I/usr/local/include||g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 	sed -i "s|-DNDEBUG||g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
+	sed -i "s/-Wdate-time//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 
 override_dh_gencontrol:
 	# We have a tight dependency on swig - #675207
@@ -119,7 +121,7 @@ override_dh_gencontrol:
 	dh_gencontrol
 
 override_dh_strip:
-	dh_strip -a --package=libdolfin1.6 --dbg-package=libdolfin1.6-dbg -Xpython
+	dh_strip -a --package=libdolfin2016.1 --dbg-package=libdolfin2016.1-dbg -Xpython
 	dh_strip -a --package=python-dolfin --dbg-package=python-dolfin-dbg
 
 override_dh_installman:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/dolfin.git