r40291 - in /attic/libbonobo/debian: changelog libbonobo2-bin.install patches/06_sample_paths.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Nov 23 20:21:48 2013
New Revision: 40291

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40291
Log:
06_sample_paths.patch: new patch. Fix installation paths for the 
example to make them work with multiarch.

Added:
    attic/libbonobo/debian/patches/06_sample_paths.patch
Modified:
    attic/libbonobo/debian/changelog
    attic/libbonobo/debian/libbonobo2-bin.install
    attic/libbonobo/debian/patches/series

Modified: attic/libbonobo/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/changelog?rev=40291&op=diff
==============================================================================
--- attic/libbonobo/debian/changelog	[utf-8] (original)
+++ attic/libbonobo/debian/changelog	[utf-8] Sat Nov 23 20:21:48 2013
@@ -18,6 +18,8 @@
     + 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.
+    + 06_sample_paths.patch: new patch. Fix installation paths for the 
+      example to make them work with multiarch.
   * Drop *.la files.
 
  -- Josselin Mouette <joss at debian.org>  Fri, 22 Nov 2013 12:15:47 +0100

Modified: attic/libbonobo/debian/libbonobo2-bin.install
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/libbonobo2-bin.install?rev=40291&op=diff
==============================================================================
--- attic/libbonobo/debian/libbonobo2-bin.install	[utf-8] (original)
+++ attic/libbonobo/debian/libbonobo2-bin.install	[utf-8] Sat Nov 23 20:21:48 2013
@@ -1,4 +1,4 @@
 debian/tmp/usr/bin
 debian/tmp/usr/sbin
-debian/tmp/usr/lib/*/bonobo-2.0
+debian/tmp/usr/lib/*/bonobo/samples
 debian/tmp/usr/lib/*/bonobo/servers/Bonobo_Sample_Echo.server

Added: attic/libbonobo/debian/patches/06_sample_paths.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/06_sample_paths.patch?rev=40291&op=file
==============================================================================
--- attic/libbonobo/debian/patches/06_sample_paths.patch	(added)
+++ attic/libbonobo/debian/patches/06_sample_paths.patch	[utf-8] Sat Nov 23 20:21:48 2013
@@ -0,0 +1,29 @@
+Index: libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo.server.in.in
+===================================================================
+--- libbonobo-2.32.1.orig/samples/echo/Bonobo_Sample_Echo.server.in.in	2009-04-20 15:16:57.000000000 +0200
++++ libbonobo-2.32.1/samples/echo/Bonobo_Sample_Echo.server.in.in	2013-11-23 21:07:30.981924419 +0100
+@@ -1,7 +1,7 @@
+ <oaf_info>
+ 
+ <oaf_server iid="OAFIID:Bonobo_Sample_Echo_Factory" type="exe" 
+-	location="@prefix@/lib/bonobo-2.0/samples/bonobo-echo-2">
++	location="@libdir@/bonobo/samples/bonobo-echo-2">
+ 	<oaf_attribute name="repo_ids" type="stringv">
+ 		<item value="IDL:GNOME/ObjectFactory:1.0"/>
+ 	</oaf_attribute>
+Index: libbonobo-2.32.1/samples/echo/Makefile.am
+===================================================================
+--- libbonobo-2.32.1.orig/samples/echo/Makefile.am	2013-11-23 21:05:36.382032651 +0100
++++ libbonobo-2.32.1/samples/echo/Makefile.am	2013-11-23 21:06:56.559158584 +0100
+@@ -5,9 +5,9 @@
+ server_dot_in=Bonobo_Sample_Echo.server.in
+ 
+ $(server_dot_in): $(server_dot_in).in
+-	$(AM_V_GEN) $(SED) -e "s|\@prefix\@|$(prefix)|" $< > $@
++	$(AM_V_GEN) $(SED) -e "s|\@libdir\@|$(libdir)|" $< > $@
+ 
+-samplesdir = $(libdir)/bonobo-2.0/samples
++samplesdir = $(libdir)/bonobo/samples
+ samples_PROGRAMS = bonobo-echo-2
+ 
+ bin_PROGRAMS     = echo-client-2

Modified: attic/libbonobo/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/attic/libbonobo/debian/patches/series?rev=40291&op=diff
==============================================================================
--- attic/libbonobo/debian/patches/series	[utf-8] (original)
+++ attic/libbonobo/debian/patches/series	[utf-8] Sat Nov 23 20:21:48 2013
@@ -4,3 +4,4 @@
 03_dont_use_srcdir_in_tests.patch
 04_multiarch_compat_path.patch
 05_multiarch_temp_path.patch
+06_sample_paths.patch