diff -Nru gnome-vfs-2.24.4/debian/changelog gnome-vfs-2.24.4/debian/changelog --- gnome-vfs-2.24.4/debian/changelog 2012-08-31 12:37:24.000000000 -0400 +++ gnome-vfs-2.24.4/debian/changelog 2012-08-31 13:03:33.000000000 -0400 @@ -1,3 +1,16 @@ +gnome-vfs (1:2.24.4-1ubuntu2.1) precise-proposed; urgency=low + + * Add breaks for libgnomevfs2-common << 2.24.4 + * In addition to breaking on earlier versions we + force libgnomevfs2-common to be reinstalled + this ensures all library locations are properly created and files + exist in their architecture specific installation. + * Update build deps version to receive the full support of multi-arch + processing. + * Rebuilt with multi-arch support (LP: #977940) + + -- Adam Stokes Tue, 10 Jul 2012 14:19:59 -0400 + gnome-vfs (1:2.24.4-1ubuntu2) precise; urgency=low * debian/control.in: Drop libgamin-dev build dependency and FAM support. diff -Nru gnome-vfs-2.24.4/debian/control gnome-vfs-2.24.4/debian/control --- gnome-vfs-2.24.4/debian/control 2012-08-31 12:37:43.000000000 -0400 +++ gnome-vfs-2.24.4/debian/control 2012-08-31 13:03:48.000000000 -0400 @@ -9,7 +9,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette Uploaders: Debian GNOME Maintainers , Emilio Pozuelo Monfort , Josselin Mouette , Michael Biebl -Build-Depends: cdbs, +Build-Depends: cdbs (>= 0.4.93~), dh-autoreconf, gnome-common, gtk-doc-tools (>= 1.0), @@ -19,7 +19,7 @@ libbz2-dev, libsmbclient-dev, gettext, - debhelper (>= 8), + debhelper (>= 8.1.3~), zlib1g-dev, intltool (>= 0.35.0), gnome-mime-data, @@ -38,7 +38,8 @@ Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-vfs/ubuntu Package: libgnomevfs2-common -Architecture: all +Architecture: any +Multi-Arch: foreign Depends: ${misc:Depends}, shared-mime-info Conflicts: gnome-panel (<< 2.10.0), @@ -56,6 +57,8 @@ Package: libgnomevfs2-0 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, dbus (>= 0.90), @@ -63,7 +66,8 @@ libgnomevfs2-common (<< ${gnome:NextVersion}) Recommends: dbus-x11 Suggests: libgnomevfs2-bin, libgnomevfs2-extra, gamin | fam -Replaces: libgnomevfs2-common (<< 2.12.2-4) +Replaces: libgnomevfs2-common (<< 1:2.24.4-1) +Breaks: libgnomevfs2-common (<< 1:2.24.4-1) Conflicts: libbonobo2-0 (<< 2.15.0) Description: GNOME Virtual File System (runtime libraries) GNOME VFS is the GNOME virtual file system. It is the foundation of the @@ -77,6 +81,7 @@ Package: libgnomevfs2-bin Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libgnomevfs2-common (<< 2.12.2-4) @@ -92,6 +97,8 @@ Package: libgnomevfs2-extra Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libgnomevfs2-common (>= ${gnome:Version}), @@ -132,7 +139,9 @@ Package: libgnomevfs2-dev Architecture: any +Multi-Arch: same Section: libdevel +Pre-Depends: ${misc:Pre-Depends} Depends: libgnomevfs2-0 (= ${binary:Version}), ${misc:Depends}, libgconf2-dev (>= 2.8.0-1), diff -Nru gnome-vfs-2.24.4/debian/control.in gnome-vfs-2.24.4/debian/control.in --- gnome-vfs-2.24.4/debian/control.in 2012-08-31 12:37:24.000000000 -0400 +++ gnome-vfs-2.24.4/debian/control.in 2012-08-31 13:00:34.000000000 -0400 @@ -4,7 +4,7 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Josselin Mouette Uploaders: @GNOME_TEAM@ -Build-Depends: cdbs, +Build-Depends: cdbs (>= 0.4.93~), dh-autoreconf, gnome-common, gtk-doc-tools (>= 1.0), @@ -14,7 +14,7 @@ libbz2-dev, libsmbclient-dev, gettext, - debhelper (>= 8), + debhelper (>= 8.1.3~), zlib1g-dev, intltool (>= 0.35.0), gnome-mime-data, @@ -33,7 +33,8 @@ Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/gnome-vfs/ubuntu Package: libgnomevfs2-common -Architecture: all +Architecture: any +Multi-Arch: foreign Depends: ${misc:Depends}, shared-mime-info Conflicts: gnome-panel (<< 2.10.0), @@ -51,6 +52,8 @@ Package: libgnomevfs2-0 Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, dbus (>= 0.90), @@ -58,7 +61,8 @@ libgnomevfs2-common (<< ${gnome:NextVersion}) Recommends: dbus-x11 Suggests: libgnomevfs2-bin, libgnomevfs2-extra, gamin | fam -Replaces: libgnomevfs2-common (<< 2.12.2-4) +Replaces: libgnomevfs2-common (<< 1:2.24.4-1) +Breaks: libgnomevfs2-common (<< 1:2.24.4-1) Conflicts: libbonobo2-0 (<< 2.15.0) Description: GNOME Virtual File System (runtime libraries) GNOME VFS is the GNOME virtual file system. It is the foundation of the @@ -72,6 +76,7 @@ Package: libgnomevfs2-bin Architecture: any +Multi-Arch: foreign Depends: ${shlibs:Depends}, ${misc:Depends} Replaces: libgnomevfs2-common (<< 2.12.2-4) @@ -87,6 +92,8 @@ Package: libgnomevfs2-extra Architecture: any +Multi-Arch: same +Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends}, libgnomevfs2-common (>= ${gnome:Version}), @@ -127,7 +134,9 @@ Package: libgnomevfs2-dev Architecture: any +Multi-Arch: same Section: libdevel +Pre-Depends: ${misc:Pre-Depends} Depends: libgnomevfs2-0 (= ${binary:Version}), ${misc:Depends}, libgconf2-dev (>= 2.8.0-1), diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-0.install gnome-vfs-2.24.4/debian/libgnomevfs2-0.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-0.install 2012-08-31 12:37:24.000000000 -0400 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-0.install 2012-08-31 13:00:34.000000000 -0400 @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libgnomevfs-2.so.* -debian/tmp/usr/lib/gnome-vfs-2.0/gnome-vfs-daemon -debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{network,file,tar,computer,gzip,vfs-test,sftp,dns-sd}.so +debian/tmp/usr/lib/*/libgnomevfs-2.so.* +debian/tmp/usr/lib/*/gnome-vfs-2.0/gnome-vfs-daemon +debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{network,file,tar,computer,gzip,vfs-test,sftp,dns-sd}.so diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install 2012-08-31 12:37:24.000000000 -0400 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-dev.install 2012-08-31 13:00:34.000000000 -0400 @@ -1,7 +1,7 @@ debian/tmp/usr/include -debian/tmp/usr/lib/libgnomevfs-2.so -debian/tmp/usr/lib/libgnomevfs-2.la -debian/tmp/usr/lib/libgnomevfs-2.a -debian/tmp/usr/lib/pkgconfig -debian/tmp/usr/lib/gnome-vfs-2.0/include +debian/tmp/usr/lib/*/libgnomevfs-2.so +debian/tmp/usr/lib/*/libgnomevfs-2.la +debian/tmp/usr/lib/*/libgnomevfs-2.a +debian/tmp/usr/lib/*/pkgconfig +debian/tmp/usr/lib/*/gnome-vfs-2.0/include debian/tmp/usr/share/gtk-doc/html/gnome-vfs-2.0/* usr/share/doc/libgnomevfs2-common/html/ diff -Nru gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install --- gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install 2012-08-31 12:37:24.000000000 -0400 +++ gnome-vfs-2.24.4/debian/libgnomevfs2-extra.install 2012-08-31 13:00:34.000000000 -0400 @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/gnome-vfs-2.0/modules/lib{bzip2,smb,http,ftp}.so +debian/tmp/usr/lib/*/gnome-vfs-2.0/modules/lib{bzip2,smb,http,ftp}.so debian/extra-modules.conf /etc/gnome-vfs-2.0/modules/ diff -Nru gnome-vfs-2.24.4/debian/rules gnome-vfs-2.24.4/debian/rules --- gnome-vfs-2.24.4/debian/rules 2012-08-31 12:37:24.000000000 -0400 +++ gnome-vfs-2.24.4/debian/rules 2012-08-31 13:00:34.000000000 -0400 @@ -19,12 +19,15 @@ #debug lib DEB_DH_STRIP_ARGS := --dbg-package=libgnomevfs2-0-dbg +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + DEB_CONFIGURE_EXTRA_FLAGS := --enable-gtk-doc \ --enable-gnutls \ --enable-avahi \ --disable-openssl \ --disable-hal \ - --libexecdir=/usr/lib/gnome-vfs-2.0 \ + --libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)/gnome-vfs-2.0 \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ $(HOST_ARCH_CONFIGURE_FLAGS) DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,--as-needed"