[dune-geometry] 01/04: Switch to CMake.

[Ansgar Burchardt]

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

ansgar pushed a commit to branch master
in repository dune-geometry.

commit d44d190fdf45ba9c4ad3b5ede38cba1eb39059f6
Author: Ansgar Burchardt <Ansgar.Burchardt at tu-dresden.de>
Date:   Mon Nov 21 20:31:05 2016 +0100

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

diff --git a/debian/control b/debian/control
index 274a175..a7894ad 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,9 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/dune-geomet
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/dune-geometry.git
 Homepage: http://www.dune-project.org/
 Build-Depends: debhelper (>= 9),
- automake, autoconf, gfortran, libtool, mpi-default-bin, mpi-default-dev, pkg-config,
  libdune-common-dev (>= 2.4.1)
-Build-Depends-Indep: doxygen, ghostscript, graphviz, texlive-latex-recommended, pgf
+ cmake, gfortran, mpi-default-bin, mpi-default-dev, pkg-config, python3,
+Build-Depends-Indep: doxygen, ghostscript, graphviz, imagemagick, texlive-latex-recommended, pgf
 
 Package: libdune-geometry-dev
 Section: libdevel
diff --git a/debian/libdune-geometry-dev.install b/debian/libdune-geometry-dev.install
index 68f2824..16c9e63 100644
--- a/debian/libdune-geometry-dev.install
+++ b/debian/libdune-geometry-dev.install
@@ -1,8 +1,3 @@
 usr/include
-usr/lib/*/cmake
-usr/lib/*/dunecontrol usr/lib
-usr/lib/*/lib*.a
-usr/lib/*/lib*.so
-usr/lib/*/pkgconfig
-usr/share/dune
+usr/lib
 usr/share/dune-geometry
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 cb1aadc..0000000
--- a/debian/patches/soname.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -10,6 +10,7 @@
- nodist_EXTRA_libdunegeometry_la_SOURCES = dummy.cc
- sourcescheck_DUMMY = dummy.cc
- libdunegeometry_la_LIBADD = ../dune/geometry/libgeometry.la
-+libdunegeometry_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
- 
- include $(top_srcdir)/am/global-rules
- 
diff --git a/debian/rules b/debian/rules
index 2e6f75a..1e3e67c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,18 +3,7 @@
 include /usr/share/dune/dune-debian.mk
 
 %:
-	dh $@ --parallel
-
-override_dh_auto_install-arch:
-	set -e; for d in dune lib m4; do \
-	  $(MAKE) -C $$d install DESTDIR="$(CURDIR)/debian/tmp"; \
-	done
-	$(MAKE) install-data-am install-exec-am DESTDIR="$(CURDIR)/debian/tmp"
-	mkdir doc/doxygen/html
-	$(MAKE) -C doc/doxygen install-data-am DESTDIR="$(CURDIR)/debian/tmp"
-
-override_dh_auto_install-indep:
-	$(MAKE) -C doc install DESTDIR="$(CURDIR)/debian/tmp"
+	dh $@ --parallel --builddirectory=build
 
 override_dh_strip:
 	dh_strip --dbg-package=libdune-geometry-dbg

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