#! /bin/sh /usr/share/dpatch/dpatch-run @DPATCH@ diff -urNad mono-tools-1.9-1ubuntu1~/configure mono-tools-1.9-1ubuntu1/configure --- mono-tools-1.9-1ubuntu1~/configure 2008-05-02 23:55:23.000000000 +0100 +++ mono-tools-1.9-1ubuntu1/configure 2008-06-30 15:41:37.000000000 +0100 @@ -707,7 +707,6 @@ GECKO_SHARP_LIBS ENABLE_GECKO_TRUE ENABLE_GECKO_FALSE -MOZILLA_HOME CECIL_ASM GETTEXT_PACKAGE CC @@ -3498,13 +3497,6 @@ fi -if test "x$enable_gecko" = "xyes"; then - # get the mozilla home directory - MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" - -fi - - if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then { { echo "$as_me:$LINENO: error: no HTML display found. You need either gtkhtml or gecko" >&5 echo "$as_me: error: no HTML display found. You need either gtkhtml or gecko" >&2;} @@ -7668,7 +7660,6 @@ GECKO_SHARP_LIBS!$GECKO_SHARP_LIBS$ac_delim ENABLE_GECKO_TRUE!$ENABLE_GECKO_TRUE$ac_delim ENABLE_GECKO_FALSE!$ENABLE_GECKO_FALSE$ac_delim -MOZILLA_HOME!$MOZILLA_HOME$ac_delim CECIL_ASM!$CECIL_ASM$ac_delim GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim _ACEOF diff -urNad mono-tools-1.9-1ubuntu1~/configure.in mono-tools-1.9-1ubuntu1/configure.in --- mono-tools-1.9-1ubuntu1~/configure.in 2008-06-30 15:41:03.000000000 +0100 +++ mono-tools-1.9-1ubuntu1/configure.in 2008-06-30 15:41:18.000000000 +0100 @@ -57,13 +57,6 @@ AC_SUBST(GECKO_SHARP_LIBS) AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes") -if test "x$enable_gecko" = "xyes"; then - # get the mozilla home directory - MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`" - AC_SUBST(MOZILLA_HOME) -fi - - if test "x$enable_gtkhtml$enable_gecko" = "xnono" ; then AC_MSG_ERROR([no HTML display found. You need either gtkhtml or gecko]) fi diff -urNad mono-tools-1.9-1ubuntu1~/docbrowser/monodoc.in mono-tools-1.9-1ubuntu1/docbrowser/monodoc.in --- mono-tools-1.9-1ubuntu1~/docbrowser/monodoc.in 2008-05-02 23:55:23.000000000 +0100 +++ mono-tools-1.9-1ubuntu1/docbrowser/monodoc.in 2008-06-30 15:43:14.000000000 +0100 @@ -63,39 +63,4 @@ ;; esac -getdirectory () { - w=`which $1` - if test -h $w; then - (cd `dirname $w`/`dirname \`readlink $w\``; pwd) - else - dirname $w - fi -} - -if test -n "$MOZILLA_FIVE_HOME"; then - MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif test x@MOZILLA_HOME@ != x; then - if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then - MOZILLA_HOME=@MOZILLA_HOME@ - fi -elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then - MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) -elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then - MOZILLA_FIVE_HOME=`getdirectory xulrunner` - MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then - MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2) -elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then - MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2) -fi - -if [ -n $LD_LIBRARY_PATH ]; then - export LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH -else - export LD_LIBRARY_PATH=$MOZILLA_HOME -fi -export MOZILLA_FIVE_HOME -export MOZILLA_HOME -export LD_LIBRARY_PATH - exec @RUNTIME@ $monodocdir/browser.exe $OPTIONS "$@" $REST diff -urNad mono-tools-1.9-1ubuntu1~/ilcontrast/ilcontrast.in mono-tools-1.9-1ubuntu1/ilcontrast/ilcontrast.in --- mono-tools-1.9-1ubuntu1~/ilcontrast/ilcontrast.in 2008-05-02 23:55:25.000000000 +0100 +++ mono-tools-1.9-1ubuntu1/ilcontrast/ilcontrast.in 2008-06-30 15:44:06.000000000 +0100 @@ -5,39 +5,4 @@ ilcontrastdir=$prefix/lib/ilcontrast -getdirectory () { - w=`which $1` - if test -h $w; then - (cd `dirname $w`/`dirname \`readlink $w\``; pwd) - else - dirname $w - fi -} - -if test -n "$MOZILLA_FIVE_HOME"; then - MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif test x@MOZILLA_HOME@ != x; then - if [ -f @MOZILLA_HOME@/chrome/comm.jar ]; then - MOZILLA_HOME=@MOZILLA_HOME@ - fi -elif grep GRE_PATH /etc/gre.d/*.conf > /dev/null ; then - MOZILLA_HOME=$(grep -h GRE_PATH= /etc/gre.d/*.conf | cut -d '"' -f 2 -d = | head -n 1) -elif [ $(which xulrunner 2> /dev/null) ] > /dev/null ; then - MOZILLA_FIVE_HOME=`getdirectory xulrunner` - MOZILLA_HOME=$MOZILLA_FIVE_HOME -elif [ $(which mozilla 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which mozilla)" > /dev/null ; then - MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which mozilla) | cut -d '"' -f 2) -elif [ $(which firefox 2> /dev/null) ] && grep MOZILLA_FIVE_HOME= "$(which firefox)" > /dev/null ; then - MOZILLA_HOME=$(grep MOZILLA_FIVE_HOME= $(which firefox) | cut -d '"' -f 2) -fi - -if [ -n $LD_LIBRARY_PATH ]; then - export LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH -else - export LD_LIBRARY_PATH=$MOZILLA_HOME -fi -export MOZILLA_FIVE_HOME -export MOZILLA_HOME -export LD_LIBRARY_PATH - exec @RUNTIME@ $ilcontrastdir/ilcontrast.exe "$@"