Bug#651491: support Multi-Arch

[Kees Cook]

Package: libproxy
Version: 0.3.1-4
Severity: normal
Tags: patch

Hello,

This patch provides support for Multi-Arch for the release goal.

Thanks,

-Kees

-- 
Kees Cook                                            @debian.org
-------------- next part --------------
diff -Nru libproxy-0.3.1/debian/changelog libproxy-0.3.1/debian/changelog
--- libproxy-0.3.1/debian/changelog	2011-10-24 18:28:19.000000000 -0700
+++ libproxy-0.3.1/debian/changelog	2011-12-08 18:47:08.000000000 -0800
@@ -1,3 +1,9 @@
+libproxy (0.3.1-5) UNRELEASED; urgency=low
+
+  * debian/{control,rules,*.install}: Convert to Multi-Arch.
+
+ -- Kees Cook <kees at debian.org>  Thu, 08 Dec 2011 18:46:41 -0800
+
 libproxy (0.3.1-4) unstable; urgency=low
 
   * debian/patches/03_format-security.patch:
diff -Nru libproxy-0.3.1/debian/compat libproxy-0.3.1/debian/compat
--- libproxy-0.3.1/debian/compat	2011-10-24 16:43:11.000000000 -0700
+++ libproxy-0.3.1/debian/compat	2011-12-08 18:43:33.000000000 -0800
@@ -1 +1 @@
-8
+9
diff -Nru libproxy-0.3.1/debian/libproxy0.install libproxy-0.3.1/debian/libproxy0.install
--- libproxy-0.3.1/debian/libproxy0.install	2011-10-24 16:43:27.000000000 -0700
+++ libproxy-0.3.1/debian/libproxy0.install	2011-12-08 18:42:45.000000000 -0800
@@ -1,2 +1,2 @@
-usr/lib/libproxy.so.*
-usr/lib/libproxy/*/modules
+usr/lib/*/libproxy.so.*
+usr/lib/*/libproxy/*/modules
diff -Nru libproxy-0.3.1/debian/libproxy-dev.install libproxy-0.3.1/debian/libproxy-dev.install
--- libproxy-0.3.1/debian/libproxy-dev.install	2011-10-24 16:43:30.000000000 -0700
+++ libproxy-0.3.1/debian/libproxy-dev.install	2011-12-08 18:42:28.000000000 -0800
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/pkgconfig
-usr/lib/libproxy.so
+usr/lib/*/pkgconfig
+usr/lib/*/libproxy.so
diff -Nru libproxy-0.3.1/debian/rules libproxy-0.3.1/debian/rules
--- libproxy-0.3.1/debian/rules	2011-10-24 18:17:19.000000000 -0700
+++ libproxy-0.3.1/debian/rules	2011-12-08 18:44:35.000000000 -0800
@@ -14,10 +14,11 @@
 DEB_DH_GENCONTROL_ARGS_libproxy0 = -- \
 	-Vmoz:Recommends=$(shell grep -o "libmoz[a-z0-9]*" debian/libproxy0.substvars) \
 	-Vwebkit:Recommends=$(shell grep -o "libwebkit[a-z0-9.-]*" debian/libproxy0.substvars)
+DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 binary-install/python-libproxy::
 	dh_python2 -p$(cdbs_curpkg)
 
 binary-install/$(libproxy)::
 	dh_shlibdeps -plibproxy0 -- -pmodules
-	rm debian/$(libproxy)/usr/lib/libproxy/*/modules/wpad_dnsdevolution.so
+	rm debian/$(libproxy)/usr/lib/*/libproxy/*/modules/wpad_dnsdevolution.so