[SCM] mkgmap branch, master, updated. upstream/0.0.0+svn2981-7-g46a8cb1

Andreas Tille tille at debian.org
Fri Jan 24 15:04:21 UTC 2014


The following commit has been merged in the master branch:
commit 46a8cb19aaa08f92eeb1aa2faca887d8cb290196
Author: Andreas Tille <tille at debian.org>
Date:   Fri Jan 24 16:05:30 2014 +0100

    Adapt patch to latest uptream version

diff --git a/debian/changelog b/debian/changelog
index dd3a05b..5b98938 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low
+mkgmap (0.0.0+svn2981-1) UNRELEASED; urgency=low
 
   * NOT FINISHED! https://github.com/osmandapp/OsmAnd-tools/blob/master/OsmAndMapCreator/src/crosby/binary/Osmformat.java needs to be packaged first
   * Team upload.
@@ -18,7 +18,7 @@ mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low
      - Added myself to Uploaders
   * debian/rules: dh $@ --with javahelper
 
- -- Andreas Tille <tille at debian.org>  Wed, 05 Jun 2013 11:24:59 +0200
+ -- Andreas Tille <tille at debian.org>  Fri, 24 Jan 2014 16:04:34 +0100
 
 mkgmap (0.0.0+svn1067-1) unstable; urgency=low
 
diff --git a/debian/patches/build_xml.patch b/debian/patches/build_xml.patch
index 85d7e92..00eab36 100644
--- a/debian/patches/build_xml.patch
+++ b/debian/patches/build_xml.patch
@@ -1,5 +1,5 @@
 Author: Andreas Tille <tille at debian.org>
-LastChanged: Wed, 05 Jun 2013 11:24:59 +0200
+LastChanged: Fri, 24 Jan 2014 16:04:34 +0100
 Description: Leave out IVY dependency checker
  Attention: This patch is most probably not yet finished.
  I went until the point when I noticed that mkgmap needs a
@@ -18,8 +18,8 @@ Description: Leave out IVY dependency checker
  
  	<!-- Set default javac target value -->
 +	<property name="deblib" location="/usr/share/java"/>
- 	<property name="ant.build.javac.target" value="1.6"/>
- 	<property name="ant.build.javac.source" value="1.6"/>
+ 	<property name="ant.build.javac.target" value="1.7"/>
+ 	<property name="ant.build.javac.source" value="1.7"/>
  
 @@ -71,7 +72,7 @@
  

-- 
Generate Garmin maps from OpenStreetMap data



More information about the Pkg-grass-devel mailing list