[Pkg-osm-commits] [SCM] osmpbf branch, debian, updated. debian/1.1-1-6-g5fb4b53

[David Paleino]

The following commit has been merged in the debian branch:
commit 5fb4b53b8aa0aecdc54acef888d85dbc83a3c1a3
Author: David Paleino <dapal at debian.org>
Date:   Mon Nov 14 11:16:26 2011 +0100

    Fix build.xml to point to the correct protobuf-java.jar

diff --git a/debian/changelog b/debian/changelog
index baf79c7..5200346 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ osmpbf (1.2.1-1) UNRELEASED; urgency=low
   * New upstream version
   * Added myself to Uploaders
   * Added debian/watch file
+  * Fix build.xml to point to the correct protobuf-java.jar
 
- -- David Paleino <dapal at debian.org>  Mon, 14 Nov 2011 11:05:30 +0100
+ -- David Paleino <dapal at debian.org>  Mon, 14 Nov 2011 11:16:09 +0100
 
 osmpbf (1.1-1) unstable; urgency=low
 
diff --git a/debian/patches/00-build.xml.patch b/debian/patches/00-build.xml.patch
deleted file mode 100644
index 818deb2..0000000
--- a/debian/patches/00-build.xml.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From: Giovanni Mascellani <gio at debian.org>
-Subject: Add simple Ant build.xml file
-Forwarded: yes (via private email to the author)
-
-Upstream source doens't ship any build scripts. This simple Ant build.xml cares
-after the compilation of the package.
-
----
- build.xml |   43 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 43 insertions(+)
-
-Index: osmpbf/build.xml
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ osmpbf/build.xml	2011-01-12 12:31:00.000000000 +0100
-@@ -0,0 +1,43 @@
-+<?xml version="1.0" encoding="utf-8" ?>
-+<project name="osmpbf" default="all" basedir=".">
-+
-+	<property name="src.dir" location="src.java"/>
-+	<property name="src.generated.dir" location="generated.java"/>
-+	<property name="build.dir" location="build"/>
-+	<property name="build.jar" location="osmpbf.jar"/>
-+
-+	<target name="init">
-+		<mkdir dir="${src.generated.dir}"/>
-+		<mkdir dir="${build.dir}"/>
-+	</target>
-+
-+	<target name="clean">
-+		<delete dir="${src.generated.dir}"/>
-+		<delete dir="${build.dir}"/>
-+		<delete file="${build.jar}"/>
-+	</target>
-+
-+	<target name="build" depends="init">
-+		<exec executable="/bin/sh">
-+			<arg value="./build.sh"/>
-+		</exec>
-+		<javac destdir="${build.dir}">
-+			<src>
-+				<dirset dir="${src.dir}"/>
-+				<dirset dir="${src.generated.dir}"/>
-+			</src>
-+			<classpath>
-+				<fileset file="/usr/share/java/protobuf.jar"/>
-+			</classpath>
-+		</javac>
-+	</target>
-+
-+	<target name="dist" depends="build">
-+		<jar destfile="${build.jar}" basedir="${build.dir}"/>
-+	</target>
-+	
-+	<target name="all" depends="dist">
-+	</target>
-+
-+</project>
-+
diff --git a/debian/patches/00-fix_build.patch b/debian/patches/00-fix_build.patch
new file mode 100644
index 0000000..2e56e1f
--- /dev/null
+++ b/debian/patches/00-fix_build.patch
@@ -0,0 +1,15 @@
+---
+ build.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- osmpbf.orig/build.xml
++++ osmpbf/build.xml
+@@ -27,7 +27,7 @@
+ 				<dirset dir="${src.generated.dir}"/>
+ 			</src>
+ 			<classpath>
+-				<fileset file="/usr/share/java/protobuf.jar"/>
++				<fileset file="/usr/share/java/protobuf-java.jar"/>
+ 			</classpath>
+ 		</javac>
+ 	</target>
diff --git a/debian/patches/series b/debian/patches/series
index ad83d9f..b75ec23 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-00-build.xml.patch
+00-fix_build.patch

-- 
Java library to access OpenStreetMap PDF file format