[DebianGIS-dev] [SCM] osmosis branch, master, updated. debian/0.31.2-2-49-gb79425c

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 086083ff9d534cb33335314ddaf0ad5d70b54cc9
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Jan 11 19:06:50 2011 +0100

    Diffstats updated.

diff --git a/debian/patches/00-fix_build_system.patch b/debian/patches/00-fix_build_system.patch
index 4fe5116..2ebe6ce 100644
--- a/debian/patches/00-fix_build_system.patch
+++ b/debian/patches/00-fix_build_system.patch
@@ -8,8 +8,8 @@
 
 Index: osmosis/apidb/build.xml
 ===================================================================
---- osmosis.orig/apidb/build.xml	2011-01-11 19:01:22.000000000 +0100
-+++ osmosis/apidb/build.xml	2011-01-10 21:01:20.000000000 +0100
+--- osmosis.orig/apidb/build.xml	2011-01-11 19:04:12.000000000 +0100
++++ osmosis/apidb/build.xml	2011-01-11 19:05:33.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Apidb" default="all" basedir=".">
@@ -21,8 +21,8 @@ Index: osmosis/apidb/build.xml
  	<import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/build-support/script/build-ivy-base.xml
 ===================================================================
---- osmosis.orig/build-support/script/build-ivy-base.xml	2011-01-11 19:01:12.000000000 +0100
-+++ osmosis/build-support/script/build-ivy-base.xml	2011-01-10 19:45:30.000000000 +0100
+--- osmosis.orig/build-support/script/build-ivy-base.xml	2011-01-11 19:04:12.000000000 +0100
++++ osmosis/build-support/script/build-ivy-base.xml	2011-01-11 19:05:33.000000000 +0100
 @@ -31,9 +31,9 @@
  
  	<target name="init-ivy" depends="init" description="Registers ivy with ant and initializes it." unless="ivy.initialized">
@@ -46,8 +46,8 @@ Index: osmosis/build-support/script/build-ivy-base.xml
  			classpathref="ivy.lib.path" />
 Index: osmosis/build-support/script/build-java.xml
 ===================================================================
---- osmosis.orig/build-support/script/build-java.xml	2011-01-11 19:01:22.000000000 +0100
-+++ osmosis/build-support/script/build-java.xml	2011-01-10 21:00:02.000000000 +0100
+--- osmosis.orig/build-support/script/build-java.xml	2011-01-11 19:04:12.000000000 +0100
++++ osmosis/build-support/script/build-java.xml	2011-01-11 19:05:33.000000000 +0100
 @@ -109,7 +109,7 @@
  	</target>
  	
@@ -59,8 +59,8 @@ Index: osmosis/build-support/script/build-java.xml
  		<!-- Determine the location of the database authorisation file.  This can be overridden outside the build if necessary. -->
 Index: osmosis/extract/build.xml
 ===================================================================
---- osmosis.orig/extract/build.xml	2011-01-11 19:01:31.000000000 +0100
-+++ osmosis/extract/build.xml	2011-01-10 21:04:25.000000000 +0100
+--- osmosis.orig/extract/build.xml	2011-01-11 19:04:12.000000000 +0100
++++ osmosis/extract/build.xml	2011-01-11 19:05:33.000000000 +0100
 @@ -1,6 +1,8 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.Extract" default="all" basedir=".">
@@ -72,8 +72,8 @@ Index: osmosis/extract/build.xml
  	<import file="${build-support.dir}/script/build-java.xml"/>
 Index: osmosis/pgsnapshot/build.xml
 ===================================================================
---- osmosis.orig/pgsnapshot/build.xml	2011-01-11 19:01:31.000000000 +0100
-+++ osmosis/pgsnapshot/build.xml	2011-01-10 21:15:44.000000000 +0100
+--- osmosis.orig/pgsnapshot/build.xml	2011-01-11 19:04:12.000000000 +0100
++++ osmosis/pgsnapshot/build.xml	2011-01-11 19:05:33.000000000 +0100
 @@ -1,5 +1,7 @@
  <?xml version="1.0" encoding="utf-8" ?>
  <project name="Osmosis.PgSnapshot" default="all" basedir=".">
diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index 31ec310..8331ea8 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -3,12 +3,14 @@ Subject: fix launcher to correctly point to installed files
 Forwarded: not-needed
 
 ---
- bin/osmosis |   10 ++++------
+ package/bin/osmosis |   10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
---- osmosis.orig/package/bin/osmosis
-+++ osmosis/package/bin/osmosis
-@@ -61,15 +61,13 @@ exit 1
+Index: osmosis/package/bin/osmosis
+===================================================================
+--- osmosis.orig/package/bin/osmosis	2011-01-11 19:05:21.000000000 +0100
++++ osmosis/package/bin/osmosis	2011-01-11 19:05:33.000000000 +0100
+@@ -61,15 +61,13 @@
  fi
  
  # make it fully qualified
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index 76f53ab..cd4f643 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -3,13 +3,13 @@ Subject: fix Plexus configuration with the right paths
 Forwarded: not-needed
 
 ---
- config/plexus.conf |   15 ++++++++++++---
- 1 file changed, 12 insertions(+), 3 deletions(-)
+ package/config/plexus.conf |   14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
 
 Index: osmosis/package/config/plexus.conf
 ===================================================================
---- osmosis.orig/package/config/plexus.conf	2011-01-11 18:41:58.000000000 +0100
-+++ osmosis/package/config/plexus.conf	2011-01-11 18:53:18.000000000 +0100
+--- osmosis.orig/package/config/plexus.conf	2010-06-22 15:55:29.000000000 +0200
++++ osmosis/package/config/plexus.conf	2011-01-11 19:05:33.000000000 +0100
 @@ -1,5 +1,15 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  

-- 
Osmosis, an OSM data processor