[mshr] 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 mshr.

commit 2f6f7ca485b7f957519e5f550b421bd8a89354fd
Author: Johannes Ring <johannr at simula.no>
Date:   Mon Jul 4 14:19:50 2016 +0200

    Update for 2016.1 release
---
 debian/changelog                                   | 16 +++++++++++++
 debian/control                                     | 26 ++++++++++++----------
 .../{libmshr1.6.install => libmshr2016.1.install}  |  0
 debian/patches/build_cgal_component_library        | 13 -----------
 debian/patches/series                              |  1 -
 debian/rules                                       |  1 +
 6 files changed, 31 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6a58a8d..b0d5c74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+mshr (2016.1.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    - Update package name for new SONAME 2016.1 (libmshr1.6 ->
+      libmshr2016.1).
+    - Bump minimum required version of libdolfin-dev, python-ffc,
+      python-dolfin and dolfin-bin from 1.6.0 to 2016.1.0.
+    - Add libproj-dev to Build-Depends and to Depends for binary package
+      libmshr-dev.
+  * Move debian/libmshr1.6.install -> debian/libmshr2016.1.install.
+  * Remove patch (fixed upstream).
+  * debian/rules: Add -fpermissive to CXX flags.
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 27 Jun 2016 18:43:46 +0200
+
 mshr (1.6.0-1) unstable; urgency=low
 
   [ Johannes Ring ]
diff --git a/debian/control b/debian/control
index d63fd9a..de4a601 100644
--- a/debian/control
+++ b/debian/control
@@ -10,16 +10,17 @@ Build-Depends: debhelper (>= 9),
  swig3.0 (>= 3.0.3),
  libmpfr-dev,
  libgmp-dev,
- libdolfin-dev (>= 1.6.0),
- python-ffc (>= 1.6.0),
- python-numpy
+ libdolfin-dev (>= 2016.1.0),
+ python-ffc (>= 2016.1.0),
+ python-numpy,
+ libproj-dev
 Standards-Version: 3.9.8
 X-Python-Version: >= 2.5
 Homepage: http://fenicsproject.org
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/fenics/mshr.git/
 Vcs-Browser: https://anonscm.debian.org/git/debian-science/packages/fenics/mshr.git/
 
-Package: libmshr1.6
+Package: libmshr2016.1
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -33,10 +34,11 @@ Description: Shared libraries for mshr
 Package: libmshr-dev
 Section: libdevel
 Architecture: any
-Depends: libmshr1.6 (= ${binary:Version}),
- libdolfin-dev (>= 1.6.0),
- python-ffc (>= 1.6.0),
+Depends: libmshr2016.1 (= ${binary:Version}),
+ libdolfin-dev (>= 2016.1.0),
+ python-ffc (>= 2016.1.0),
  cmake (>= 2.8.0),
+ libproj-dev,
  ${shlibs:Depends}, 
  ${misc:Depends}
 Description: Shared links and header files for mshr
@@ -50,9 +52,9 @@ Package: python-mshr
 Section: python
 Architecture: any
 Depends: libmshr-dev (= ${binary:Version}),
- libmshr1.6 (= ${binary:Version}),
- python-dolfin (>= 1.6.0),
- dolfin-bin (>= 1.6.0),
+ libmshr2016.1 (= ${binary:Version}),
+ python-dolfin (>= 2016.1.0),
+ dolfin-bin (>= 2016.1.0),
  ${swig:Depends},
  ${python:Depends},
  ${shlibs:Depends}, 
@@ -69,8 +71,8 @@ Section: doc
 Architecture: all
 Depends: libmshr-dev (>= ${source:Version}),
  python-mshr (>= ${source:Version}),
- libdolfin-dev (>= 1.6.0),
- python-dolfin (>= 1.6.0),
+ libdolfin-dev (>= 2016.1.0),
+ python-dolfin (>= 2016.1.0),
  ${shlibs:Depends}, 
  ${misc:Depends}
 Description: Examples and demo programs for mshr
diff --git a/debian/libmshr1.6.install b/debian/libmshr2016.1.install
similarity index 100%
rename from debian/libmshr1.6.install
rename to debian/libmshr2016.1.install
diff --git a/debian/patches/build_cgal_component_library b/debian/patches/build_cgal_component_library
deleted file mode 100644
index 4b4116a..0000000
--- a/debian/patches/build_cgal_component_library
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: mshr/3rdparty/CGAL-4.6/src/CMakeLists.txt
-===================================================================
---- mshr.orig/3rdparty/CGAL-4.6/src/CMakeLists.txt
-+++ mshr/3rdparty/CGAL-4.6/src/CMakeLists.txt
-@@ -118,7 +118,7 @@ foreach(package ${CGAL_CONFIGURED_PACKAG
-   file(GLOB CONFIGURED_LIBS_IN_PACKAGE ${package}/src/CGAL_*/CMakeLists.txt)
-   foreach (libconfigfile ${CONFIGURED_LIBS_IN_PACKAGE})
-     string(REPLACE "${package}/src/" "" libconfigfile ${libconfigfile})
--    string(REPLACE "//CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
-+    string(REPLACE "/CMakeLists.txt" "" CGAL_CONFIGURED_LIBRARY_NAME ${libconfigfile})
-     if (NOT ${CGAL_CONFIGURED_LIBRARY_NAME} STREQUAL "CGAL")
- 
-      message(STATUS "Sources for CGAL component library '${CGAL_CONFIGURED_LIBRARY_NAME}' detected")
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9513b6b..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-build_cgal_component_library
diff --git a/debian/rules b/debian/rules
index 1d4729e..80b7481 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,7 @@ CMAKE_OPTS := \
 	-D CMAKE_SKIP_RPATH:BOOL=ON \
 	-D CMAKE_INSTALL_RPATH_USE_LINK_PATH:BOOL=OFF \
 	-D INSTALL_LIB_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH) \
+	-D CMAKE_CXX_FLAGS:STRING="-fpermissive" \
 	$(MSHR_HOME)
 
 ifeq (,$(DISTRIBUTION))

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