[dune-pdelab] 02/03: Switch to CMake.

[Ansgar Burchardt]

This is an automated email from the git hooks/post-receive script.

ansgar pushed a commit to annotated tag debian/2.5.0_20161204gdb53a76-1
in repository dune-pdelab.

commit 2c633874ea3e65294a667c9efabcf74ef8a7195a
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Tue Dec 6 01:50:03 2016 +0100

    Switch to CMake.
---
 debian/control                    |  4 ++--
 debian/libdune-pdelab-dev.install |  6 +-----
 debian/patches/series             |  1 -
 debian/patches/soname.patch       | 13 -------------
 debian/rules                      |  6 +-----
 5 files changed, 4 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 5e553e6..ff19e65 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/dune-pdelab
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/dune-pdelab.git
 Homepage: http://www.dune-project.org/pdelab/
 Build-Depends: debhelper (>= 9),
- automake, autoconf, gfortran, libtool, mpi-default-bin, mpi-default-dev, pkg-config,
+ cmake, gfortran, mpi-default-bin, mpi-default-dev, pkg-config, python3,
  libdune-grid-dev (>= 2.5.0~rc2),
  libdune-istl-dev (>= 2.5.0~rc2),
  libdune-localfunctions-dev (>= 2.5.0~rc2),
@@ -17,7 +17,7 @@ Build-Depends: debhelper (>= 9),
  libalberta2-dev (>= 2.0.1-5),
  libgmp-dev,
  libsuperlu-dev | libsuperlu3-dev
-Build-Depends-Indep: doxygen, ghostscript, graphviz, texlive-latex-recommended, pgf
+Build-Depends-Indep: doxygen, ghostscript, graphviz, imagemagick, texlive-latex-recommended, pgf
 
 Package: libdune-pdelab-dev
 Section: libdevel
diff --git a/debian/libdune-pdelab-dev.install b/debian/libdune-pdelab-dev.install
index 0809d53..d346090 100644
--- a/debian/libdune-pdelab-dev.install
+++ b/debian/libdune-pdelab-dev.install
@@ -1,8 +1,4 @@
 usr/include
-usr/lib/*/cmake
-usr/lib/*/dunecontrol usr/lib
-usr/lib/*/lib*.a
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig
+usr/lib
 usr/share/dune
 usr/share/dune-pdelab
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4db24c4..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-soname.patch
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
deleted file mode 100644
index f44b3f4..0000000
--- a/debian/patches/soname.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-From: Ansgar Burchardt <ansgar at debian.org>
-Subject: set soname
-
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -8,6 +8,7 @@
- nodist_EXTRA_libdunepdelab_la_SOURCES = dummy.cc
- sourcescheck_DUMMY = dummy.cc
- libdunepdelab_la_LIBADD = ../dune/pdelab/common/libpdelabcommon.la
-+libdunepdelab_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
- 
- include $(top_srcdir)/am/global-rules
- 
diff --git a/debian/rules b/debian/rules
index cec58fa..2f95a4c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,6 @@
 #! /usr/bin/make -f
 
 include /usr/share/dune/dune-debian.mk
-export DEB_CXXFLAGS_MAINT_APPEND = -fpermissive
-
-# https://dune-project.org/flyspray/index.php?do=details&task_id=1414
-DUNE_DEBIAN_CONFIGURE_FLAGS += DUNE_GRID_ROOT=/usr
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --builddirectory=build

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-pdelab.git