[Pkg-osm-commits] [SCM] osmosis branch, master, updated. debian/0.39+ds1-6-9-g0235579

[David Paleino]

The following commit has been merged in the master branch:
commit 02355795d73d5c0298298714ae9a7eb8560dc4b2
Author: David Paleino <dapal at debian.org>
Date:   Fri Dec 23 13:19:34 2011 +0100

    Fix links to protobuf's jar (Closes: #650617, #652754)

diff --git a/debian/changelog b/debian/changelog
index 117d808..2fee2a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,9 @@ osmosis (0.40+ds1-1) UNRELEASED; urgency=low
   * Fix debian/watch and debian/rules' get-orig-source to point to github
   * Refresh patches to apply to the new source
   * Bump B-D on libwoodstox-java to >= 4.12, and junit4 to >= 4.10
+  * Fix links to protobuf's jar (Closes: #650617, #652754)
 
- -- David Paleino <dapal at debian.org>  Thu, 01 Dec 2011 18:37:28 +0100
+ -- David Paleino <dapal at debian.org>  Fri, 23 Dec 2011 13:19:15 +0100
 
 osmosis (0.39+ds1-6) unstable; urgency=low
 
diff --git a/debian/patches/02-fix_plexus.patch b/debian/patches/02-fix_plexus.patch
index 3cae336..240c48c 100644
--- a/debian/patches/02-fix_plexus.patch
+++ b/debian/patches/02-fix_plexus.patch
@@ -27,7 +27,7 @@ Forwarded: not-needed
 +load /usr/share/java/spring3-transaction.jar
 +load /usr/share/java/wstx-lgpl.jar
 +load /usr/share/java/batik-ext.jar
-+load /usr/share/java/protobuf.jar
++load /usr/share/java/protobuf-java.jar
 +load /usr/share/java/osmpbf.jar
 +load /usr/share/java/commons-pool.jar
 +load ${app.home}/*.jar
diff --git a/debian/patches/03-create_manifest.patch b/debian/patches/03-create_manifest.patch
index bd78dfa..ccc1847 100644
--- a/debian/patches/03-create_manifest.patch
+++ b/debian/patches/03-create_manifest.patch
@@ -65,7 +65,7 @@ Forwarded: not-needed
 --- /dev/null
 +++ osmosis/pbf/jar.properties
 @@ -0,0 +1 @@
-+jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/java/protobuf.jar /usr/share/java/osmpbf.jar
++jar.classpath=/usr/share/osmosis/osmosis-core.jar /usr/share/java/protobuf-java.jar /usr/share/java/osmpbf.jar
 --- /dev/null
 +++ osmosis/pgsimple/jar.properties
 @@ -0,0 +1 @@

-- 
Osmosis, an OSM data processor