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

[David Paleino]

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

    Osmosis configuration file is now set to /etc/osmosis/osmosis.conf (Closes: #644841)

diff --git a/debian/changelog b/debian/changelog
index 1f3281e..b843feb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ osmosis (0.39+ds1-5) UNRELEASED; urgency=low
 
   * Add dependency to libcommons-pool-java (Closes: #644712)
   * Provide a log4j config file, thanks to Alberto Fernández (Closes: #579206)
+  * Osmosis configuration file is now set to /etc/osmosis/osmosis.conf
+    (Closes: #644841)
 
- -- David Paleino <dapal at debian.org>  Sun, 09 Oct 2011 20:05:07 +0200
+ -- David Paleino <dapal at debian.org>  Sun, 09 Oct 2011 20:11:09 +0200
 
 osmosis (0.39+ds1-4) unstable; urgency=low
 
diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index 49388f2..85cdd77 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -3,11 +3,22 @@ Subject: fix launcher to correctly point to installed files
 Forwarded: not-needed
 
 ---
- package/bin/osmosis |   14 ++++++++------
- 1 file changed, 8 insertions(+), 6 deletions(-)
+ package/bin/osmosis |   18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
 
 --- osmosis.orig/package/bin/osmosis
 +++ osmosis/package/bin/osmosis
+@@ -5,8 +5,8 @@
+ # JAVACMD_OPTIONS - The options to append to the java command, typically used to modify jvm settings such as max memory.
+ # OSMOSIS_OPTIONS - The options to apply to all osmosis invocations, typically used to add plugins or make quiet operation the default.
+ 
+-if [ -f /etc/osmosis ] ; then
+-  . /etc/osmosis
++if [ -f /etc/osmosis/osmosis.conf ] ; then
++  . /etc/osmosis/osmosis.conf
+ fi
+ 
+ if [ -f "$HOME/.osmosis" ] ; then
 @@ -80,15 +80,17 @@ exit 1
  fi
  

-- 
Osmosis, an OSM data processor