Merge lp:~adam-stokes/ubuntu/quantal/gnome-vfs/lp977940-multiarch into lp:ubuntu/quantal/gnome-vfs

[Adam Stokes]

- Forces libgnomevfs2-common to be replaced in order to clean out older files from libgnomevfs2-extra in a previous non multiarch package.
- Rebuilt with multi-arch support (LP: #977940)

[Jamie Strandboge (jdstrand)]

While I have not done multiarch transitions myself, I read through the various documentation and wonder why libgnomevfs2-bin uses 'Multi-Arch: foreign'. Shouldn't this be 'Multi-Arch: same' because libgnomevfs2-bin provides binaries in /usr/bin (and in debian/control* uses 'Architecture: any' as opposed to 'all') and therfore does not meet the "one copy of this package, of any architecture, is sufficient to satisfy the needs of the runtime library package of every architecture" as per http://wiki.debian.org/Multiarch/Implementation#Converting_your_package_for_multiarch?

Otherwise, it looks like there is an approporiate use of Breaks, Replaces, Pre-Depends, etc. The files install to the correct places and the pc files look ok by visual inspection.

review: Needs Information

[Adam Stokes (adam-stokes)]

> While I have not done multiarch transitions myself, I read through the various
> documentation and wonder why libgnomevfs2-bin uses 'Multi-Arch: foreign'.
> Shouldn't this be 'Multi-Arch: same' because libgnomevfs2-bin provides
> binaries in /usr/bin (and in debian/control* uses 'Architecture: any' as
> opposed to 'all') and therfore does not meet the "one copy of this package, of
> any architecture, is sufficient to satisfy the needs of the runtime library
> package of every architecture" as per http://wiki.debian.org/Multiarch/Impleme
> ntation#Converting_your_package_for_multiarch?
>
> Otherwise, it looks like there is an approporiate use of Breaks, Replaces,
> Pre-Depends, etc. The files install to the correct places and the pc files
> look ok by visual inspection.

I'm still a little unclear behind the Multi-Arch: same vs. foreign. As I see it we mark the binary package as foreign stating that "The package is not co-installable with itself, but should be allowed to satisfy the dependencies of a package of a different arch from itself."

I'm probably mis-reading the documentation but if someone could verify Jamie's question I can make modifications if necessary.

review: Needs Information

[Stéphane Graber (stgraber)]

From the wiki:

Multi-Arch: same

    This package is co-installable with itself, but it must not be used to satisfy the dependency of any package of a different architecture from itself.

Multi-Arch: foreign

    The package is not co-installable with itself, but should be allowed to satisfy the dependencies of a package of a different arch from itself.

    If a package is declared Multi-Arch: foreign, preference should be given to a package for the native architecture if available; if it is not available, the package manager may automatically install any available package, regardless of architecture, or it may choose to make this an option controlled by user configuration.

Multi-Arch: allowed

    This permits the reverse-dependencies of the package to annotate their Depends: field to indicate that a foreign architecture version of the package satisfies the dependencies, but does not change the resolution of any existing dependencies. This value exists to prevent any packages from incorrectly annotating dependencies as being architecture-neutral without coordination with the maintainer of the depended-on package.

Multi-Arch: same should only be used when the package is co-installable with itself from another architecture, so it'd be wrong to use it for a package shipping stuff in /usr/bin.

Multi-Arch: foreign is however the right choice for a package shipping binaries in /usr/bin and that doesn't contain any library.

[Adam Stokes (adam-stokes)]

Waiting on rdepends testing to finish, it is suggested to wait for those results before ack.

[Adam Stokes (adam-stokes)]

rdeps tests:

./gnome-sharp2_2.24.2-2-amd64-20120808-1143:Status: successful
./gst-plugins-base0.10_0.10.36-1ubuntu1-amd64-20120808-1151:Status: successful
./shotwell_0.12.3-0ubuntu1-amd64-20120808-1250:Status: successful
./gnome-python_2.28.1+dfsg-1-amd64-20120808-1137:Status: successful
./inkscape_0.48.3.1-1ubuntu4-amd64-20120808-1203:Status: successful
./libgnomeui_2.24.5-2ubuntu2-amd64-20120808-1237:Status: successful
./libgnome_2.32.1-2ubuntu1-amd64-20120808-1232:Status: successful
./libgsf_1.14.21-2.1-amd64-20120808-1244:Status: successful

[Stéphane Graber (stgraber)]

Can you make sure all changes are covered in the changelog?

The Breaks/Replaces change isn't currently covered and neither is the versioned dependency on cdbs and dh (thouh these might have been required for the multi-arch pre-depends?)

[lp:~adam-stokes/ubuntu/quantal/gnome-vfs/lp977940-multiarch]

36. By Adam Stokes on 2012-08-10

* 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.

=== modified file 'debian/changelog'
--- debian/changelog	2011-10-18 16:34:00 +0000
+++ debian/changelog	2012-08-10 13:20:34 +0000
@@ -1,3 +1,16 @@
+gnome-vfs (1:2.24.4-1ubuntu3) quantal; 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 <[e-mail]>  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.
 
=== modified file 'debian/control'
--- debian/control	2011-10-18 16:34:00 +0000
+++ debian/control	2012-08-10 13:20:34 +0000
@@ -9,7 +9,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
 Uploaders: Debian GNOME Maintainers <[e-mail]>, Emilio Pozuelo Monfort <[e-mail]>, Josselin Mouette <[e-mail]>, Michael Biebl <[e-mail]>
-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),
@@ -77,6 +80,7 @@
 
 Package: libgnomevfs2-bin
 Architecture: any
+Multi-Arch: foreign
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Replaces: libgnomevfs2-common (<< 2.12.2-4)
@@ -92,6 +96,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 +138,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),
 
=== modified file 'debian/control.in'
--- debian/control.in	2011-10-18 16:34:00 +0000
+++ debian/control.in	2012-08-10 13:20:34 +0000
@@ -4,7 +4,7 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 XSBC-Original-Maintainer: Josselin Mouette <[e-mail]>
 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),
 
=== modified file 'debian/libgnomevfs2-0.install'
--- debian/libgnomevfs2-0.install	2008-11-12 17:28:27 +0000
+++ debian/libgnomevfs2-0.install	2012-08-10 13:20:34 +0000
@@ -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
 
=== modified file 'debian/libgnomevfs2-dev.install'
--- debian/libgnomevfs2-dev.install	2008-11-12 17:28:27 +0000
+++ debian/libgnomevfs2-dev.install	2012-08-10 13:20:34 +0000
@@ -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/
 
=== modified file 'debian/libgnomevfs2-extra.install'
--- debian/libgnomevfs2-extra.install	2008-11-12 17:28:27 +0000
+++ debian/libgnomevfs2-extra.install	2012-08-10 13:20:34 +0000
@@ -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/
 
=== modified file 'debian/rules'
--- debian/rules	2011-06-10 17:38:40 +0000
+++ debian/rules	2012-08-10 13:20:34 +0000
@@ -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"