[dune-typetree] 01/03: dune-typetree no longer builds a library.

Ansgar Burchardt ansgar at moszumanska.debian.org
Sun Sep 13 13:05:06 UTC 2015


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

ansgar pushed a commit to annotated tag debian/2.4.20150908g46779ad-1
in repository dune-typetree.

commit 83759808d1986d3860abbad16eca284eaf5dd699
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Sun Sep 13 14:51:25 2015 +0200

    dune-typetree no longer builds a library.
    
    It is now just a pure header library.
---
 debian/control                                |  5 ++---
 debian/libdune-typetree-dev.install           |  6 +-----
 debian/libdune-typetree-dev.lintian-overrides |  5 -----
 debian/patches/series                         |  1 -
 debian/patches/soname.patch                   | 13 -------------
 debian/rules                                  | 12 +-----------
 6 files changed, 4 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index 27cf1fe..9c560f1 100644
--- a/debian/control
+++ b/debian/control
@@ -14,11 +14,10 @@ Build-Depends-Indep: doxygen, ghostscript, graphviz, texlive-latex-recommended,
 
 Package: libdune-typetree-dev
 Section: libdevel
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends},
+Architecture: all
+Depends: ${misc:Depends},
  libdune-common-dev (>= 2.4~20150825rc2)
 Suggests: libdune-typetree-doc (= ${source:Version})
-Provides: ${dune:shared-library}
 Description: toolbox for solving PDEs -- typed tree template library (development files)
  DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
  for solving partial differential equations (PDEs) with grid-based methods.
diff --git a/debian/libdune-typetree-dev.install b/debian/libdune-typetree-dev.install
index bedab1a..c87d295 100644
--- a/debian/libdune-typetree-dev.install
+++ b/debian/libdune-typetree-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-typetree
diff --git a/debian/libdune-typetree-dev.lintian-overrides b/debian/libdune-typetree-dev.lintian-overrides
deleted file mode 100644
index 5175e4c..0000000
--- a/debian/libdune-typetree-dev.lintian-overrides
+++ /dev/null
@@ -1,5 +0,0 @@
-# We don't build a separate shared library package.
-# See also https://lists.debian.org/debian-devel/2015/07/msg00115.html
-libdune-typetree-dev: package-name-doesnt-match-sonames *
-# ABI is too unstable to warrant extra work with a symbols file
-libdune-typetree-dev: no-symbols-control-file
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 b568f4d..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_libdunetypetree_la_SOURCES = dummy.cc
- sourcescheck_DUMMY = dummy.cc
- libdunetypetree_la_LIBADD = ../dune/typetree/libtypetree.la
-+libdunetypetree_la_LDFLAGS = -release $(subst -,,$(PACKAGE_VERSION))
- 
- include $(top_srcdir)/am/global-rules
- 
diff --git a/debian/rules b/debian/rules
index 2f09219..1b61248 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,7 @@
 #! /usr/bin/make -f
 
 include /usr/share/dune/dune-debian.mk
+DUNE_DEBIAN_CONFIGURE_FLAGS += --libdir='$${prefix}/lib'
 
 %:
 	dh $@ --parallel
-
-override_dh_auto_install-arch:
-	set -e; for d in cmake 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"

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



More information about the debian-science-commits mailing list