tomboy r1979 - in branches/gnome-2-22: . Tomboy
- From: sharm svn gnome org
- To: svn-commits-list gnome org
- Subject: tomboy r1979 - in branches/gnome-2-22: . Tomboy
- Date: Mon, 7 Apr 2008 17:15:34 +0100 (BST)
Author: sharm
Date: Mon Apr 7 17:15:34 2008
New Revision: 1979
URL: http://svn.gnome.org/viewvc/tomboy?rev=1979&view=rev
Log:
* Tomboy/tomboy-panel.in, Tomboy/tomboy.in: Replace #!/bin/bash with
#!/usr/bin/env bash, to handle OSs that have the audacity to put
bash somewhere other than its rightful place. Fixes bug #521160.
Patch courtesy of Romain Tartiere.
* configure.in: Fix check for Mono.Addins >= 0.3. Fixes bug #521616,
patch courtesy of Åukasz JernaÅ.
Modified:
branches/gnome-2-22/ChangeLog
branches/gnome-2-22/Tomboy/tomboy-panel.in
branches/gnome-2-22/Tomboy/tomboy.in
branches/gnome-2-22/configure.in
Modified: branches/gnome-2-22/Tomboy/tomboy-panel.in
==============================================================================
--- branches/gnome-2-22/Tomboy/tomboy-panel.in (original)
+++ branches/gnome-2-22/Tomboy/tomboy-panel.in Mon Apr 7 17:15:34 2008
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
export LD_LIBRARY_PATH="@pkglibdir ${LD_LIBRARY_PATH+:$LD_LIBRARY_PATH}"
export MONO_PATH=$MONO_PATH:@pkglibdir@:@pkglibdir@/addins
Modified: branches/gnome-2-22/Tomboy/tomboy.in
==============================================================================
--- branches/gnome-2-22/Tomboy/tomboy.in (original)
+++ branches/gnome-2-22/Tomboy/tomboy.in Mon Apr 7 17:15:34 2008
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
if [ "x$PWD" = "x srcdir@" ] ; then
echo "*** Running uninstalled @target@ ***"
Modified: branches/gnome-2-22/configure.in
==============================================================================
--- branches/gnome-2-22/configure.in (original)
+++ branches/gnome-2-22/configure.in Mon Apr 7 17:15:34 2008
@@ -126,9 +126,9 @@
#
# Check for external Mono.Addins
#
-PKG_CHECK_MODULES(MONO_ADDINS, mono-addins > 0.3 \
- mono-addins-gui > 0.3 \
- mono-addins-setup > 0.3,
+PKG_CHECK_MODULES(MONO_ADDINS, mono-addins >= 0.3 \
+ mono-addins-gui >= 0.3 \
+ mono-addins-setup >= 0.3,
have_external_mono_addins="yes", have_external_mono_addins="no")
if test "x$have_external_mono_addins" != "xyes"; then
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]