[med-svn] [phylip] 03/03: Fix ldconfig call

[Andreas Tille]

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

tille pushed a commit to branch master
in repository phylip.

commit 8131e1d507d4cc71a2110ea0c463814289b8d100
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jul 22 11:52:48 2016 +0200

    Fix ldconfig call
---
 debian/control                  |  1 +
 debian/phylip.install           |  3 ++-
 debian/phylip.lintian-overrides |  6 +++---
 debian/phylip.postinst          | 13 -------------
 debian/phylip.postrm            | 13 -------------
 debian/phylip.triggers          |  1 +
 6 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/debian/control b/debian/control
index f998e07..c9f274f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Andreas Tille <tille at debian.org>,
 Section: science
 Priority: optional
 Build-Depends: debhelper (>= 9),
+               dh-exec,
                libx11-dev,
                libxt-dev,
                libxaw7-dev,
diff --git a/debian/phylip.install b/debian/phylip.install
old mode 100644
new mode 100755
index e51e7e2..e556db4
--- a/debian/phylip.install
+++ b/debian/phylip.install
@@ -1,5 +1,6 @@
+#! /usr/bin/dh-exec
 exe/*				usr/lib/phylip/bin
-src/lib*.so*			usr/lib
+src/lib*.so*			usr/lib/${DEB_HOST_MULTIARCH}
 fonts/*				usr/share/phylip
 debian/bin/*			usr/bin
 debian/bash_completion/*	usr/share/bash-completion/completions
diff --git a/debian/phylip.lintian-overrides b/debian/phylip.lintian-overrides
index b4bf75b..990b52b 100644
--- a/debian/phylip.lintian-overrides
+++ b/debian/phylip.lintian-overrides
@@ -1,5 +1,5 @@
 # Seems to be false positives - options are properly set
-phylip: hardening-no-fortify-functions usr/lib/libdraw*.so
+phylip: hardening-no-fortify-functions usr/lib/*/libdraw*.so
 phylip: package-name-doesnt-match-sonames libdrawgram libdrawtree
-phylip: shlib-without-versioned-soname usr/lib/libdraw*.so libdraw*.so
-phylip: no-symbols-control-file usr/lib/libdraw*.so
+phylip: shlib-without-versioned-soname usr/lib/*/libdraw*.so libdraw*.so
+phylip: no-symbols-control-file usr/lib/*/libdraw*.so
diff --git a/debian/phylip.postinst b/debian/phylip.postinst
deleted file mode 100644
index f15c644..0000000
--- a/debian/phylip.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-	configure)
-		ldconfig
-	;;
-	*)
-	;;
-esac
-
-#DEBHELPER#
diff --git a/debian/phylip.postrm b/debian/phylip.postrm
deleted file mode 100644
index ea4bbe7..0000000
--- a/debian/phylip.postrm
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
-	remove)
-		ldconfig
-	;;
-	*)
-	;;
-esac
-
-#DEBHELPER#
diff --git a/debian/phylip.triggers b/debian/phylip.triggers
new file mode 100644
index 0000000..dd86603
--- /dev/null
+++ b/debian/phylip.triggers
@@ -0,0 +1 @@
+activate-noawait ldconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/phylip.git