[SCM] mkgmap branch, master, updated. a025ad059e22735c2c0701cdc6fa2cc6fb2540b0

2014-01-24 Thread Andreas Tille
The following commit has been merged in the master branch:
commit 992d511897adbada171c1f524d0d59b8554800fb
Merge: 11e13c293f053a97ebcb29589ccde53505034edb 
deb0c79831ddb120fb279bd83bb0bab444a66a02
Author: Andreas Tille ti...@debian.org
Date:   Fri Jan 24 15:53:43 2014 +0100

Merge tag 'upstream/0.0.0+svn2981'

Upstream version 0.0.0+svn2981


-- 
Generate Garmin maps from OpenStreetMap data

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mkgmap branch, master, updated. a025ad059e22735c2c0701cdc6fa2cc6fb2540b0

2014-01-24 Thread Andreas Tille
The following commit has been merged in the master branch:
commit da966ec30b68bc12809ab34e8e96a860d5a1cb3b
Author: Andreas Tille ti...@debian.org
Date:   Fri Jan 24 15:55:43 2014 +0100

Vcs moved from SVN to Git

diff --git a/debian/control b/debian/control
index 9592303..1f706d0 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,8 @@ Build-Depends: debhelper (= 9),
libfastutil-java
 Standards-Version: 3.9.4
 Homepage: http://www.mkgmap.org.uk
-Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mkgmap/trunk
-Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mkgmap/trunk
+Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mkgmap.git
+Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap.git
 
 Package: mkgmap
 Architecture: all

-- 
Generate Garmin maps from OpenStreetMap data

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mkgmap branch, master, updated. a025ad059e22735c2c0701cdc6fa2cc6fb2540b0

2014-01-24 Thread Andreas Tille
The following commit has been merged in the master branch:
commit a025ad059e22735c2c0701cdc6fa2cc6fb2540b0
Author: Andreas Tille ti...@debian.org
Date:   Fri Jan 24 15:59:28 2014 +0100

cme fix dpkg-control; added myself to Uploaders

diff --git a/debian/changelog b/debian/changelog
index 6d20f53..dd3a05b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low
  - Add Build-Depends libfastutil-java as needed by new upstream version
  - Vcs moved from Svn to Git
  - Priority: optional
+ - cme fix dpkg-control
+ - Added myself to Uploaders
   * debian/rules: dh $@ --with javahelper
 
  -- Andreas Tille ti...@debian.org  Wed, 05 Jun 2013 11:24:59 +0200
diff --git a/debian/control b/debian/control
index 710592d..11723c2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,26 +1,28 @@
 Source: mkgmap
-Section: utils
-Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Andreas Putzo andr...@putzo.net,
-   Francesco Paolo Lovergine fran...@debian.org
+   Francesco Paolo Lovergine fran...@debian.org,
+   Andreas Tille ti...@debian.org
+Section: utils
+Priority: optional
 Build-Depends: debhelper (= 9),
-   javahelper (=0.25),
+   javahelper,
ant,
default-jdk,
time,
libfastutil-java
 Standards-Version: 3.9.5
-Homepage: http://www.mkgmap.org.uk
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mkgmap.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap.git
+Homepage: http://www.mkgmap.org.uk
 
 Package: mkgmap
 Architecture: all
 Depends: ${misc:Depends},
  ${java:Depends},
- default-jre | java6-runtime
-Suggests: josm, qlandkarte
+ default-jre | openjdk-7-jre
+Suggests: josm,
+  qlandkarte
 Description: Generate Garmin maps from OpenStreetMap data
  This program converts OpenStreetMap data into a map that
  can be loaded onto compatible Garmin GPS units.

-- 
Generate Garmin maps from OpenStreetMap data

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mkgmap branch, master, updated. a025ad059e22735c2c0701cdc6fa2cc6fb2540b0

2014-01-24 Thread Andreas Tille
The following commit has been merged in the master branch:
commit 54646f6bc249cab0544e9359c5961e6b28a6da2e
Author: Andreas Tille ti...@debian.org
Date:   Fri Jan 24 15:54:32 2014 +0100

For some strange reason debian/ dir vanished after importing pristine-tar 
... restoring

diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 000..7385c7f
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,2 @@
+ant.build.javac.source=1.5
+ant.build.javac.target=1.5
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..8cb8abc
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,42 @@
+mkgmap (0.0.0+svn2640-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.
+  * New upstream version
+Closes: #580170
+  * debian/source/format: 3.0 (quilt)
+  * debian/control:
+ - Standards-Version: 3.9.4
+ - Removed DM-Upload-Allowed
+ - Update (Build-)Depends to recent Java standard
+ - debhelper 9
+ - Add time to Build-Depends which is obviously needed
+ - Add Build-Depends libfastutil-java as needed by new upstream version
+  * debian/rules: dh $@ --with javahelper
+
+ -- Andreas Tille ti...@debian.org  Wed, 05 Jun 2013 11:24:59 +0200
+
+mkgmap (0.0.0+svn1067-1) unstable; urgency=low
+
+  [ Andreas Putzo ]
+  * New upstream snapshot.
+  * Added ${misc:Depends} among dependencies to fix a lintian warning.
+  * Bumped debhelper compatibility level to 7.
+  * Updated long description.
+  * Updated Homepage in debian/control, debian/copyright, debian/watch.
+  * Added numerous files from /doc to debian/docs.
+  * Mentioned Bernhard Heibler in debian/copyright and updated copyright
+year of software and packaging.
+  * Bumped policy to 3.8.2, without changes.
+  * Added DM-Upload-Allowed to debian/control.
+
+  [ Francesco Paolo Lovergine ]
+  * Added me as Uploader to avoid possible inappropriate NMU notices.
+
+ -- Francesco Paolo Lovergine fran...@debian.org  Thu, 16 Jul 2009 11:10:16 
+0200
+
+mkgmap (0.0.0+svn630-1) unstable; urgency=low
+
+  * Initial release (Closes: #475773)
+
+ -- Andreas Putzo andr...@putzo.net  Mon, 14 Jul 2008 13:38:36 +
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..9592303
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,26 @@
+Source: mkgmap
+Section: utils
+Priority: extra
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: Andreas Putzo andr...@putzo.net,
+   Francesco Paolo Lovergine fran...@debian.org
+Build-Depends: debhelper (= 9),
+   javahelper (=0.25),
+   ant,
+   default-jdk,
+   time,
+   libfastutil-java
+Standards-Version: 3.9.4
+Homepage: http://www.mkgmap.org.uk
+Vcs-Browser: http://svn.debian.org/viewsvn/pkg-grass/packages/mkgmap/trunk
+Vcs-Svn: svn://svn.debian.org/svn/pkg-grass/packages/mkgmap/trunk
+
+Package: mkgmap
+Architecture: all
+Depends: ${misc:Depends},
+ ${java:Depends},
+ default-jre | java6-runtime
+Suggests: josm, qlandkarte
+Description: Generate Garmin maps from OpenStreetMap data
+ This program converts OpenStreetMap data into a map that
+ can be loaded onto compatible Garmin GPS units.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..e48f54b
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,43 @@
+This package was debianized by Andreas Putzo andr...@putzo.net on
+Sun, 13 Apr 2008 19:29:58 +.
+
+It was downloaded from http://www.mkgmap.org.uk/snapshots/
+
+Upstream Author:
+
+Steve Ratcliffe s...@parabola.me.uk
+
+Copyright:
+
+Copyright (C) 2007-2009 Steve Ratcliffe s...@parabola.me.uk
+
+License:
+
+This package is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License version 2 as
+published by the Free Software Foundation.
+
+This package is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this package; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+The files:
+ src/uk/me/parabola/mkgmap/general/MapPointMultimap.java,
+ src/uk/me/parabola/mkgmap/general/MapPointFastFindMap.java,
+ src/uk/me/parabola/mkgmap/build/LocatorConfig.java,
+ 

[SCM] mkgmap branch, master, updated. a025ad059e22735c2c0701cdc6fa2cc6fb2540b0

2014-01-24 Thread Andreas Tille
The following commit has been merged in the master branch:
commit c33c5b8cf67f2fede3508c992c18d7727bffa372
Author: Andreas Tille ti...@debian.org
Date:   Fri Jan 24 15:56:26 2014 +0100

UPdate changelog, Standards-Version 3.9.5

diff --git a/debian/changelog b/debian/changelog
index 8cb8abc..2eca64c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,12 +6,13 @@ mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low
 Closes: #580170
   * debian/source/format: 3.0 (quilt)
   * debian/control:
- - Standards-Version: 3.9.4
+ - Standards-Version: 3.9.5
  - Removed DM-Upload-Allowed
  - Update (Build-)Depends to recent Java standard
  - debhelper 9
  - Add time to Build-Depends which is obviously needed
  - Add Build-Depends libfastutil-java as needed by new upstream version
+ - Vcs moved from Svn to Git
   * debian/rules: dh $@ --with javahelper
 
  -- Andreas Tille ti...@debian.org  Wed, 05 Jun 2013 11:24:59 +0200
diff --git a/debian/control b/debian/control
index 1f706d0..ce9a8b0 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Build-Depends: debhelper (= 9),
default-jdk,
time,
libfastutil-java
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Homepage: http://www.mkgmap.org.uk
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/mkgmap.git
 Vcs-Git: git://anonscm.debian.org/pkg-grass/mkgmap.git

-- 
Generate Garmin maps from OpenStreetMap data

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel


[SCM] mkgmap branch, master, updated. a025ad059e22735c2c0701cdc6fa2cc6fb2540b0

2014-01-24 Thread Andreas Tille
The following commit has been merged in the master branch:
commit 339941cac8b31503676fb208a4cbaa09069475cf
Author: Andreas Tille ti...@debian.org
Date:   Fri Jan 24 15:57:01 2014 +0100

Priority: optional

diff --git a/debian/changelog b/debian/changelog
index 2eca64c..6d20f53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low
  - Add time to Build-Depends which is obviously needed
  - Add Build-Depends libfastutil-java as needed by new upstream version
  - Vcs moved from Svn to Git
+ - Priority: optional
   * debian/rules: dh $@ --with javahelper
 
  -- Andreas Tille ti...@debian.org  Wed, 05 Jun 2013 11:24:59 +0200
diff --git a/debian/control b/debian/control
index ce9a8b0..710592d 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: mkgmap
 Section: utils
-Priority: extra
+Priority: optional
 Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
 Uploaders: Andreas Putzo andr...@putzo.net,
Francesco Paolo Lovergine fran...@debian.org

-- 
Generate Garmin maps from OpenStreetMap data

___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel