[Pkg-giraffe-discuss] [PATCH 1/4] adjusting *.install files to multiarch behaviour

[c.schoenert at t-online.de]

From: Carsten Schoenert <c.schoenert at t-online.de>

By moving the compat version above 9 the libararies are installed now in
multiarch related subdirectories. We need to adjust this for the
installation inside the binary packages.
---
 debian/control              | 1 +
 debian/libvmime-dev.dirs    | 2 --
 debian/libvmime-dev.install | 7 ++++---
 debian/libvmime0.dirs       | 1 -
 debian/libvmime0.install    | 3 ++-
 5 files changed, 7 insertions(+), 7 deletions(-)
 delete mode 100644 debian/libvmime-dev.dirs
 mode change 100644 => 100755 debian/libvmime-dev.install
 delete mode 100644 debian/libvmime0.dirs
 mode change 100644 => 100755 debian/libvmime0.install

diff --git a/debian/control b/debian/control
index c072f9b..65dd981 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Uploaders: Carsten Schoenert <c.schoenert at t-online.de>
 Build-Depends: autotools-dev,
   debhelper (>= 10.2.2~),
   dh-autoreconf,
+  dh-exec (>= 0.3),
   libgnutls28-dev (>= 3.4.0),
   libgsasl7-dev
 Standards-Version: 3.9.8
diff --git a/debian/libvmime-dev.dirs b/debian/libvmime-dev.dirs
deleted file mode 100644
index 4418816..0000000
--- a/debian/libvmime-dev.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff --git a/debian/libvmime-dev.install b/debian/libvmime-dev.install
old mode 100644
new mode 100755
index 6cd8ddd..72dfde8
--- a/debian/libvmime-dev.install
+++ b/debian/libvmime-dev.install
@@ -1,4 +1,5 @@
+#!/usr/bin/dh-exec
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.a
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.so
+usr/lib/${DEB_HOST_MULTIARCH}/pkgconfig
diff --git a/debian/libvmime0.dirs b/debian/libvmime0.dirs
deleted file mode 100644
index 6845771..0000000
--- a/debian/libvmime0.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib
diff --git a/debian/libvmime0.install b/debian/libvmime0.install
old mode 100644
new mode 100755
index d0dbfd1..1e0a275
--- a/debian/libvmime0.install
+++ b/debian/libvmime0.install
@@ -1 +1,2 @@
-usr/lib/lib*.so.*
+#!/usr/bin/dh-exec
+usr/lib/${DEB_HOST_MULTIARCH}/lib*.so.*
-- 
2.10.2