[dune-grid-glue] 01/06: Switch to CMake.
Ansgar Burchardt
ansgar at moszumanska.debian.org
Tue Dec 6 19:13:57 UTC 2016
This is an automated email from the git hooks/post-receive script.
ansgar pushed a commit to annotated tag debian/2.5.0_20161206g666200e-1
in repository dune-grid-glue.
commit 5fa9c7b91ede984355da663360c1e03bf92ac4c0
Author: Ansgar Burchardt <ansgar at debian.org>
Date: Tue Dec 6 19:45:07 2016 +0100
Switch to CMake.
---
debian/control | 4 ++--
debian/libdune-grid-glue-dev.install | 6 +-----
debian/patches/series | 1 -
debian/patches/soname.patch | 10 ----------
debian/rules | 2 +-
5 files changed, 4 insertions(+), 19 deletions(-)
diff --git a/debian/control b/debian/control
index e3ba130..0f4e969 100644
--- a/debian/control
+++ b/debian/control
@@ -8,11 +8,11 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/dune-grid-g
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/dune-grid-glue.git
Homepage: http://www.dune-project.org/modules/dune-grid-glue/
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-common-dev (>= 2.4~20150912rc3),
libdune-grid-dev (>= 2.4~20150912rc3),
libpsurface-dev
-Build-Depends-Indep: doxygen, graphviz
+Build-Depends-Indep: doxygen, graphviz, imagemagick
Package: libdune-grid-glue-dev
Section: libdevel
diff --git a/debian/libdune-grid-glue-dev.install b/debian/libdune-grid-glue-dev.install
index 64daa5e..97c07ad 100644
--- a/debian/libdune-grid-glue-dev.install
+++ b/debian/libdune-grid-glue-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-grid-glue
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 7c81eb0..0000000
--- a/debian/patches/soname.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -5,6 +5,7 @@
- libdunegridglue_la_CPPFLAGS = $(AM_CPPFLAGS) $(PSURFACE_CPPFLAGS)
- libdunegridglue_la_LDFLAGS = $(AM_LDFLAGS) $(PSURFACE_LDFLAGS) $(AMIRAMESH_LDFLAGS)
- libdunegridglue_la_LIBADD = $(DUNE_LIBS) $(PSURFACE_LIBS) $(AMIRAMESH_LIBS)
-+libdunegridglue_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
-
- # ../dune/grid-glue/merging/conformingmerge.cc
-
diff --git a/debian/rules b/debian/rules
index 0ebe49f..c3f8b26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
include /usr/share/dune/dune-debian.mk
%:
- dh $@ --parallel
+ dh $@ --parallel --builddirectory=build
override_dh_strip:
dh_strip --dbg-package=libdune-grid-glue-dbg
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-grid-glue.git
More information about the debian-science-commits
mailing list