[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-4-4-g098806f

[David Paleino]

The following commit has been merged in the master branch:
commit 098806fdce28984677d36cce508e4f6c34b34234
Author: David Paleino <dapal at debian.org>
Date:   Sun Oct 9 20:10:34 2011 +0200

    Really fix log4j

diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index e36f296..49388f2 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -3,12 +3,12 @@ Subject: fix launcher to correctly point to installed files
 Forwarded: not-needed
 
 ---
- package/bin/osmosis |   13 +++++++------
- 1 file changed, 7 insertions(+), 6 deletions(-)
+ package/bin/osmosis |   14 ++++++++------
+ 1 file changed, 8 insertions(+), 6 deletions(-)
 
 --- osmosis.orig/package/bin/osmosis
 +++ osmosis/package/bin/osmosis
-@@ -80,15 +80,16 @@ exit 1
+@@ -80,15 +80,17 @@ exit 1
  fi
  
  # make it fully qualified
@@ -28,6 +28,7 @@ Forwarded: not-needed
 +EXEC="$JAVACMD $JAVACMD_OPTIONS -cp $MYAPP_CLASSPATH"
 +EXEC="$EXEC -Dapp.home=$MYAPP_HOME"
 +EXEC="$EXEC -Dclassworlds.conf=/etc/osmosis/plexus.conf"
++EXEC="$EXEC -Dlog4j.configuration=file:/etc/osmosis/log4j.properties"
 +EXEC="$EXEC $MAINCLASS $OSMOSIS_OPTIONS"
  
  exec $EXEC "$@"

-- 
Osmosis, an OSM data processor