r47155 - in /packages/fenics/dolfin/trunk/debian: changelog control libdolfin1.5.install libdolfin1.6.install patches/ rules

johannr-guest at users.alioth.debian.org johannr-guest at users.alioth.debian.org
Wed Oct 28 10:13:35 UTC 2015 

Author: johannr-guest
Date: Wed Oct 28 10:13:35 2015
New Revision: 47155

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47155
Log:
* New upstream release.
* debian/control:
  - Add gfortran to build dependencies.
  - Update package names for new SONAME 1.6 (libdolfin1.5 ->
    libdolfin1.6 and libdolfin1.5-dbg -> libdolfin1.6-dbg).
  - Bump minimum required version for python-instant, python-ufl and
    python-ffc to 1.6.0.
  - Require swig3.0 (>= 3.0.3) in Build-Depends.
* Move debian/libdolfin1.5.install -> debian/libdolfin1.6.install.
* Remove patch for fixing problem with Python 2.7.10 (fixed upstream).
* debian/rules:
  - Replace swig with swig3.0.
  - Set PETSC_DIR to /usr/lib/petsc and SLEPC_DIR to /usr/lib/slepc.
		    

Added:
    packages/fenics/dolfin/trunk/debian/libdolfin1.6.install
      - copied unchanged from r47154, packages/fenics/dolfin/trunk/debian/libdolfin1.5.install
Removed:
    packages/fenics/dolfin/trunk/debian/libdolfin1.5.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=47155&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Wed Oct 28 10:13:35 2015
@@ -1,3 +1,21 @@
+dolfin (1.6.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * debian/control:
+    - Add gfortran to build dependencies.
+    - Update package names for new SONAME 1.6 (libdolfin1.5 ->
+      libdolfin1.6 and libdolfin1.5-dbg -> libdolfin1.6-dbg).
+    - Bump minimum required version for python-instant, python-ufl and
+      python-ffc to 1.6.0.
+    - Require swig3.0 (>= 3.0.3) in Build-Depends.
+  * Move debian/libdolfin1.5.install -> debian/libdolfin1.6.install.
+  * Remove patch for fixing problem with Python 2.7.10 (fixed upstream).
+  * debian/rules:
+    - Replace swig with swig3.0.
+    - Set PETSC_DIR to /usr/lib/petsc and SLEPC_DIR to /usr/lib/slepc.
+
+ -- Johannes Ring <johannr at simula.no>  Wed, 28 Oct 2015 09:41:00 +0100
+
 dolfin (1.5.0-4) unstable; urgency=medium
 
   * debian/control: Enable libpetsc3.2-dev and libslepc3.2-dev on

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=47155&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control	(original)
+++ packages/fenics/dolfin/trunk/debian/control	Wed Oct 28 10:13:35 2015
@@ -6,7 +6,7 @@
 Build-Depends: debhelper (>= 9),
  python-dev,
  cmake (>= 2.8.0),
- swig,
+ swig3.0 (>= 3.0.3),
  python-numpy,
  pkg-config,
  libxml2-dev,
@@ -21,15 +21,16 @@
  libboost-timer-dev,
  libboost-chrono-dev,
  libsuitesparse-dev,
- libpetsc3.4.2-dev [!kfreebsd-amd64 !kfreebsd-i386],
- libslepc3.4.2-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libpetsc3.6.2-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libslepc3.6.1-dev [!kfreebsd-amd64 !kfreebsd-i386],
  libhdf5-mpi-dev,
  libvtk5-dev,
  libvtk5-qt4-dev,
  libqt4-dev,
  python-ply,
  libeigen3-dev,
- python-ffc (>= 1.5.0),
+ python-ffc (>= 1.6.0),
+ gfortran,
  dh-python
 Standards-Version: 3.9.6
 X-Python-Version: >= 2.7
@@ -40,7 +41,7 @@
 Package: libdolfin-dev
 Section: libdevel
 Architecture: any
-Depends: libdolfin1.5 (= ${binary:Version}),
+Depends: libdolfin1.6 (= ${binary:Version}),
  libxml2-dev,
  pkg-config,
  libboost-dev,
@@ -54,8 +55,8 @@
  libboost-timer-dev,
  libboost-chrono-dev,
  libsuitesparse-dev,
- libpetsc3.4.2-dev [!kfreebsd-amd64 !kfreebsd-i386],
- libslepc3.4.2-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libpetsc3.6.2-dev [!kfreebsd-amd64 !kfreebsd-i386],
+ libslepc3.6.1-dev [!kfreebsd-amd64 !kfreebsd-i386],
  cmake (>= 2.8.0),
  libhdf5-mpi-dev,
  libvtk5-dev,
@@ -76,11 +77,11 @@
  .
  This package contains the development files.
 
-Package: libdolfin1.5
+Package: libdolfin1.6
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: dolfin-doc, libdolfin1.5-dbg, python-dolfin
+Suggests: dolfin-doc, libdolfin1.6-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
@@ -92,10 +93,10 @@
  .
  This package contains the shared libraries.
 
-Package: libdolfin1.5-dbg
+Package: libdolfin1.6-dbg
 Section: debug
 Architecture: any
-Depends: libdolfin1.5 (= ${binary:Version}), ${misc:Depends}
+Depends: libdolfin1.6 (= ${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
@@ -111,10 +112,10 @@
 Section: python
 Architecture: any
 Depends: libdolfin-dev (= ${binary:Version}),
- libdolfin1.5 (= ${binary:Version}),
- python-ffc (>= 1.5.0),
- python-ufl (>= 1.5.0),
- python-instant (>= 1.5.0),
+ libdolfin1.6 (= ${binary:Version}),
+ python-ffc (>= 1.6.0),
+ python-ufl (>= 1.6.0),
+ python-instant (>= 1.6.0),
  python-numpy,
  python-netcdf,
  python-ply,

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=47155&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules	(original)
+++ packages/fenics/dolfin/trunk/debian/rules	Wed Oct 28 10:13:35 2015
@@ -40,8 +40,8 @@
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
 	-D SWIG_EXECUTABLE:FILEPATH=/usr/bin/swig \
         -D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \
-	-D PETSC_DIR:PATH=/usr/lib/petscdir/3.4.2 \
-	-D SLEPC_DIR:PATH=/usr/lib/slepcdir/3.4.2 \
+	-D PETSC_DIR:PATH=/usr/lib/petsc \
+	-D SLEPC_DIR:PATH=/usr/lib/slepc \
 	-D DOLFIN_LIB_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH) \
 	-D DOLFIN_PKGCONFIG_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH)/pkgconfig \
 	$(DOLFIN_HOME)
@@ -102,17 +102,18 @@
 	sed -i "s/-Wformat//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
 	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
 
 override_dh_gencontrol:
 	# We have a tight dependency on swig - #675207
 	set -e; \
-	swig_version=$$(dpkg-query -W swig | cut -f 2 | cut -d- -f 1); \
+	swig_version=$$(dpkg-query -W swig3.0 | cut -f 2 | cut -d- -f 1); \
 	next_swig_version="$${swig_version%.*}.$$(($${swig_version##*.} + 1))"; \
-	echo "swig:Depends=swig (>= $$swig_version), swig (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
+	echo "swig:Depends=swig3.0 (>= $$swig_version), swig3.0 (<< $$next_swig_version~)" >> debian/python-dolfin.substvars
 	dh_gencontrol
 
 override_dh_strip:
-	dh_strip -a --package=libdolfin1.5 --dbg-package=libdolfin1.5-dbg -Xpython
+	dh_strip -a --package=libdolfin1.6 --dbg-package=libdolfin1.6-dbg -Xpython
 	dh_strip -a --package=python-dolfin --dbg-package=python-dolfin-dbg
 
 override_dh_installman:

More information about the debian-science-commits mailing list