The following commit has been merged in the master branch:
commit 4361b309920f0b24fab2b46bc581626725429eb6
Merge: 31bbcabff897dc5662935dca1cf6e6c1db134fc2
a96e9934f700f2922e072f2e72e7662b1b98afb0
Author: David Paleino <da...@debian.org>
Date: Fri Nov 26 21:58:56 2010 +0100
Merge commit 'upstream/0.38+ds1'
Conflicts:
build.xml
diff --combined bin/osmosis
index f01f218,f822571..aaa4394
mode 100644,100755..100755
--- a/bin/osmosis
+++ b/bin/osmosis
@@@ -18,6 -18,25 +18,6 @@@ if [ -z "$JAVACMD" ] ; the
JAVACMD=java
fi
-## resolve links - $0 may be a link to application
-PRG="$0"
-
-# if started without absolute path, but from PATH environment
-if [ ! -s "$PRG" ] ; then
- PRG=`which $PRG`
-fi
-
-# need this for relative symlinks
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG="`dirname "$PRG"`/$link"
- fi
-done
-
if [ "x$1x" = "xx" ] || echo "$@" | grep -q -e '--help' ; then
cat <<EOF
osmosis
@@@ -54,7 -73,7 +54,7 @@@ osmosis --read-xml file="planetin.osm"
osmosis --read-xml file="planetin.osm" outPipe.0="mypipe" --write-xml
file="planetout.osm" inPipe.0="mypipe"
- Full usage details are available at:
http://www.bretth.com/wiki/Wiki.jsp?page=OpenStreetMap
+ Full usage details are available at:
http://wiki.openstreetmap.org/wiki/Osmosis/DetailedUsage
EOF
exit 1
--
Osmosis, an OSM data processor
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
