[mkgmap] 01/02: Merge tag 'debian/0.0.0+svn3652-1' into jessie-backports
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Mon Dec 7 16:56:11 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch jessie-backports
in repository mkgmap.
commit 2b154f251d64609f6cb5f875a3de6bb11dea2fad
Merge: 04c4da0 bced04e
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Mon Dec 7 17:46:24 2015 +0100
Merge tag 'debian/0.0.0+svn3652-1' into jessie-backports
Conflicts:
debian/changelog
debian/ant.properties | 4 ++--
debian/changelog | 7 +++++++
debian/rules | 7 +++----
resources/mkgmap-version.properties | 4 ++--
resources/styles/default/inc/address | 1 +
resources/styles/default/lines | 6 +++++-
src/uk/me/parabola/mkgmap/build/MapBuilder.java | 2 +-
7 files changed, 21 insertions(+), 10 deletions(-)
diff --cc debian/changelog
index d943d67,b2a7fb9..d6d96b6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ mkgmap (0.0.0+svn3652-1) unstable; urgency=medium
+
+ * New upstream SVN snapshot.
+ * Use ant buildsystem instead of custom override.
+
+ -- Bas Couwenberg <sebastic at debian.org> Tue, 01 Dec 2015 23:14:33 +0100
+
+mkgmap (0.0.0+svn3649-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+
+ -- Bas Couwenberg <sebastic at debian.org> Sat, 07 Nov 2015 18:03:01 +0100
+
mkgmap (0.0.0+svn3649-2) unstable; urgency=medium
* Add support for OpenJDK 8 in mkgmap wrapper script.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mkgmap.git
More information about the Pkg-grass-devel
mailing list