[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 752f0366873f4e1cebae2ce2d94b74704456b3a7
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Tue Jan 11 18:58:08 2011 +0100

    Patches updated.

diff --git a/debian/changelog b/debian/changelog
index 25d0d69..982f2bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,12 @@ osmosis (0.38+ds2-1) UNRELEASED; urgency=low
 
   [ Giovanni Mascellani ]
   * debian/watch: updated
+  * debian/patches:
+    - 00-fix_build.patch: removed, build system has completely changed;
+    - 01-fix_launcher.patch, 02-fix_plexus.patch: files moved, conflicts
+      resolved.
 
- -- Giovanni Mascellani <gio at debian.org>  Tue, 11 Jan 2011 18:55:43 +0100
+ -- Giovanni Mascellani <gio at debian.org>  Tue, 11 Jan 2011 18:56:28 +0100
 
 osmosis (0.34+ds1-1) unstable; urgency=low
 
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
deleted file mode 100644
index 9edfa6a..0000000
--- a/debian/patches/00-fix_build.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: David Paleino <dapal at debian.org>
-Subject: fix FTBFS
-Forwarded: no
-
----
- build.xml |    2 --
- 1 file changed, 2 deletions(-)
-
---- osmosis.orig/build.xml
-+++ osmosis/build.xml
-@@ -11,8 +11,6 @@
- 	<property name="project.version.suffix" value=""/> <!-- Can be overriden to include extra info such as svn revision number. -->
- 	<property name="project.version" value="0.34"/>
- 	
--	<import file="build_support/build-ivy.xml"/>
--	
- 	<!-- Define classpaths for each of the lib directories. -->
- 	<path id="classpath.compile">
- 		<fileset dir="lib/compile" includes="**/*.jar"/>
diff --git a/debian/patches/01-fix_launcher.patch b/debian/patches/01-fix_launcher.patch
index c016813..31ec310 100644
--- a/debian/patches/01-fix_launcher.patch
+++ b/debian/patches/01-fix_launcher.patch
@@ -6,8 +6,8 @@ Forwarded: not-needed
  bin/osmosis |   10 ++++------
  1 file changed, 4 insertions(+), 6 deletions(-)
 
---- osmosis.orig/bin/osmosis
-+++ osmosis/bin/osmosis
+--- osmosis.orig/package/bin/osmosis
++++ osmosis/package/bin/osmosis
 @@ -61,15 +61,13 @@ exit 1
  fi
  
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index 4b3f16d..76f53ab 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -6,15 +6,16 @@ Forwarded: not-needed
  config/plexus.conf |   15 ++++++++++++---
  1 file changed, 12 insertions(+), 3 deletions(-)
 
---- osmosis.orig/config/plexus.conf
-+++ osmosis/config/plexus.conf
-@@ -1,6 +1,15 @@
+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
+@@ -1,5 +1,15 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
  [osmosis.core]
--load ${app.home}/lib/*.jar
 -load ${app.home}/lib/default/*.jar
--load ${app.home}/osmosis.jar
+-load ${app.home}/config
 +load /usr/share/java/jpf.jar
 +load /usr/share/java/commons-compress.jar
 +load /usr/share/java/commons-codec.jar
diff --git a/debian/patches/series b/debian/patches/series
index a01c5ce..cfdb821 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-00-fix_build.patch
 01-fix_launcher.patch
 02-fix_plexus.patch

-- 
Osmosis, an OSM data processor