diff -Nur -x '*.orig' -x '*~' netbeans-new-source/ide/launcher/unix/netbeans netbeans-new-source.new/ide/launcher/unix/netbeans --- netbeans-new-source/ide/launcher/unix/netbeans 2008-03-26 18:55:01.000000000 +0300 +++ netbeans-new-source.new/ide/launcher/unix/netbeans 2008-06-10 19:44:30.000000000 +0400 @@ -54,16 +54,18 @@ fi done -progdir=`dirname "$PRG"` +#progdir=`dirname "$PRG"` +# Patch for Debian/Ubuntu where launcher is in /usr/bin +progdir=/usr/share/netbeans/6.1/bin if [ -f "$progdir"/../etc/netbeans.conf ] ; then . "$progdir"/../etc/netbeans.conf fi # following should be done just in RPM or Solaris Launcher -# if [ -f /etc/netbeans.conf ] ; then -# . /etc/netbeans.conf -# fi + if [ -f /etc/netbeans.conf ] ; then + . /etc/netbeans.conf + fi # #68373: look for userdir, but do not modify "$@"