The following commit has been merged in the debian branch:
commit ad2a9b9afbe96f5f0f23c6b5dc74421973d2ab31
Author: Giovanni Mascellani <mascell...@poisson.phc.unipi.it>
Date: Fri Jun 15 10:06:15 2012 +0200
Remove wrong patch.
diff --git a/debian/changelog b/debian/changelog
index cc78dfa..7bd2e5d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osmpbf (1.2.1-3) unstable; urgency=low
+
+ * Remove patch that sets a wrong location for protobuf.jar
+ (closes: #676059).
+
+ -- Giovanni Mascellani <g...@debian.org> Fri, 15 Jun 2012 10:04:57 +0200
+
osmpbf (1.2.1-2) unstable; urgency=low
* Also install the static library in libosmpbf-dev
diff --git a/debian/patches/00-fix_build.patch
b/debian/patches/00-fix_build.patch
deleted file mode 100644
index 81d84ae..0000000
--- a/debian/patches/00-fix_build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: David Paleino <da...@debian.org>
-Subject: fix protobuf jar location
-Origin: vendor
-Forwarded: no
-
----
- 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
deleted file mode 100644
index b75ec23..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-00-fix_build.patch
--
Java library to access OpenStreetMap PDF file format
_______________________________________________
Pkg-osm-commits mailing list
Pkg-osm-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-osm-commits
