[pkg-java] r19287 - in tags/slashtime: . 0.5.13-2/debian 0.5.13-2/debian/patches
Markus Koschany
apo at moszumanska.debian.org
Tue Oct 24 18:54:27 UTC 2017
Author: apo
Date: 2017-10-24 18:54:26 +0000 (Tue, 24 Oct 2017)
New Revision: 19287
Added:
tags/slashtime/0.5.13-2/
tags/slashtime/0.5.13-2/debian/changelog
tags/slashtime/0.5.13-2/debian/compat
tags/slashtime/0.5.13-2/debian/control
tags/slashtime/0.5.13-2/debian/copyright
tags/slashtime/0.5.13-2/debian/manifest
tags/slashtime/0.5.13-2/debian/patches/series
tags/slashtime/0.5.13-2/debian/patches/slashtime-java9.patch
Removed:
tags/slashtime/0.5.13-2/debian/changelog
tags/slashtime/0.5.13-2/debian/compat
tags/slashtime/0.5.13-2/debian/control
tags/slashtime/0.5.13-2/debian/copyright
tags/slashtime/0.5.13-2/debian/patches/series
Log:
[svn-buildpackage] Tagging slashtime 0.5.13-2
Deleted: tags/slashtime/0.5.13-2/debian/changelog
===================================================================
--- trunk/slashtime/debian/changelog 2017-10-24 15:34:00 UTC (rev 19285)
+++ tags/slashtime/0.5.13-2/debian/changelog 2017-10-24 18:54:26 UTC (rev 19287)
@@ -1,5 +0,0 @@
-slashtime (0.5.13-1) unstable; urgency=low
-
- * Initial release (Closes: #643911)
-
- -- Guillaume Mazoyer <respawneral at gmail.com> Fri, 30 Sep 2011 19:14:04 +0200
Copied: tags/slashtime/0.5.13-2/debian/changelog (from rev 19286, trunk/slashtime/debian/changelog)
===================================================================
--- tags/slashtime/0.5.13-2/debian/changelog (rev 0)
+++ tags/slashtime/0.5.13-2/debian/changelog 2017-10-24 18:54:26 UTC (rev 19287)
@@ -0,0 +1,18 @@
+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)
+
+ -- Guillaume Mazoyer <respawneral at gmail.com> Fri, 30 Sep 2011 19:14:04 +0200
Deleted: tags/slashtime/0.5.13-2/debian/compat
===================================================================
--- trunk/slashtime/debian/compat 2017-10-24 15:34:00 UTC (rev 19285)
+++ tags/slashtime/0.5.13-2/debian/compat 2017-10-24 18:54:26 UTC (rev 19287)
@@ -1 +0,0 @@
-8
Copied: tags/slashtime/0.5.13-2/debian/compat (from rev 19286, trunk/slashtime/debian/compat)
===================================================================
--- tags/slashtime/0.5.13-2/debian/compat (rev 0)
+++ tags/slashtime/0.5.13-2/debian/compat 2017-10-24 18:54:26 UTC (rev 19287)
@@ -0,0 +1 @@
+10
Deleted: tags/slashtime/0.5.13-2/debian/control
===================================================================
--- trunk/slashtime/debian/control 2017-10-24 15:34:00 UTC (rev 19285)
+++ tags/slashtime/0.5.13-2/debian/control 2017-10-24 18:54:26 UTC (rev 19287)
@@ -1,32 +0,0 @@
-Source: slashtime
-Section: misc
-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),
- 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/
-
-Package: slashtime
-Architecture: all
-Depends: default-jre | java6-runtime,
- libjava-gnome-java (>= 4.1.1),
- ${java:Depends},
- ${misc:Depends}
-Description: Display the time in various places
- A small program which displays the time in various places. It has a compact
- display of locations along with supporting information such as the date and
- the abbreviated code used to name that timezone.
- .
- Time data displayed will be as accurate as the system's zoneinfo data is used.
- Somewhat unusually, Slashtime shows the offset from the current location, not
- from UTC. When running you can change the center point by double-clicking on
- another city.
- .
- There is a meeting planner built into Slashtime. You can specify a date and
- time and see what the corresponding time in other locations will be.
Copied: tags/slashtime/0.5.13-2/debian/control (from rev 19286, trunk/slashtime/debian/control)
===================================================================
--- tags/slashtime/0.5.13-2/debian/control (rev 0)
+++ tags/slashtime/0.5.13-2/debian/control 2017-10-24 18:54:26 UTC (rev 19287)
@@ -0,0 +1,32 @@
+Source: slashtime
+Section: misc
+Priority: optional
+Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
+Uploaders: Guillaume Mazoyer <respawneral at gmail.com>
+Build-Depends: debhelper (>= 10),
+ default-jdk,
+ javahelper,
+ libjava-gnome-java (>= 4.1.1)
+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 | java7-runtime,
+ libjava-gnome-java (>= 4.1.1),
+ ${java:Depends},
+ ${misc:Depends}
+Description: Display the time in various places
+ A small program which displays the time in various places. It has a compact
+ display of locations along with supporting information such as the date and
+ the abbreviated code used to name that timezone.
+ .
+ Time data displayed will be as accurate as the system's zoneinfo data is used.
+ Somewhat unusually, Slashtime shows the offset from the current location, not
+ from UTC. When running you can change the center point by double-clicking on
+ another city.
+ .
+ There is a meeting planner built into Slashtime. You can specify a date and
+ time and see what the corresponding time in other locations will be.
Deleted: tags/slashtime/0.5.13-2/debian/copyright
===================================================================
--- trunk/slashtime/debian/copyright 2017-10-24 15:34:00 UTC (rev 19285)
+++ tags/slashtime/0.5.13-2/debian/copyright 2017-10-24 18:54:26 UTC (rev 19287)
@@ -1,43 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: slashtime
-Source: http://research.operationaldynamics.com/projects/slashtime/dist/
-
-Files: *
-Copyright: Copyright (C) 2003-2011 Operational Dynamics Consulting Pty Ltd, and Others
-License: GPL-2
- slashtime is Logiciel Libre and is Open Source; you can redistribute it and/or
- modify it under the terms of the GNU General Public License, version 2 ("GPL"),
- with the exception that external third party libraries used by slashtime do not
- need to be licenced under GPL so long as they are redistributable under an Open
- Source licence.
- .
- slashtime 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 GPL for more details. In particular, note that if
- you use this and loose your data, you're on your own.
- .
- Of course, if you find a bug, please let us know. And, if you fix anything or
- improve the code please contribute your changes back - that's the whole idea of
- Open Source. See BUGS and HACKING files for details.
- .
- You should have a copy of the GPL somewhere on your system. If you don't, see
- <http://www.gnu.org/licenses/>
-
-Files: debian/*
-Copyright: 2012 Guillaume Mazoyer <respawneral at gmail.com>
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
- .
- 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 program. If not, see <http://www.gnu.org/licenses/>
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Copied: tags/slashtime/0.5.13-2/debian/copyright (from rev 19286, trunk/slashtime/debian/copyright)
===================================================================
--- tags/slashtime/0.5.13-2/debian/copyright (rev 0)
+++ tags/slashtime/0.5.13-2/debian/copyright 2017-10-24 18:54:26 UTC (rev 19287)
@@ -0,0 +1,43 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: slashtime
+Source: http://research.operationaldynamics.com/projects/slashtime/dist/
+
+Files: *
+Copyright: Copyright (C) 2003-2011 Operational Dynamics Consulting Pty Ltd, and Others
+License: GPL-2
+ slashtime is Logiciel Libre and is Open Source; you can redistribute it and/or
+ modify it under the terms of the GNU General Public License, version 2 ("GPL"),
+ with the exception that external third party libraries used by slashtime do not
+ need to be licenced under GPL so long as they are redistributable under an Open
+ Source licence.
+ .
+ slashtime 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 GPL for more details. In particular, note that if
+ you use this and loose your data, you're on your own.
+ .
+ Of course, if you find a bug, please let us know. And, if you fix anything or
+ improve the code please contribute your changes back - that's the whole idea of
+ Open Source. See BUGS and HACKING files for details.
+ .
+ You should have a copy of the GPL somewhere on your system. If you don't, see
+ <http://www.gnu.org/licenses/>
+
+Files: debian/*
+Copyright: 2012 Guillaume Mazoyer <respawneral at gmail.com>
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ 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 program. If not, see <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
Copied: tags/slashtime/0.5.13-2/debian/manifest (from rev 19286, trunk/slashtime/debian/manifest)
===================================================================
--- tags/slashtime/0.5.13-2/debian/manifest (rev 0)
+++ tags/slashtime/0.5.13-2/debian/manifest 2017-10-24 18:54:26 UTC (rev 19287)
@@ -0,0 +1,4 @@
+usr/share/java/slashtime.jar:
+ Class-Path: gtk.jar
+ Main-Class: slashtime.client.Master
+
Deleted: tags/slashtime/0.5.13-2/debian/patches/series
===================================================================
--- trunk/slashtime/debian/patches/series 2017-10-24 15:34:00 UTC (rev 19285)
+++ tags/slashtime/0.5.13-2/debian/patches/series 2017-10-24 18:54:26 UTC (rev 19287)
@@ -1,2 +0,0 @@
-01_launcher_script.patch
-02_manpage.patch
Copied: tags/slashtime/0.5.13-2/debian/patches/series (from rev 19286, trunk/slashtime/debian/patches/series)
===================================================================
--- tags/slashtime/0.5.13-2/debian/patches/series (rev 0)
+++ tags/slashtime/0.5.13-2/debian/patches/series 2017-10-24 18:54:26 UTC (rev 19287)
@@ -0,0 +1,3 @@
+01_launcher_script.patch
+02_manpage.patch
+slashtime-java9.patch
Copied: tags/slashtime/0.5.13-2/debian/patches/slashtime-java9.patch (from rev 19286, trunk/slashtime/debian/patches/slashtime-java9.patch)
===================================================================
--- tags/slashtime/0.5.13-2/debian/patches/slashtime-java9.patch (rev 0)
+++ tags/slashtime/0.5.13-2/debian/patches/slashtime-java9.patch 2017-10-24 18:54:26 UTC (rev 19287)
@@ -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
More information about the pkg-java-commits
mailing list