The following commit has been merged in the master branch:
commit cc0a04426b6aaa134b2a9fbcb43c4500db511b6d
Author: David Paleino <da...@debian.org>
Date: Wed Sep 28 18:55:36 2011 +0200
Create per-jar MANIFEST.MF
diff --git a/debian/patches/03-create_manifest.patch
b/debian/patches/03-create_manifest.patch
new file mode 100644
index 0000000..267d857
--- /dev/null
+++ b/debian/patches/03-create_manifest.patch
@@ -0,0 +1,92 @@
+From: David Paleino <da...@debian.org>
+Subject: write Class-Path into per-jar MANIFEST.MF
+Origin: vendor
+Forwarded: not-needed
+
+---
+ apidb/jar.properties | 1 +
+ areafilter/jar.properties | 1 +
+ build-support/script/build-java.xml | 5 ++++-
+ core/jar.properties | 1 +
+ dataset/jar.properties | 1 +
+ extract/jar.properties | 1 +
+ hstore-jdbc/jar.properties | 1 +
+ pbf/jar.properties | 1 +
+ pgsimple/jar.properties | 1 +
+ pgsnapshot/jar.properties | 1 +
+ replication/jar.properties | 1 +
+ set/jar.properties | 1 +
+ tagfilter/jar.properties | 1 +
+ xml/jar.properties | 1 +
+ 14 files changed, 17 insertions(+), 1 deletion(-)
+
+--- osmosis.orig/build-support/script/build-java.xml
++++ osmosis/build-support/script/build-java.xml
+@@ -72,11 +72,14 @@
+ <target name="_build" depends="build_src" description="Generates the
binaries for the distribution.">
+ <!-- Create the binary directory -->
+ <mkdir dir="build/binary"/>
+-
++
++ <property file="jar.properties" />
++
+ <!-- Create a manifest for the jar file. -->
+ <manifest file="build/binary/jar.txt">
+ <attribute name="Main-Class"
value="org.openstreetmap.osmosis.core.Osmosis"/>
+ <attribute name="Built-By" value="${user.name}"/>
++ <attribute name="Class-Path" value="${jar.classpath}"/>
+ <attribute name="Implementation-Title" value="Osmosis
Library"/>
+ <attribute name="Implementation-Version"
value="${project.version} (${TODAY})"/>
+ <attribute name="Implementation-Vendor" value="Brett
Henderson"/>
+--- /dev/null
++++ osmosis/apidb/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-replication.jar /usr/share/osmosis/osmosis-xml.jar
/usr/share/java/spring-jdbc.jar /usr/share/java/commons-dbcp.jar
/usr/share/java/postgresql.jar /usr/share/java/mysql-connector-java.jar
+--- /dev/null
++++ osmosis/areafilter/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar /usr/share/java/postgresql.jar
/usr/share/java/mysql-connector-java.jar
+--- /dev/null
++++ osmosis/core/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/java/jpf.jar /usr/share/java/wstx-lgpl.jar
/usr/share/java/stax2-api.jar /usr/share/java/commons-compress.jar
/usr/share/java/xercesImpl.jar
+--- /dev/null
++++ osmosis/dataset/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
++++ osmosis/extract/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-apidb.jar /usr/share/osmosis/osmosis-replication.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
++++ osmosis/hstore-jdbc/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/java/postgresql.jar
+--- /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
+--- /dev/null
++++ osmosis/pgsimple/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis-core.jar /usr/share/osmosis-dataset.jar
/usr/share/osmosis-xml.jar /usr/share/java/spring-jdbc.jar
/usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar
/usr/share/java/postgis.jar
+--- /dev/null
++++ osmosis/pgsnapshot/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-hstore.jar /usr/share/osmosis/osmosis-dataset.jar
/usr/share/osmosis/osmosis-xml.jar /usr/share/java/spring-jdbc.jar
/usr/share/java/commons-dbcp.jar /usr/share/java/postgresql.jar
/usr/share/java/postgis.jar
+--- /dev/null
++++ osmosis/replication/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-set.jar /usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
++++ osmosis/set/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
++++ osmosis/tagfilter/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/osmosis/osmosis-xml.jar
+--- /dev/null
++++ osmosis/xml/jar.properties
+@@ -0,0 +1 @@
++jar.classpath=/usr/share/osmosis/osmosis-core.jar
/usr/share/java/commons-codec.jar
diff --git a/debian/patches/series b/debian/patches/series
index fe7ab08..764fd8d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
00-fix_build_system.patch
01-fix_launcher.patch
02-fix_plexus.patch
+03-create_manifest.patch
--
Osmosis, an OSM data processor
_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
