Bug#651491: support Multi-Arch

[Kees Cook]

Hi Colin,

On Mon, Dec 12, 2011 at 11:39:55AM +0000, Colin Watson wrote:
> You seem to have left out the changes to debian/control, perhaps because
> they need to be made in debian/control.in and probably got overwritten
> by clean as a result.

Urgh, yeah. I've attached an updated patch.

> I think you need:
> 
>   * Build-Depends: cdbs (>= 0.4.93~), debhelper (>= 8.1.3)
>   * Pre-Depends: ${misc:Pre-Depends} in libproxy0 and libproxy-dev
>   * Multi-Arch: same in libproxy0 and libproxy-dev
>   * Multi-Arch: foreign in libproxy-tools

Since libproxy-dev doesn't ship any shared objects, it doesn't need the
Pre-Depends, but yes, everything else was in the wiped-out control file. :)

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, 15 Dec 2011 15:16: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/control libproxy-0.3.1/debian/control
--- libproxy-0.3.1/debian/control	2011-10-24 18:39:02.000000000 -0700
+++ libproxy-0.3.1/debian/control	2011-12-15 14:44:54.000000000 -0800
@@ -8,8 +8,8 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3~),
                gnome-pkg-tools,
                autotools-dev,
                python-all-dev (>= 2.6.6-3~),
@@ -30,6 +30,8 @@
 
 Package: libproxy0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: ${webkit:Recommends} | ${moz:Recommends}
@@ -41,6 +43,7 @@
 
 Package: libproxy-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -54,6 +57,7 @@
 Package: libproxy-tools
 Section: utils
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: automatic proxy configuration management library (tools)
diff -Nru libproxy-0.3.1/debian/control.in libproxy-0.3.1/debian/control.in
--- libproxy-0.3.1/debian/control.in	2011-10-24 18:24:43.000000000 -0700
+++ libproxy-0.3.1/debian/control.in	2011-12-15 14:40:14.000000000 -0800
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Emilio Pozuelo Monfort <pochu at debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
-               debhelper (>= 8),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3~),
                gnome-pkg-tools,
                autotools-dev,
                python-all-dev (>= 2.6.6-3~),
@@ -25,6 +25,8 @@
 
 Package: libproxy0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Recommends: ${webkit:Recommends} | ${moz:Recommends}
@@ -36,6 +38,7 @@
 
 Package: libproxy-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${shlibs:Depends},
          ${misc:Depends},
@@ -49,6 +52,7 @@
 Package: libproxy-tools
 Section: utils
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: automatic proxy configuration management library (tools)
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/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/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