r44576 - in /packages/fenics/dolfin/trunk/debian: changelog control rules

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

Author: johannr-guest
Date: Tue Mar 20 10:46:18 2012
New Revision: 44576

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44576
Log:
Enable CGAL now that it is in main.

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=44576&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Tue Mar 20 10:46:18 2012
@@ -1,8 +1,10 @@
-dolfin (1.0.0-4) UNRELEASED; urgency=low
+dolfin (1.0.0-4) unstable; urgency=low
 
   * debian/watch: Replace http with https in URL.
-
- -- Johannes Ring <johannr at simula.no>  Tue, 14 Feb 2012 17:01:57 +0100
+  * debian/control: Add libcgal-dev to Build-Depends and Depends for
+    binary package libdolfin1.0-dev.
+
+ -- Johannes Ring <johannr at simula.no>  Tue, 20 Mar 2012 11:43:44 +0100
 
 dolfin (1.0.0-3) unstable; urgency=low
 

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=44576&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Tue Mar 20 10:46:18 2012
@@ -25,7 +25,8 @@
  libptscotch-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
  libpetsc3.2-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
  libslepc3.2-dev [!armel !armhf !kfreebsd-amd64 !kfreebsd-i386 !s390x],
- libarmadillo-dev
+ libarmadillo-dev,
+ libcgal-dev
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.5
 Homepage: http://fenicsproject.org
@@ -55,6 +56,7 @@
  cmake (>= 2.8.0),
  ufc (>= 2.0.5),
  python-ufc (>= 2.0.5),
+ libcgal-dev,
  ${misc:Depends}
 Conflicts: libdolfin0-dev
 Replaces: libdolfin0-dev

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=44576&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Tue Mar 20 10:46:18 2012
@@ -30,7 +30,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=OFF \
+	-D DOLFIN_ENABLE_CGAL:BOOL=ON \
 	-D DOLFIN_ENABLE_MTL4:BOOL=OFF \
 	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
 	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \