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

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

Author: johannr-guest
Date: Tue Apr 27 12:58:45 2010
New Revision: 36426

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36426
Log:
Revert back to 36424 (building with CGAL 3.6 fails with DOLFIN 0.9.7).

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    packages/fenics/dolfin/trunk/debian/copyright
    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=36426&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Tue Apr 27 12:58:45 2010
@@ -8,12 +8,8 @@
       python-viper (closes: #571780).
     - Replace libscotch-dev with libptscotch-dev in Build-Depends and in
       Depends for binary package libdolfin0-dev.
-    - Add libcgal-dev and libparmetis-dev to Build-Depends and Depends for
-      binary package libdolfin0-dev. This moves dolfin from main to contrib.
   * Add configure target to cdbs tweaks for scons.
   * Rename binary package python-pydolfin0 to python-dolfin.
-  * debian/rules: Enable building with ParMETIS and CGAL.
-  * debian/copyright: Add disclaimer about dolfin now in contrib.
 
  -- Johannes Ring <johannr at simula.no>  Mon, 29 Mar 2010 20:42:07 +0200
 

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=36426&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Tue Apr 27 12:58:45 2010
@@ -1,5 +1,5 @@
 Source: dolfin
-Section: contrib/math
+Section: math
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Johannes Ring <johannr at simula.no>
@@ -7,8 +7,7 @@
  python-central (>= 0.5.6), scons, swig (>= 1.3.35), python-numpy, pkg-config,
  libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
  python-ufc (>= 1.4.0-2), libptscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev,
- libboost-filesystem-dev, libboost-program-options-dev, libcgal-dev,
- libparmetis-dev
+ libboost-filesystem-dev, libboost-program-options-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
  texlive-math-extra, ghostscript
 Standards-Version: 3.8.4
@@ -19,7 +18,7 @@
 Vcs-Browser: http://svn.debian.org/wsvn/debian-science/packages/dolfin/trunk
 
 Package: libdolfin0-dev
-Section: contrib/libdevel
+Section: libdevel
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Conflicts: libdolfin-dev
@@ -29,7 +28,7 @@
  libboost-dev, libboost-program-options-dev, libboost-filesystem-dev,
  libboost-serialization-dev, libsuitesparse-dev, python-dev, python-numpy,
  libptscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev, python-ufl,
- libcgal-dev, libparmetis-dev, ${misc:Depends}
+ ${misc:Depends}
 Description: Shared links and header files for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
  (Problem Solving Environment) for ordinary and partial differential equations.
@@ -37,7 +36,7 @@
  This package contains the development files.
 
 Package: dolfin-dev
-Section: contrib/libdevel
+Section: libdevel
 Architecture: all
 XB-Python-Version: ${python:Versions}
 Depends: libdolfin0-dev, ${misc:Depends}
@@ -49,7 +48,7 @@
  (X=version), so if you install it then you will get upgrades automatically.
 
 Package: libdolfin0
-Section: contrib/libs
+Section: libs
 Architecture: any
 Conflicts: libdolfin
 Replaces: libdolfin
@@ -64,7 +63,7 @@
  This package contains the shared libraries.
 
 Package: libdolfin0-dbg
-Section: contrib/debug
+Section: debug
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Conflicts: libdolfin-dbg
@@ -78,7 +77,7 @@
  This package contains the shared libraries with debugging symbols.
 
 Package: python-dolfin
-Section: contrib/python
+Section: python
 Architecture: any
 XB-Python-Version: ${python:Versions}
 Conflicts: python-pydolfin0
@@ -97,7 +96,7 @@
 Package: dolfin-doc
 Architecture: all
 XB-Python-Version: ${python:Versions}
-Section: contrib/doc
+Section: doc
 Depends: libdolfin0-dev (>= ${source:Version}),
  python-dolfin (>= ${source:Version}), ${misc:Depends}
 Suggests: scons

Modified: packages/fenics/dolfin/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/copyright?rev=36426&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/copyright (original)
+++ packages/fenics/dolfin/trunk/debian/copyright Tue Apr 27 12:58:45 2010
@@ -3,10 +3,6 @@
 Maintainer: dolfin at lists.launchpad.net
 	http://www.fenics.org/wiki/DOLFIN
 Source: http://launchpad.net/dolfin
-Disclaimer: This package is not part of the main Debian GNU/Linux
-	    distribution, but uploaded to the contrib section. This is
-	    because it depends on non-free packages (CGAL and
-	    ParMETIS).
 
 Copyright: 2002-2010, Anders Logg <logg at simula.no>
 	   2004-2010, Garth N. Wells <gnw20 at cam.ac.uk>

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=36426&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Tue Apr 27 12:58:45 2010
@@ -39,9 +39,9 @@
 	enableDemos=0 \
 	enableTests=0 \
 	enablePython=1 \
-	enableParmetis=1 \
+	enableParmetis=0 \
 	enableMtl4=0 \
-	enableCgal=1
+	enableCgal=0
 
 DEB_SCONS_BUILD_OPTIONS = $(NJOBS)