r40288 - in /attic/libbonobo/debian: changelog compat control.in libbonobo2-0.install libbonobo2-bin.install libbonobo2-common.install libbonobo2-dev.install patches/04_multiarch_compat_path.patch patches/05_multiarch_temp_path.patch patches/series rules

joss at users.alioth.debian.org joss at users.alioth.debian.org
Fri Nov 22 13:58:43 UTC 2013 

Author: joss
Date: Fri Nov 22 13:58:42 2013
New Revision: 40288

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40288
Log:
* Migrate to multi-arch. Closes: #677778. Based on the Ubuntu work.
  + Bump debhelper compat level.
  + Make runtime and development MA: same, -common is MA: foreign.
  + Require a multi-arch orbit2.
  + Update libdir.
  + Move server files to libbonobo2-0 and libbonobo2-bin.
  + 04_multiarch_compat_path.patch: new patch. Use configuration file 
    to maintain compatibility with earlier versions.
  + 05_multiarch_temp_path.patch: new patch. Use different paths for 
    lock/IOR files, so that bonobo applications from different 
    architectures work completely independently from each other. It 
    would be theoretically possible to make applications use 
    components from other architectures, but bonobo was not designed 
    this way and is deprecated upstream, so let’s keep things working 
    the way they do.
  + Pass the multiarch triplet through a -D flag for the benefit of 
    the latter patch.
  + Bump shlibs to take the new servers directory into account.
* Drop *.la files.

Added:
    attic/libbonobo/debian/patches/04_multiarch_compat_path.patch
    attic/libbonobo/debian/patches/05_multiarch_temp_path.patch
Modified:
    attic/libbonobo/debian/changelog
    attic/libbonobo/debian/compat
    attic/libbonobo/debian/control.in
    attic/libbonobo/debian/libbonobo2-0.install
    attic/libbonobo/debian/libbonobo2-bin.install
    attic/libbonobo/debian/libbonobo2-common.install
    attic/libbonobo/debian/libbonobo2-dev.install
    attic/libbonobo/debian/patches/series
    attic/libbonobo/debian/rules

Modified: attic/libbonobo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/changelog?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/changelog	[utf-8] (original)
+++ attic/libbonobo/debian/changelog	[utf-8] Fri Nov 22 13:58:42 2013
@@ -1,3 +1,27 @@
+libbonobo (2.32.1-3) unstable; urgency=low
+
+  * Migrate to multi-arch. Closes: #677778. Based on the Ubuntu work.
+    + Bump debhelper compat level.
+    + Make runtime and development MA: same, -common is MA: foreign.
+    + Require a multi-arch orbit2.
+    + Update libdir.
+    + Move server files to libbonobo2-0 and libbonobo2-bin.
+    + 04_multiarch_compat_path.patch: new patch. Use configuration file 
+      to maintain compatibility with earlier versions.
+    + 05_multiarch_temp_path.patch: new patch. Use different paths for 
+      lock/IOR files, so that bonobo applications from different 
+      architectures work completely independently from each other. It 
+      would be theoretically possible to make applications use 
+      components from other architectures, but bonobo was not designed 
+      this way and is deprecated upstream, so let’s keep things working 
+      the way they do.
+    + Pass the multiarch triplet through a -D flag for the benefit of 
+      the latter patch.
+    + Bump shlibs to take the new servers directory into account.
+  * Drop *.la files.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 22 Nov 2013 12:15:47 +0100
+
 libbonobo (2.32.1-2) unstable; urgency=low
 
   * Don't use srcdir in tests/Makefile.am (Closes: #713695)

Modified: attic/libbonobo/debian/compat
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/compat?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/compat	[utf-8] (original)
+++ attic/libbonobo/debian/compat	[utf-8] Fri Nov 22 13:58:42 2013
@@ -1 +1 @@
-5
+8

Modified: attic/libbonobo/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/control.in?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/control.in	[utf-8] (original)
+++ attic/libbonobo/debian/control.in	[utf-8] Fri Nov 22 13:58:42 2013
@@ -3,14 +3,14 @@
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
 Uploaders: @GNOME_TEAM@
-Build-Depends: cdbs,
-               debhelper (>= 5),
+Build-Depends: cdbs (>= 0.4.93~),
+               debhelper (>= 8.1.3),
                dh-autoreconf,
                gnome-pkg-tools (>= 0.10),
                bison,
                flex,
                intltool (>= 0.35.0),
-               liborbit2-dev (>= 1:2.12.4),
+               liborbit2-dev (>= 1:2.14.19-0.3~),
                libglib2.0-dev (>= 2.26.0),
                libxml2-dev (>= 2.6.7),
                libpopt-dev,
@@ -22,6 +22,7 @@
 
 Package: libbonobo2-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Conflicts: bonobo-activation (<< 1:2.4)
 Replaces: bonobo-activation (<< 1:2.4)
@@ -39,13 +40,14 @@
 
 Package: libbonobo2-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Conflicts: libbonobo-activation-dev (<< 1:2.4)
 Depends: ${misc:Depends},
          libbonobo2-0 (= ${binary:Version}),
          ${shlibs:Depends},
          libglib2.0-dev (>= 2.26.0),
-         liborbit2-dev (>= 1:2.12.4),
+         liborbit2-dev (>= 1:2.14.19-0.3~),
          libpopt-dev
 Replaces: libbonobo-activation-dev (<< 1:2.4),
           libbonobo2-common (<< 2.20.3-1)
@@ -64,9 +66,11 @@
 
 Package: libbonobo2-0
 Architecture: any
+Multi-Arch: same
 Section: libs
 Conflicts: libbonobo-activation4 (<< 1:2.4),
            nautilus (<< 2.2.4-5)
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends},
          libbonobo2-common (= ${source:Version}),
          ${shlibs:Depends}

Modified: attic/libbonobo/debian/libbonobo2-0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/libbonobo2-0.install?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/libbonobo2-0.install	[utf-8] (original)
+++ attic/libbonobo/debian/libbonobo2-0.install	[utf-8] Fri Nov 22 13:58:42 2013
@@ -1,4 +1,6 @@
-debian/tmp/usr/lib/lib*.so.*
-debian/tmp/usr/lib/bonobo-activation
-debian/tmp/usr/lib/bonobo/monikers/*.so
-debian/tmp/usr/lib/orbit-2.0/*.so
+debian/tmp/usr/lib/*/lib*.so.*
+debian/tmp/usr/lib/*/bonobo-activation
+debian/tmp/usr/lib/*/bonobo/monikers/*.so
+debian/tmp/usr/lib/*/orbit-2.0/*.so
+debian/tmp/usr/lib/*/bonobo/servers/Bonobo_CosNaming_NamingContext.server
+debian/tmp/usr/lib/*/bonobo/servers/Bonobo_Moniker_std.server

Modified: attic/libbonobo/debian/libbonobo2-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/libbonobo2-bin.install?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/libbonobo2-bin.install	[utf-8] (original)
+++ attic/libbonobo/debian/libbonobo2-bin.install	[utf-8] Fri Nov 22 13:58:42 2013
@@ -1,3 +1,4 @@
 debian/tmp/usr/bin
 debian/tmp/usr/sbin
-debian/tmp/usr/lib/bonobo-2.0
+debian/tmp/usr/lib/*/bonobo-2.0
+debian/tmp/usr/lib/*/bonobo/servers/Bonobo_Sample_Echo.server

Modified: attic/libbonobo/debian/libbonobo2-common.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/libbonobo2-common.install?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/libbonobo2-common.install	[utf-8] (original)
+++ attic/libbonobo/debian/libbonobo2-common.install	[utf-8] Fri Nov 22 13:58:42 2013
@@ -1,5 +1,4 @@
 debian/tmp/usr/share/idl
 debian/tmp/usr/share/man
 debian/tmp/usr/share/locale
-debian/tmp/usr/lib/bonobo/servers/*.server
 debian/tmp/etc/bonobo-activation

Modified: attic/libbonobo/debian/libbonobo2-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/libbonobo2-dev.install?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/libbonobo2-dev.install	[utf-8] (original)
+++ attic/libbonobo/debian/libbonobo2-dev.install	[utf-8] Fri Nov 22 13:58:42 2013
@@ -1,7 +1,5 @@
 debian/tmp/usr/include
-debian/tmp/usr/lib/pkgconfig
-debian/tmp/usr/lib/*.so
-debian/tmp/usr/lib/*.la
-debian/tmp/usr/lib/*.a
+debian/tmp/usr/lib/*/pkgconfig
+debian/tmp/usr/lib/*/*.so
+debian/tmp/usr/lib/*/*.a
 debian/tmp/usr/share/gtk-doc
-

Added: attic/libbonobo/debian/patches/04_multiarch_compat_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/04_multiarch_compat_path.patch?rev=40288&op=file
==============================================================================
--- attic/libbonobo/debian/patches/04_multiarch_compat_path.patch	(added)
+++ attic/libbonobo/debian/patches/04_multiarch_compat_path.patch	[utf-8] Fri Nov 22 13:58:42 2013
@@ -0,0 +1,13 @@
+Index: libbonobo-2.32.1/bonobo-activation-config.xml
+===================================================================
+--- libbonobo-2.32.1.orig/bonobo-activation-config.xml	2009-04-20 15:16:57.000000000 +0200
++++ libbonobo-2.32.1/bonobo-activation-config.xml	2013-11-22 11:25:15.940770925 +0100
+@@ -8,6 +8,8 @@
+     <!-- <item>/usr/local/gnome2/lib/bonobo/servers</item> -->
+     <!-- <item>/usr/local/lib/bonobo/servers</item> -->
+     <!-- <item>/opt/gnome2/bonobo-activation/lib/bonobo/servers</item> -->
++    <!-- Compatibility with former path for multi-arch transition -->
++    <item>/usr/lib/bonobo/servers</item>
+ </searchpath>
+ 
+ </oafconfig>

Added: attic/libbonobo/debian/patches/05_multiarch_temp_path.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/05_multiarch_temp_path.patch?rev=40288&op=file
==============================================================================
--- attic/libbonobo/debian/patches/05_multiarch_temp_path.patch	(added)
+++ attic/libbonobo/debian/patches/05_multiarch_temp_path.patch	[utf-8] Fri Nov 22 13:58:42 2013
@@ -0,0 +1,22 @@
+Index: libbonobo-2.32.1/bonobo-activation/bonobo-activation-base-service.c
+===================================================================
+--- libbonobo-2.32.1.orig/bonobo-activation/bonobo-activation-base-service.c	2010-08-18 19:41:32.000000000 +0200
++++ libbonobo-2.32.1/bonobo-activation/bonobo-activation-base-service.c	2013-11-22 12:11:12.840539693 +0100
+@@ -537,7 +537,7 @@ _bonobo_activation_lock_fname_get (void)
+                                         "bonobo-activation-register.lock",
+                                         NULL);
+ 
+-       return g_strdup_printf ("%s" G_DIR_SEPARATOR_S "bonobo-activation-register-%s.lock",
++       return g_strdup_printf ("%s" G_DIR_SEPARATOR_S "bonobo-activation-register-" MULTIARCH_TRIPLET "-%s.lock",
+                                get_tmpdir (), session_guid);
+ }
+ 
+@@ -553,7 +553,7 @@ _bonobo_activation_ior_fname_get (void)
+                                         "bonobo-activation-server-ior",
+                                         NULL);
+ 
+-       return g_strdup_printf ("%s" G_DIR_SEPARATOR_S "bonobo-activation-server-%s-ior",
++       return g_strdup_printf ("%s" G_DIR_SEPARATOR_S "bonobo-activation-server-" MULTIARCH_TRIPLET "-%s-ior",
+                                get_tmpdir (), session_guid);
+ }
+ 

Modified: attic/libbonobo/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/series?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/patches/series	[utf-8] (original)
+++ attic/libbonobo/debian/patches/series	[utf-8] Fri Nov 22 13:58:42 2013
@@ -2,3 +2,5 @@
 02_link_add_libraries.patch
 20_server-files-gettext.patch
 03_dont_use_srcdir_in_tests.patch
+04_multiarch_compat_path.patch
+05_multiarch_temp_path.patch

Modified: attic/libbonobo/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/rules?rev=40288&op=diff
==============================================================================
--- attic/libbonobo/debian/rules	[utf-8] (original)
+++ attic/libbonobo/debian/rules	[utf-8] Fri Nov 22 13:58:42 2013
@@ -8,10 +8,11 @@
 include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
-DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libbonobo2-0 (>= 2.15.0)'
+CPPFLAGS += -DMULTIARCH_TRIPLET=\\\"$(DEB_HOST_MULTIARCH)\\\"
+DEB_DH_MAKESHLIBS_ARGS_ALL += -V 'libbonobo2-0 (>= 2.32.1-3~)'
 DEB_DH_SHLIBDEPS_ARGS_ALL += -Llibbonobo2-0
-DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/bonobo-activation"
-DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc
+DEB_CONFIGURE_LIBEXECDIR := "\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/bonobo-activation"
+DEB_CONFIGURE_EXTRA_FLAGS += --enable-gtk-doc --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 install/libbonobo2-common::
-	rm -f $(CURDIR)/debian/tmp/usr/lib/bonobo/servers/broken.server
+	rm -f $(CURDIR)/debian/tmp/usr/lib/*/bonobo/servers/broken.server

More information about the pkg-gnome-commits mailing list