[osmpbf] 01/03: Imported Upstream version 1.3.3
Bas Couwenberg
sebastic at xs4all.nl
Sun Mar 16 10:08:33 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch debian
in repository osmpbf.
commit 75e69748737f5a1683cc3b31e84cb24cb79eb678
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Mar 15 22:18:01 2014 +0100
Imported Upstream version 1.3.3
---
ReleaseNotes.txt | 6 ++++++
build.xml | 6 ++----
debian/.gitignore | 8 --------
debian/changelog | 4 ++--
debian/control | 7 +++----
include/osmpbf/osmpbf.h | 2 +-
pom.xml | 2 +-
7 files changed, 15 insertions(+), 20 deletions(-)
diff --git a/ReleaseNotes.txt b/ReleaseNotes.txt
index 2dfc41e..2ba9330 100644
--- a/ReleaseNotes.txt
+++ b/ReleaseNotes.txt
@@ -1,4 +1,10 @@
----------------------------------------
+Release notes for 1.3.3 -- 2014-03-15
+----------------------------------------
+
+Fixed ant build file.
+
+----------------------------------------
Release notes for 1.3.2 -- 2014-03-12
----------------------------------------
diff --git a/build.xml b/build.xml
index c1563d7..d25bbd7 100644
--- a/build.xml
+++ b/build.xml
@@ -22,10 +22,8 @@
<arg value="./build.sh"/>
</exec>
<javac includeantruntime="false" destdir="${build.dir}">
- <src>
- <dirset dir="${src.dir}"/>
- <dirset dir="${src.generated.dir}"/>
- </src>
+ <src path="${src.dir}"/>
+ <src path="${src.generated.dir}"/>
<classpath>
<fileset file="/usr/share/java/protobuf.jar"/>
</classpath>
diff --git a/debian/.gitignore b/debian/.gitignore
deleted file mode 100644
index e656fd6..0000000
--- a/debian/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-.mh
-*.debhelper.log
-*.substvars
-files
-libosmpbf-dev
-libosmpbf-java
-osmpbf-bin
-tmp
diff --git a/debian/changelog b/debian/changelog
index a9c7d91..7aaafd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-osmpbf (1.3.2) UNRELEASED; urgency=low
+osmpbf (1.3.3) UNRELEASED; urgency=low
* unreleased
- -- Jochen Topf <jochen at topf.org> Wed, 12 Mar 2014 14:17:12 +0100
+ -- Jochen Topf <jochen at topf.org> Sat, 15 Mar 2014 16:10:12 +0100
diff --git a/debian/control b/debian/control
index 9baa678..ba47c65 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: osmpbf
Maintainer: Jochen Topf <jochen at topf.org>
Section: java
Priority: optional
-Build-Depends: debhelper (>= 9~),
+Build-Depends: debhelper (>= 9),
protobuf-compiler,
libprotobuf-java,
ant,
@@ -10,8 +10,6 @@ Build-Depends: debhelper (>= 9~),
libprotobuf-dev,
maven-repo-helper
Standards-Version: 3.9.5
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/osmpbf.git;a=summary
-Vcs-Git: git://anonscm.debian.org/pkg-grass/osmpbf.git
Homepage: http://github.com/scrosby/OSM-binary
Package: libosmpbf-java
@@ -27,7 +25,8 @@ Description: Java access library for OpenStreetMap PBF file format
Package: libosmpbf-dev
Architecture: any
Section: libdevel
-Depends: ${misc:Depends}
+Depends: libprotobuf-dev,
+ ${misc:Depends}
Description: C headers for OpenStreetMap PBF file format
Osmpbf is a Java/C library to read and write OpenStreetMap PBF files.
PBF (Protocol buffer Binary Format) is a binary file format for OpenStreetMap
diff --git a/include/osmpbf/osmpbf.h b/include/osmpbf/osmpbf.h
index 6045baa..7719476 100644
--- a/include/osmpbf/osmpbf.h
+++ b/include/osmpbf/osmpbf.h
@@ -7,7 +7,7 @@
// this describes the high-level OSM objects
#include <osmpbf/osmformat.pb.h> // IWYU pragma: export
-#define OSMPBF_VERSION "1.3.2"
+#define OSMPBF_VERSION "1.3.3"
namespace OSMPBF {
diff --git a/pom.xml b/pom.xml
index c653c20..7663540 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
<groupId>crosby.binary</groupId>
<artifactId>osmpbf</artifactId>
<packaging>jar</packaging>
- <version>1.3.2</version>
+ <version>1.3.3</version>
<name>OSM-Binary</name>
<description>Library for the OpenStreetMap PBF format</description>
<url>https://github.com/scrosby/OSM-binary</url>
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmpbf.git
More information about the Pkg-grass-devel
mailing list