r33899 - /desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch

[biebl at users.alioth.debian.org]

Author: biebl
Date: Sun Apr  1 03:48:39 2012
New Revision: 33899

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=33899
Log:
Replace the patch with the one that was sent upstream

Modified:
    desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch

Modified: desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch?rev=33899&op=diff
==============================================================================
--- desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch [utf-8] (original)
+++ desktop/unstable/gnome-sushi/debian/patches/01-privlib.patch [utf-8] Sun Apr  1 03:48:39 2012
@@ -1,3 +1,18 @@
+From a19ffc2727c0a75bd44128bfe942437386288a21 Mon Sep 17 00:00:00 2001
+From: Michael Biebl <biebl at debian.org>
+Date: Sun, 1 Apr 2012 03:53:17 +0200
+Subject: [PATCH] build: move libsushi out of $libdir
+
+Don't install our private introspected library in the system libdir,
+since it's not supposed to be used outside of sushi.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=673269
+---
+ src/Makefile-sushi.am |    5 ++++-
+ src/Makefile.am       |    6 +++---
+ src/sushi.in          |   10 ++++++++--
+ 3 files changed, 15 insertions(+), 6 deletions(-)
+
 diff --git a/src/Makefile-sushi.am b/src/Makefile-sushi.am
 index feca2db..bb311a5 100644
 --- a/src/Makefile-sushi.am
@@ -40,7 +55,7 @@
  gir_DATA =
  typelib_DATA =
 diff --git a/src/sushi.in b/src/sushi.in
-index c22fe98..e170972 100644
+index 1138f54..b9faad0 100644
 --- a/src/sushi.in
 +++ b/src/sushi.in
 @@ -7,9 +7,15 @@ else
@@ -60,4 +75,7 @@
 +    export LD_LIBRARY_PATH=@pkglibdir@:$LD_LIBRARY_PATH
  fi
  
- @libexecdir@/sushi-start
+ if test x"$GJS_DEBUG_OUTPUT" = x ; then
+-- 
+1.7.9.5
+