[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.40.1+ds1-5-7-g780608e

[Giovanni Mascellani]

The following commit has been merged in the master branch:
commit 780608eb7a2dc0cbb53912f1f8005bee159e3034
Author: Giovanni Mascellani <mascellani at poisson.phc.unipi.it>
Date:   Fri Jun 15 12:42:56 2012 +0200

    Fix protobuf.jar file name.

diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index a7addc4..d51d7b0 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -6,8 +6,10 @@ Forwarded: not-needed
  package/config/plexus.conf |   18 ++++++++++++++++--
  1 file changed, 16 insertions(+), 2 deletions(-)
 
---- osmosis.orig/package/config/plexus.conf
-+++ osmosis/package/config/plexus.conf
+Index: osmosis/package/config/plexus.conf
+===================================================================
+--- osmosis.orig/package/config/plexus.conf	2012-06-15 12:18:41.000000000 +0200
++++ osmosis/package/config/plexus.conf	2012-06-15 12:42:47.000000000 +0200
 @@ -1,5 +1,19 @@
  main is org.openstreetmap.osmosis.core.Osmosis from osmosis.core
  
@@ -26,7 +28,7 @@ Forwarded: not-needed
 +load /usr/share/java/spring3-jdbc.jar
 +load /usr/share/java/spring3-transaction.jar
 +load /usr/share/java/batik-ext.jar
-+load /usr/share/java/protobuf-java.jar
++load /usr/share/java/protobuf.jar
 +load /usr/share/java/osmpbf.jar
 +load /usr/share/java/commons-pool.jar
 +load /usr/share/osmosis/*.jar

-- 
Osmosis, an OSM data processor