r46583 - in /packages/fenics/dolfin/trunk/debian: changelog control libdolfin1.3-dev.install libdolfin1.3.install patches/series patches/workaround-boost-error.patch rules

johannr-guest at users.alioth.debian.org johannr-guest at users.alioth.debian.org
Thu Feb 27 12:50:46 UTC 2014 

Author: johannr-guest
Date: Thu Feb 27 12:50:46 2014
New Revision: 46583

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46583
Log:
* debian/control:
  - Disable libcgal-dev on armhf and mips since it requires
    unreasonable amounts of memory (closes: 739697).
  - Disable libpetsc3.4.2-dev and libslepc3.4.2-dev on hurd-i386 since
    they are not available on this architecture.
* Add patch to workaround bug in boost (thanks to Peter Green).
* Use DEB_BUILD_MULTIARCH when installing the DOLFIN library and
  pkg-config file.


Added:
    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/libdolfin1.3-dev.install
    packages/fenics/dolfin/trunk/debian/libdolfin1.3.install
    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=46583&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog	(original)
+++ packages/fenics/dolfin/trunk/debian/changelog	Thu Feb 27 12:50:46 2014
@@ -1,3 +1,16 @@
+dolfin (1.3.0+dfsg-2) unstable; urgency=medium
+
+  * debian/control:
+    - Disable libcgal-dev on armhf and mips since it requires
+      unreasonable amounts of memory (closes: 739697).
+    - Disable libpetsc3.4.2-dev and libslepc3.4.2-dev on hurd-i386 since
+      they are not available on this architecture.
+  * Add patch to workaround bug in boost (thanks to Peter Green).
+  * Use DEB_BUILD_MULTIARCH when installing the DOLFIN library and
+    pkg-config file.
+
+ -- Johannes Ring <johannr at simula.no>  Wed, 26 Feb 2014 12:23:11 +0100
+
 dolfin (1.3.0+dfsg-1) unstable; urgency=medium
 
   * New upstream release.

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=46583&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control	(original)
+++ packages/fenics/dolfin/trunk/debian/control	Thu Feb 27 12:50:46 2014
@@ -24,10 +24,10 @@
  ufc (>= 2.3.0),
  python-ufc (>= 2.3.0),
  libptscotch-dev,
- libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386],
- libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386],
+ libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
+ libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
  libarmadillo-dev,
- libcgal-dev [!armel],
+ libcgal-dev [!armel !armhf !mips],
  libhdf5-mpi-dev,
  libvtk5-dev,
  libvtk5-qt4-dev,
@@ -58,13 +58,13 @@
  libboost-chrono-dev,
  libsuitesparse-dev,
  libptscotch-dev,
- libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386],
- libslepc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386],
+ libpetsc3.4.2-dev [!armel !kfreebsd-amd64 !kfreebsd-i386 !hurd-i386],
+ 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],
+ libcgal-dev [!armel !armhf !mips],
  libhdf5-mpi-dev,
  libvtk5-dev,
  libvtk5-qt4-dev,

Modified: packages/fenics/dolfin/trunk/debian/libdolfin1.3-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/libdolfin1.3-dev.install?rev=46583&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/libdolfin1.3-dev.install	(original)
+++ packages/fenics/dolfin/trunk/debian/libdolfin1.3-dev.install	Thu Feb 27 12:50:46 2014
@@ -1,4 +1,5 @@
-usr/lib/*.so
+usr/lib/**/*.so
 usr/include/dolfin
 usr/include/dolfin.h
+usr/lib/**/pkgconfig/dolfin.pc
 usr/share/dolfin/cmake

Modified: packages/fenics/dolfin/trunk/debian/libdolfin1.3.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/libdolfin1.3.install?rev=46583&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/libdolfin1.3.install	(original)
+++ packages/fenics/dolfin/trunk/debian/libdolfin1.3.install	Thu Feb 27 12:50:46 2014
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/**/lib*.so.*

Modified: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=46583&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series	(original)
+++ packages/fenics/dolfin/trunk/debian/patches/series	Thu Feb 27 12:50:46 2014
@@ -1 +1,2 @@
 CSGCGALMeshGenerator3D-oom.patch
+workaround-boost-error.patch

Added: packages/fenics/dolfin/trunk/debian/patches/workaround-boost-error.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/workaround-boost-error.patch?rev=46583&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/workaround-boost-error.patch	(added)
+++ packages/fenics/dolfin/trunk/debian/patches/workaround-boost-error.patch	Thu Feb 27 12:50:46 2014
@@ -0,0 +1,40 @@
+Description: Workaround compile error with boost by including stdint.h
+ I got a build failure with the error
+ 
+ In file included from /usr/include/boost/atomic.hpp:12:0,
+                  from /usr/include/boost/thread/pthread/once_atomic.hpp:20,
+                  from /usr/include/boost/thread/once.hpp:20,
+                  from /usr/include/boost/thread.hpp:17,
+                  from /dolfin-1.3.0+dfsg/dolfin/log/Logger.cpp:32:
+ /usr/include/boost/atomic/atomic.hpp:202:16: error: ‘uintptr_t’ was not declared in this scope
+ /usr/include/boost/atomic/atomic.hpp:202:25: error: template argument 1 is invalid
+ /usr/include/boost/atomic/atomic.hpp:202:43: error: invalid type in declaration before ‘;’ token
+ 
+ From some googling it seemed the workaround was to include stdint.h before
+ including the boost headers, so I did that.
+Author: Peter Michael Green <plugwash at debian.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- dolfin-1.3.0+dfsg.orig/dolfin/log/Logger.cpp
++++ dolfin-1.3.0+dfsg/dolfin/log/Logger.cpp
+@@ -29,6 +29,8 @@
+ #include <stdexcept>
+ #include <string>
+ 
++#include <stdint.h>
++
+ #include <boost/thread.hpp>
+ #include <boost/bind.hpp>
+ #include <boost/date_time/posix_time/posix_time.hpp>

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=46583&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules	(original)
+++ packages/fenics/dolfin/trunk/debian/rules	Thu Feb 27 12:50:46 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=ON \
+	-D DOLFIN_ENABLE_CGAL:BOOL=$(ENABLE_CGAL) \
 	-D DOLFIN_ENABLE_HDF5:BOOL=ON \
 	-D DOLFIN_ENABLE_VTK:BOOL=ON \
 	-D DOLFIN_ENABLE_QT:BOOL=ON \
@@ -49,6 +49,8 @@
         -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 DOLFIN_LIB_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH) \
+	-D DOLFIN_PKGCONFIG_DIR:PATH=lib/$(DEB_BUILD_MULTIARCH)/pkgconfig \
 	$(DOLFIN_HOME)
 
 ifeq (,$(DISTRIBUTION))

More information about the debian-science-commits mailing list