r46911 - in /packages/fenics/dolfin/trunk/debian: changelog control libdolfin-dev.lintian-overrides rules

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Tue Sep 23 10:20:33 2014
New Revision: 46911

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46911
Log:
* debian/control: Disable libcgal-dev on i386, mipsel and sparc.
* debian/rules: Remove bad directives in pkg-config file dolfin.pc.
* Remove debian/libdolfin-dev.lintian-overrides.


Removed:
    packages/fenics/dolfin/trunk/debian/libdolfin-dev.lintian-overrides
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=46911&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Tue Sep 23 10:20:33 2014
@@ -1,3 +1,12 @@
+dolfin (1.4.0+dfsg-4) unstable; urgency=medium
+
+  * debian/control: Disable libcgal-dev on i386, mipsel and sparc.
+  * debian/rules: Remove bad directives in pkg-config file dolfin.pc
+    (closes: #760658).
+  * Remove debian/libdolfin-dev.lintian-overrides.
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 22 Sep 2014 14:35:34 +0200
+
 dolfin (1.4.0+dfsg-3) unstable; urgency=medium
 
   * debian/rules: Enable MPI on mips(el) and sparc (closes: #759182).

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=46911&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control	(original)
+++ packages/fenics/dolfin/trunk/debian/control	Tue Sep 23 10:20:33 2014
@@ -23,7 +23,7 @@
  libsuitesparse-dev,
  libpetsc3.4.2-dev [!armel !arm64 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libslepc3.4.2-dev [!armel !arm64 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
- libcgal-dev [!armel !armhf !mips !hurd-i386 !kfreebsd-i386],
+ libcgal-dev [!armel !armhf !mips !hurd-i386 !kfreebsd-i386 !mipsel !sparc !i386],
  libhdf5-mpi-dev,
  libvtk5-dev,
  libvtk5-qt4-dev,
@@ -57,7 +57,7 @@
  libpetsc3.4.2-dev [!armel !arm64 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libslepc3.4.2-dev [!armel !arm64 !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  cmake (>= 2.8.0),
- libcgal-dev [!armel !armhf !mips !hurd-i386 !kfreebsd-i386],
+ libcgal-dev [!armel !armhf !mips !hurd-i386 !kfreebsd-i386 !mipsel !sparc !i386],
  libhdf5-mpi-dev,
  libvtk5-dev,
  libvtk5-qt4-dev,

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=46911&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules	(original)
+++ packages/fenics/dolfin/trunk/debian/rules	Tue Sep 23 10:20:33 2014
@@ -97,6 +97,12 @@
 	   dh_auto_install --builddirectory=$(BUILDDIR)-$$v; \
 	done
 	dh_numpy
+	sed -i "s/-Werror=format-security//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
+	sed -i "s/-g -O2//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
+	sed -i "s/-D_FORTIFY_SOURCE=2//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
+	sed -i "s/-frounding-math//g" $(CURDIR)/debian/tmp/usr/lib/$(DEB_BUILD_MULTIARCH)/pkgconfig/dolfin.pc
+	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
 
 override_dh_gencontrol:
 	# We have a tight dependency on swig - #675207