[pkg-java] r19286 - in trunk/slashtime/debian: . patches

[Markus Koschany]

Author: apo
Date: 2017-10-24 18:34:49 +0000 (Tue, 24 Oct 2017)
New Revision: 19286

Added:
   trunk/slashtime/debian/manifest
   trunk/slashtime/debian/patches/slashtime-java9.patch
Modified:
   trunk/slashtime/debian/changelog
   trunk/slashtime/debian/compat
   trunk/slashtime/debian/control
   trunk/slashtime/debian/copyright
   trunk/slashtime/debian/patches/series
Log:
Release slashtime 0.5.13-2


Modified: trunk/slashtime/debian/changelog
===================================================================
--- trunk/slashtime/debian/changelog	2017-10-24 15:34:00 UTC (rev 19285)
+++ trunk/slashtime/debian/changelog	2017-10-24 18:34:49 UTC (rev 19286)
@@ -1,3 +1,16 @@
+slashtime (0.5.13-2) unstable; urgency=medium
+
+  * Team upload.
+  * Switch to compat level 10.
+  * Declare compliance with Debian Policy 4.1.1.
+  * Change dependency to default-jre | java7-runtime.
+  * Add missing Vcs-Browser field.
+  * Use https for Format field.
+  * Add slashtime-java9.patch and fix FTBFS with Java 9.
+    Thanks to Chris West for the report and patch. (Closes: #873255)
+
+ -- Markus Koschany <apo at debian.org>  Tue, 24 Oct 2017 20:10:34 +0200
+
 slashtime (0.5.13-1) unstable; urgency=low
 
   * Initial release (Closes: #643911)

Modified: trunk/slashtime/debian/compat
===================================================================
--- trunk/slashtime/debian/compat	2017-10-24 15:34:00 UTC (rev 19285)
+++ trunk/slashtime/debian/compat	2017-10-24 18:34:49 UTC (rev 19286)
@@ -1 +1 @@
-8
+10

Modified: trunk/slashtime/debian/control
===================================================================
--- trunk/slashtime/debian/control	2017-10-24 15:34:00 UTC (rev 19285)
+++ trunk/slashtime/debian/control	2017-10-24 18:34:49 UTC (rev 19286)
@@ -3,18 +3,18 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Guillaume Mazoyer <respawneral at gmail.com>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 10),
                default-jdk,
                javahelper,
                libjava-gnome-java (>= 4.1.1)
-Standards-Version: 3.9.2
-Homepage: http://research.operationaldynamics.com/projects/slashtime/
-Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/slashtime/
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/slashtime/
+Standards-Version: 4.1.1
+Homepage: https://research.operationaldynamics.com/projects/slashtime/
+Vcs-Svn: svn://anonscm.debian.org/svn/pkg-java/trunk/slashtime/
+Vcs-Browser: https://anonscm.debian.org/viewsvn/pkg-java/trunk/slashtime/
 
 Package: slashtime
 Architecture: all
-Depends: default-jre | java6-runtime,
+Depends: default-jre | java7-runtime,
          libjava-gnome-java (>= 4.1.1),
          ${java:Depends},
          ${misc:Depends}

Modified: trunk/slashtime/debian/copyright
===================================================================
--- trunk/slashtime/debian/copyright	2017-10-24 15:34:00 UTC (rev 19285)
+++ trunk/slashtime/debian/copyright	2017-10-24 18:34:49 UTC (rev 19286)
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: slashtime
 Source: http://research.operationaldynamics.com/projects/slashtime/dist/
 

Added: trunk/slashtime/debian/manifest
===================================================================
--- trunk/slashtime/debian/manifest	                        (rev 0)
+++ trunk/slashtime/debian/manifest	2017-10-24 18:34:49 UTC (rev 19286)
@@ -0,0 +1,4 @@
+usr/share/java/slashtime.jar:
+  Class-Path: gtk.jar
+  Main-Class: slashtime.client.Master
+

Modified: trunk/slashtime/debian/patches/series
===================================================================
--- trunk/slashtime/debian/patches/series	2017-10-24 15:34:00 UTC (rev 19285)
+++ trunk/slashtime/debian/patches/series	2017-10-24 18:34:49 UTC (rev 19286)
@@ -1,2 +1,3 @@
 01_launcher_script.patch
 02_manpage.patch
+slashtime-java9.patch

Added: trunk/slashtime/debian/patches/slashtime-java9.patch
===================================================================
--- trunk/slashtime/debian/patches/slashtime-java9.patch	                        (rev 0)
+++ trunk/slashtime/debian/patches/slashtime-java9.patch	2017-10-24 18:34:49 UTC (rev 19286)
@@ -0,0 +1,37 @@
+From fb1c85543a36e405eea50c6d2ed7515d556033d6 Mon Sep 17 00:00:00 2001
+From: "Chris West (Faux)" <git at goeswhere.com>
+Date: Fri, 25 Aug 2017 21:27:12 +0100
+Subject: [PATCH] fix build on java 9
+
+---
+ Makefile  | 2 +-
+ configure | 3 +++
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 2e398a9..4684acf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -54,7 +54,7 @@ tmp/i18n:
+ compile: tmp/stamp/compile
+ tmp/stamp/compile: $(SOURCES_DIST)
+ 	@/bin/echo -e "$(JAVAC_CMD)\ttmp/classes/*.class"
+-	$(JAVAC) -d tmp/classes -encoding UTF-8 -classpath tmp/classes:$(CLASSPATH) -sourcepath src/java $^
++	$(JAVAC) -source 1.7 -d tmp/classes -encoding UTF-8 -classpath tmp/classes:$(CLASSPATH) -sourcepath src/java $^
+ 	touch $@
+ 
+ 
+diff --git a/configure b/configure
+index 5f5ee7a..42c0041 100755
+--- a/configure
++++ b/configure
+@@ -312,6 +312,9 @@ sub check_runtime (\$$$$) {
+ 		chomp $version[$i];
+ 
+ 		if (!($version[$i] =~ /^\d+$/)) {
++			if ($i > 0 && $version[0] >= 9) {
++				last;
++			}
+ 			output "can't parse version\n";
+ 			$$scalarref = "";
+ 			return