r3097 - packages/mkgmap/trunk/debian

[tille at alioth.debian.org]

Author: tille
Date: 2013-06-05 09:41:00 +0000 (Wed, 05 Jun 2013)
New Revision: 3097

Modified:
   packages/mkgmap/trunk/debian/changelog
   packages/mkgmap/trunk/debian/compat
   packages/mkgmap/trunk/debian/control
   packages/mkgmap/trunk/debian/rules
Log:
Preparing team upload: Mass changes to packaging regarding recent standards; switched from cdbs to dh because I simply do not understand cdbs; build does not yet work but I'll investigate on debian-mentors


Modified: packages/mkgmap/trunk/debian/changelog
===================================================================
--- packages/mkgmap/trunk/debian/changelog	2013-06-05 09:39:13 UTC (rev 3096)
+++ packages/mkgmap/trunk/debian/changelog	2013-06-05 09:41:00 UTC (rev 3097)
@@ -1,3 +1,19 @@
+mkgmap (0.0.0+svn2640-1) UNRELEASED; urgency=low
+
+  * 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
+  * debian/rules: dh $@ --with javahelper
+
+ -- Andreas Tille <tille at debian.org>  Wed, 05 Jun 2013 11:24:59 +0200
+
 mkgmap (0.0.0+svn1067-1) unstable; urgency=low
 
   [ Andreas Putzo ]

Modified: packages/mkgmap/trunk/debian/compat
===================================================================
--- packages/mkgmap/trunk/debian/compat	2013-06-05 09:39:13 UTC (rev 3096)
+++ packages/mkgmap/trunk/debian/compat	2013-06-05 09:41:00 UTC (rev 3097)
@@ -1 +1 @@
-7
+9

Modified: packages/mkgmap/trunk/debian/control
===================================================================
--- packages/mkgmap/trunk/debian/control	2013-06-05 09:39:13 UTC (rev 3096)
+++ packages/mkgmap/trunk/debian/control	2013-06-05 09:41:00 UTC (rev 3097)
@@ -2,17 +2,23 @@
 Section: utils
 Priority: extra
 Maintainer: Debian GIS Project <pkg-grass-devel at lists.alioth.debian.org>
-Uploaders: Andreas Putzo <andreas at putzo.net>, Francesco Paolo Lovergine <frankie at debian.org>
-DM-Upload-Allowed: yes
-Build-Depends: ant, cdbs, debhelper (>= 7), java-gcj-compat-dev
-Standards-Version: 3.8.2
+Uploaders: Andreas Putzo <andreas at putzo.net>,
+           Francesco Paolo Lovergine <frankie at debian.org>
+Build-Depends: debhelper (>= 9),
+               javahelper (>=0.25),
+               ant,
+               default-jdk,
+               time
+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}, openjdk-6-jre-headless | java5-runtime-headless
+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

Modified: packages/mkgmap/trunk/debian/rules
===================================================================
--- packages/mkgmap/trunk/debian/rules	2013-06-05 09:39:13 UTC (rev 3096)
+++ packages/mkgmap/trunk/debian/rules	2013-06-05 09:41:00 UTC (rev 3097)
@@ -1,11 +1,8 @@
 #!/usr/bin/make -f
-# debian/rules file for mkgmap (uses cdbs)
+# -*- makefile -*-
+# debian/rules file for mkgmap
+# Andreas Tille <tille at debian.org>
+# GPL
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
-
-JAVA_HOME := /usr/lib/jvm/java-gcj/
-ANT_HOME  := /usr/share/ant
-DEB_ANT_BUILD_TARGET := dist
-DEB_ANT_CLEAN_TARGET := clobber
+%:
+	dh $@ --with javahelper