[Pkg-giraffe-discuss] [PATCH 2/3] 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/libvmime-dev.dirs       | 2 --
 debian/libvmime-dev.install    | 4 ----
 debian/libvmime-dev.install.in | 4 ++++
 debian/libvmime0.dirs          | 1 -
 debian/libvmime0.install       | 1 -
 debian/libvmime0.install.in    | 1 +
 6 files changed, 5 insertions(+), 8 deletions(-)
 delete mode 100644 debian/libvmime-dev.dirs
 delete mode 100644 debian/libvmime-dev.install
 create mode 100644 debian/libvmime-dev.install.in
 delete mode 100644 debian/libvmime0.dirs
 delete mode 100644 debian/libvmime0.install
 create mode 100644 debian/libvmime0.install.in

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
deleted file mode 100644
index 6cd8ddd..0000000
--- a/debian/libvmime-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
diff --git a/debian/libvmime-dev.install.in b/debian/libvmime-dev.install.in
new file mode 100644
index 0000000..065577b
--- /dev/null
+++ b/debian/libvmime-dev.install.in
@@ -0,0 +1,4 @@
+usr/include/*
+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
deleted file mode 100644
index d0dbfd1..0000000
--- a/debian/libvmime0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/lib*.so.*
diff --git a/debian/libvmime0.install.in b/debian/libvmime0.install.in
new file mode 100644
index 0000000..2bbe7b1
--- /dev/null
+++ b/debian/libvmime0.install.in
@@ -0,0 +1 @@
+usr/lib/@DEB_HOST_MULTIARCH@/lib*.so.*
-- 
2.10.2