Source: libsoup2.4
Version: 2.36.1-1
Tags: patch
Hi,
I'm at the Portland Bug Squashing Party today. Please consider applying
the following patch, which adds multiarch support to libsoup2.4 and
libsoup-gnome2.4.
See http://wiki.debian.org/Multiarch/Implementation for more details.
Thanks,
Allison
diff -Nru libsoup2.4-2.36.1/debian/changelog libsoup2.4-2.36.1/debian/changelog
--- libsoup2.4-2.36.1/debian/changelog 2011-11-27 17:17:23.000000000 +0000
+++ libsoup2.4-2.36.1/debian/changelog 2011-12-04 23:52:35.000000000 +0000
@@ -1,3 +1,9 @@
+libsoup2.4 (2.36.1-2) UNRELEASED; urgency=low
+
+ * Transition to multiarch.
+
+ -- Allison Randal <alli...@lohutok.net> Sun, 04 Dec 2011 22:32:53 +0000
+
libsoup2.4 (2.36.1-1) unstable; urgency=low
[ Martin Pitt ]
diff -Nru libsoup2.4-2.36.1/debian/compat libsoup2.4-2.36.1/debian/compat
--- libsoup2.4-2.36.1/debian/compat 2011-07-29 01:29:01.000000000 +0000
+++ libsoup2.4-2.36.1/debian/compat 2011-12-04 22:05:06.000000000 +0000
@@ -1 +1 @@
-8
+9
diff -Nru libsoup2.4-2.36.1/debian/control.in
libsoup2.4-2.36.1/debian/control.in
--- libsoup2.4-2.36.1/debian/control.in 2011-11-17 15:47:57.000000000 +0000
+++ libsoup2.4-2.36.1/debian/control.in 2011-12-05 00:30:53.000000000 +0000
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian GNOME Maintainers
<pkg-gnome-maintain...@lists.alioth.debian.org>
Uploaders: @GNOME_TEAM@
-Build-Depends: debhelper (>= 8),
- cdbs (>= 0.4.90),
+Build-Depends: debhelper (>= 8.1.3~),
+ cdbs (>= 0.4.93~),
gnome-pkg-tools,
libglib2.0-dev (>= 2.30.0),
glib-networking (>= 2.28.4),
@@ -23,6 +23,7 @@
Package: libsoup2.4-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
libsoup2.4-1 (= ${binary:Version}),
@@ -56,6 +57,8 @@
Package: libsoup2.4-1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends},
glib-networking (>= 2.28.4)
@@ -112,6 +115,8 @@
Package: libsoup-gnome2.4-1
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends: ${misc:Depends},
${shlibs:Depends}
Description: HTTP library implementation in C -- GNOME support library
@@ -142,6 +147,7 @@
Package: libsoup-gnome2.4-dev
Architecture: any
+Multi-Arch: same
Section: libdevel
Depends: ${misc:Depends},
libsoup-gnome2.4-1 (= ${binary:Version}),
diff -Nru libsoup2.4-2.36.1/debian/gir1.2-soup-2.4.install
libsoup2.4-2.36.1/debian/gir1.2-soup-2.4.install
--- libsoup2.4-2.36.1/debian/gir1.2-soup-2.4.install 2011-07-29
01:30:15.000000000 +0000
+++ libsoup2.4-2.36.1/debian/gir1.2-soup-2.4.install 2011-12-04
23:55:14.000000000 +0000
@@ -1 +1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0/* usr/lib/girepository-1.0
diff -Nru libsoup2.4-2.36.1/debian/libsoup-gnome2.4-1.install
libsoup2.4-2.36.1/debian/libsoup-gnome2.4-1.install
--- libsoup2.4-2.36.1/debian/libsoup-gnome2.4-1.install 2011-07-29
01:30:40.000000000 +0000
+++ libsoup2.4-2.36.1/debian/libsoup-gnome2.4-1.install 2011-12-04
22:09:10.000000000 +0000
@@ -1 +1 @@
-usr/lib/libsoup-gnome-2.4.so.*
+usr/lib/*/libsoup-gnome-2.4.so.*
diff -Nru libsoup2.4-2.36.1/debian/libsoup-gnome2.4-dev.install
libsoup2.4-2.36.1/debian/libsoup-gnome2.4-dev.install
--- libsoup2.4-2.36.1/debian/libsoup-gnome2.4-dev.install 2011-07-29
01:31:24.000000000 +0000
+++ libsoup2.4-2.36.1/debian/libsoup-gnome2.4-dev.install 2011-12-04
22:25:08.000000000 +0000
@@ -1,5 +1,5 @@
usr/include/libsoup-gnome-2.4
-usr/lib/libsoup-gnome-2.4.so
-usr/lib/libsoup-gnome-2.4.a
-usr/lib/pkgconfig/libsoup-gnome-2.4.pc
+usr/lib/*/libsoup-gnome-2.4.so
+usr/lib/*/libsoup-gnome-2.4.a
+usr/lib/*/pkgconfig/libsoup-gnome-2.4.pc
usr/share/gir-1.0/SoupGNOME-2.4.gir
diff -Nru libsoup2.4-2.36.1/debian/libsoup2.4-1.install
libsoup2.4-2.36.1/debian/libsoup2.4-1.install
--- libsoup2.4-2.36.1/debian/libsoup2.4-1.install 2011-07-29
01:30:19.000000000 +0000
+++ libsoup2.4-2.36.1/debian/libsoup2.4-1.install 2011-12-04
22:12:13.000000000 +0000
@@ -1 +1 @@
-usr/lib/libsoup-2.4*.so.*
+usr/lib/*/libsoup-2.4*.so.*
diff -Nru libsoup2.4-2.36.1/debian/libsoup2.4-dev.install
libsoup2.4-2.36.1/debian/libsoup2.4-dev.install
--- libsoup2.4-2.36.1/debian/libsoup2.4-dev.install 2011-07-29
01:31:16.000000000 +0000
+++ libsoup2.4-2.36.1/debian/libsoup2.4-dev.install 2011-12-04
22:43:04.000000000 +0000
@@ -1,5 +1,5 @@
usr/include/libsoup-2.4
-usr/lib/libsoup-2.4.so
-usr/lib/libsoup-2.4.a
-usr/lib/pkgconfig/libsoup-2.4.pc
+usr/lib/*/libsoup-2.4.so
+usr/lib/*/libsoup-2.4.a
+usr/lib/*/pkgconfig/libsoup-2.4.pc
usr/share/gir-1.0/Soup-2.4.gir
diff -Nru libsoup2.4-2.36.1/debian/rules libsoup2.4-2.36.1/debian/rules
--- libsoup2.4-2.36.1/debian/rules 2011-07-29 01:22:28.000000000 +0000
+++ libsoup2.4-2.36.1/debian/rules 2011-12-04 23:56:56.000000000 +0000
@@ -10,5 +10,6 @@
DEB_DH_MAKESHLIBS_ARGS_ALL += -V -- -c4
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
DEB_MAKE_CHECK_TARGET = check
