r31949 - in /desktop/unstable/libsoup2.4/debian: changelog compat control.in gir1.2-soup-2.4.install libsoup-gnome2.4-1.install libsoup-gnome2.4-dev.install libsoup2.4-1.install libsoup2.4-dev.install rules

mpitt at users.alioth.debian.org mpitt at users.alioth.debian.org
Tue Dec 6 05:43:22 UTC 2011 

Author: mpitt
Date: Tue Dec  6 05:43:21 2011
New Revision: 31949

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=31949
Log:
Transition to multiarch. Thanks to Allison Randal for the patch!
(Closes: #651018)

Modified:
    desktop/unstable/libsoup2.4/debian/changelog
    desktop/unstable/libsoup2.4/debian/compat
    desktop/unstable/libsoup2.4/debian/control.in
    desktop/unstable/libsoup2.4/debian/gir1.2-soup-2.4.install
    desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-1.install
    desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-dev.install
    desktop/unstable/libsoup2.4/debian/libsoup2.4-1.install
    desktop/unstable/libsoup2.4/debian/libsoup2.4-dev.install
    desktop/unstable/libsoup2.4/debian/rules

Modified: desktop/unstable/libsoup2.4/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/changelog?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/changelog [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/changelog [utf-8] Tue Dec  6 05:43:21 2011
@@ -1,3 +1,10 @@
+libsoup2.4 (2.36.1-2) UNRELEASED; urgency=low
+
+  * Transition to multiarch. Thanks to Allison Randal for the patch!
+    (Closes: #651018)
+
+ -- Allison Randal <allison at lohutok.net>  Sun, 04 Dec 2011 22:32:53 +0000
+
 libsoup2.4 (2.36.1-1) unstable; urgency=low
 
   [ Martin Pitt ]

Modified: desktop/unstable/libsoup2.4/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/compat?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/compat [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/compat [utf-8] Tue Dec  6 05:43:21 2011
@@ -1,1 +1,1 @@
-8
+9

Modified: desktop/unstable/libsoup2.4/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/control.in?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/control.in [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/control.in [utf-8] Tue Dec  6 05:43:21 2011
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at 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}),

Modified: desktop/unstable/libsoup2.4/debian/gir1.2-soup-2.4.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/gir1.2-soup-2.4.install?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/gir1.2-soup-2.4.install [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/gir1.2-soup-2.4.install [utf-8] Tue Dec  6 05:43:21 2011
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0
+usr/lib/*/girepository-1.0/* usr/lib/girepository-1.0

Modified: desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-1.install?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-1.install [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-1.install [utf-8] Tue Dec  6 05:43:21 2011
@@ -1,1 +1,1 @@
-usr/lib/libsoup-gnome-2.4.so.*
+usr/lib/*/libsoup-gnome-2.4.so.*

Modified: desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-dev.install?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-dev.install [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/libsoup-gnome2.4-dev.install [utf-8] Tue Dec  6 05:43:21 2011
@@ -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

Modified: desktop/unstable/libsoup2.4/debian/libsoup2.4-1.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/libsoup2.4-1.install?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/libsoup2.4-1.install [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/libsoup2.4-1.install [utf-8] Tue Dec  6 05:43:21 2011
@@ -1,1 +1,1 @@
-usr/lib/libsoup-2.4*.so.*
+usr/lib/*/libsoup-2.4*.so.*

Modified: desktop/unstable/libsoup2.4/debian/libsoup2.4-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/libsoup2.4-dev.install?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/libsoup2.4-dev.install [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/libsoup2.4-dev.install [utf-8] Tue Dec  6 05:43:21 2011
@@ -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

Modified: desktop/unstable/libsoup2.4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/libsoup2.4/debian/rules?rev=31949&op=diff
==============================================================================
--- desktop/unstable/libsoup2.4/debian/rules [utf-8] (original)
+++ desktop/unstable/libsoup2.4/debian/rules [utf-8] Tue Dec  6 05:43:21 2011
@@ -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

More information about the pkg-gnome-commits mailing list