[Pkg-libvirt-commits] [SCM] Libguestfs Debian packaging branch, master, updated. debian/1%1.16.18-1-89-g6038ece

[Hilko Bengen]

The following commit has been merged in the master branch:
commit a8d9101a8b1eb6945b0e65a93b063af14105862f
Author: Hilko Bengen <bengen at debian.org>
Date:   Sat Jun 23 22:12:16 2012 +0200

    Adjusted installation directories (multi-arch support)

diff --git a/debian/erlang-guestfs.install b/debian/erlang-guestfs.install
index fd2112d..2c02f4d 100644
--- a/debian/erlang-guestfs.install
+++ b/debian/erlang-guestfs.install
@@ -1,3 +1,3 @@
 /usr/bin/erl-guestfs
-/usr/lib/erlang/lib/libguestfs*
+/usr/lib/*-*/erlang
 /usr/share/man/man3/guestfs-erlang.3*
diff --git a/debian/gir1.2-guestfs-1.0.install b/debian/gir1.2-guestfs-1.0.install
index 41978ff..157a4d1 100644
--- a/debian/gir1.2-guestfs-1.0.install
+++ b/debian/gir1.2-guestfs-1.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/*
+usr/lib/*-*/girepository-1.0/*
diff --git a/debian/libguestfs-dev.install b/debian/libguestfs-dev.install
index 18a72f7..9e43e7c 100644
--- a/debian/libguestfs-dev.install
+++ b/debian/libguestfs-dev.install
@@ -1,8 +1,8 @@
 usr/include/guestfs.h
-usr/lib/libguestfs.a
-usr/lib/libguestfs.so
-usr/lib/libguestfs.la
-usr/lib/pkgconfig/*
+usr/lib/*-*/libguestfs.a
+usr/lib/*-*/libguestfs.so
+usr/lib/*-*/libguestfs.la
+usr/lib/*-*/pkgconfig/*
 
 usr/share/man/man3/guestfs.3*
 usr/share/man/man3/libguestfs.3*
diff --git a/debian/libguestfs-gobject-1.0-0.install b/debian/libguestfs-gobject-1.0-0.install
index c9c3b59..6ad7d6c 100644
--- a/debian/libguestfs-gobject-1.0-0.install
+++ b/debian/libguestfs-gobject-1.0-0.install
@@ -1,2 +1,2 @@
-usr/lib/libguestfs-gobject-*.so.*
+usr/lib/*-*/libguestfs-gobject-*.so.*
 
diff --git a/debian/libguestfs-gobject-dev.install b/debian/libguestfs-gobject-dev.install
index a1f6b1c..7245f86 100644
--- a/debian/libguestfs-gobject-dev.install
+++ b/debian/libguestfs-gobject-dev.install
@@ -1,6 +1,6 @@
 usr/include/guestfs-gobject.h
-usr/lib/libguestfs-gobject-*.a
-usr/lib/libguestfs-gobject-*.so
-usr/lib/libguestfs-gobject-*.la
+usr/lib/*-*/libguestfs-gobject-*.a
+usr/lib/*-*/libguestfs-gobject-*.so
+usr/lib/*-*/libguestfs-gobject-*.la
 
 usr/share/gir-1.0
diff --git a/debian/libguestfs-java.install b/debian/libguestfs-java.install
index 1b22a23..61d0caa 100644
--- a/debian/libguestfs-java.install
+++ b/debian/libguestfs-java.install
@@ -1,5 +1,5 @@
 usr/share/javadoc/libguestfs-java-*/* usr/share/doc/libguestfs-java/api/
 usr/share/java
-usr/lib/*jni*
+usr/lib/*-*/*jni*
 
 usr/share/man/man3/guestfs-java.3*
diff --git a/debian/libguestfs0.install b/debian/libguestfs0.install
index 7622701..5cfd828 100644
--- a/debian/libguestfs0.install
+++ b/debian/libguestfs0.install
@@ -1,5 +1,5 @@
 usr/bin/libguestfs-test-tool
-usr/lib/libguestfs.so.*
+usr/lib/*-*/libguestfs.so.*
 usr/share/man/man1/libguestfs-test-tool*
 usr/share/man/man1/guestfs-*
 
diff --git a/debian/rules b/debian/rules
index b6dd9b9..7947e0a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ override_dh_auto_configure:
 		RUBY=$(RUBY_DEFAULT) \
 		RAKE=$(patsubst ruby%,rake%,$(RUBY_DEFAULT)) \
 		PYTHON=$(PYTHON_DEFAULT) \
-		JNI_INSTALL_DIR=/usr/lib/jni
+		JNI_INSTALL_DIR='$${libdir}/jni'
 
 	set -e; for v in $(patsubst ruby%,%,$(filter-out $(RUBY_DEFAULT), $(RUBIES))) \
 	; do \

-- 
Libguestfs Debian packaging