Author: gmazoyer-guest
Date: 2012-04-06 19:39:00 +0000 (Fri, 06 Apr 2012)
New Revision: 15906
Added:
trunk/slashtime/debian/patches/01_launcher_script.patch
trunk/slashtime/debian/patches/02_manpage.patch
Removed:
trunk/slashtime/debian/patches/01_manifest.patch
trunk/slashtime/debian/patches/02_launcher_script.patch
trunk/slashtime/debian/patches/03_manpage.patch
Modified:
trunk/slashtime/debian/control
trunk/slashtime/debian/copyright
trunk/slashtime/debian/patches/series
trunk/slashtime/debian/rules
Log:
slashtime: several fixes.
Modified: trunk/slashtime/debian/control
===================================================================
--- trunk/slashtime/debian/control 2012-04-06 11:07:20 UTC (rev 15905)
+++ trunk/slashtime/debian/control 2012-04-06 19:39:00 UTC (rev 15906)
@@ -5,6 +5,7 @@
Uploaders: Guillaume Mazoyer <respawne...@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/
@@ -14,8 +15,9 @@
Architecture: all
Depends: default-jre | java6-runtime,
libjava-gnome-java (>= 4.1.1),
+ ${java:Depends},
${misc:Depends}
-Description: Display the time in various places.
+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.
Modified: trunk/slashtime/debian/copyright
===================================================================
--- trunk/slashtime/debian/copyright 2012-04-06 11:07:20 UTC (rev 15905)
+++ trunk/slashtime/debian/copyright 2012-04-06 19:39:00 UTC (rev 15906)
@@ -4,7 +4,7 @@
Files: *
Copyright: Copyright (C) 2003-2011 Operational Dynamics Consulting Pty Ltd,
and Others
-License:
+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
@@ -24,7 +24,7 @@
<http://www.gnu.org/licenses/>
Files: debian/*
-Copyright: 2011 Guillaume Mazoyer <respawne...@gmail.com>
+Copyright: 2012 Guillaume Mazoyer <respawne...@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
Added: trunk/slashtime/debian/patches/01_launcher_script.patch
===================================================================
--- trunk/slashtime/debian/patches/01_launcher_script.patch
(rev 0)
+++ trunk/slashtime/debian/patches/01_launcher_script.patch 2012-04-06
19:39:00 UTC (rev 15906)
@@ -0,0 +1,38 @@
+## Description: Do not point directly to a java binary.
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: slashtime-0.5.13/configure
+===================================================================
+--- slashtime-0.5.13.orig/configure 2012-04-06 20:46:43.678711766 +0200
++++ slashtime-0.5.13/configure 2012-04-06 20:52:37.540466263 +0200
+@@ -1379,11 +1379,10 @@
+
+ print LAUNCHER "#! /bin/sh\n";
+ print LAUNCHER join (" ",
+- "exec",
+- "$JAVA",
++ "exec java",
+ "-classpath tmp/classes:$JAVAGNOME_JARS ",
+ "slashtime.client.Master",
+- "\$*") . "\n";
++ "\"\$@\"") . "\n";
+
+ close LAUNCHER;
+
+@@ -1395,13 +1394,13 @@
+ open LAUNCHER, ">tmp/launcher/slashtime-install";
+
+ print LAUNCHER "#! /bin/sh\n";
++print LAUNCHER "# cd'ing to the directory is necessary for the application to
find the images.\n";
+ print LAUNCHER "cd $prefix\n";
+ print LAUNCHER join (" ",
+- "exec",
+- "$JAVA",
++ "exec java",
+ "-classpath $SLASHTIME_JARS:$JAVAGNOME_JARS",
+ "slashtime.client.Master",
+- "\$*") . "\n";
++ "\"\$@\"") . "\n";
+
+ close LAUNCHER;
+
Deleted: trunk/slashtime/debian/patches/01_manifest.patch
===================================================================
--- trunk/slashtime/debian/patches/01_manifest.patch 2012-04-06 11:07:20 UTC
(rev 15905)
+++ trunk/slashtime/debian/patches/01_manifest.patch 2012-04-06 19:39:00 UTC
(rev 15906)
@@ -1,24 +0,0 @@
-## Description: Add Manifest to the JAR file.
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
-Index: slashtime-0.5.13/Makefile
-===================================================================
---- slashtime-0.5.13.orig/Makefile 2011-12-19 00:09:43.011373948 +0100
-+++ slashtime-0.5.13/Makefile 2011-12-19 00:09:40.219360103 +0100
-@@ -121,7 +121,7 @@
-
- tmp/slashtime.jar: tmp/stamp/compile
- @/bin/echo -e "$(JAR_CMD)\t$@"
-- $(JAR) -cf tmp/slashtime.jar -C tmp/classes .
-+ $(JAR) cfm tmp/slashtime.jar Manifest.txt -C tmp/classes .
-
- $(DESTDIR)$(PREFIX)/share/slashtime/images:
- @/bin/echo -e "MKDIR\t$@/"
-Index: slashtime-0.5.13/Manifest.txt
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ slashtime-0.5.13/Manifest.txt 2011-12-19 00:08:23.874981528 +0100
-@@ -0,0 +1,3 @@
-+Manifest-Version: 1.0
-+Main-Class: slashtime.client.Master
-+Class-Path: /usr/share/java/gtk.jar /usr/share/java/slashtime.jar
Deleted: trunk/slashtime/debian/patches/02_launcher_script.patch
===================================================================
--- trunk/slashtime/debian/patches/02_launcher_script.patch 2012-04-06
11:07:20 UTC (rev 15905)
+++ trunk/slashtime/debian/patches/02_launcher_script.patch 2012-04-06
19:39:00 UTC (rev 15906)
@@ -1,35 +0,0 @@
-## Description: Do not point directly to a java binary.
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
-Index: slashtime-0.5.13/configure
-===================================================================
---- slashtime-0.5.13.orig/configure 2011-12-19 00:39:28.916229774 +0100
-+++ slashtime-0.5.13/configure 2011-12-19 00:40:25.236509051 +0100
-@@ -1379,11 +1379,10 @@
-
- print LAUNCHER "#! /bin/sh\n";
- print LAUNCHER join (" ",
-- "exec",
-- "$JAVA",
-+ "exec java",
- "-classpath tmp/classes:$JAVAGNOME_JARS ",
- "slashtime.client.Master",
-- "\$*") . "\n";
-+ "\"\$@\"") . "\n";
-
- close LAUNCHER;
-
-@@ -1397,11 +1396,10 @@
- print LAUNCHER "#! /bin/sh\n";
- print LAUNCHER "cd $prefix\n";
- print LAUNCHER join (" ",
-- "exec",
-- "$JAVA",
-+ "exec java",
- "-classpath $SLASHTIME_JARS:$JAVAGNOME_JARS",
- "slashtime.client.Master",
-- "\$*") . "\n";
-+ "\"\$@\"") . "\n";
-
- close LAUNCHER;
-
Added: trunk/slashtime/debian/patches/02_manpage.patch
===================================================================
--- trunk/slashtime/debian/patches/02_manpage.patch
(rev 0)
+++ trunk/slashtime/debian/patches/02_manpage.patch 2012-04-06 19:39:00 UTC
(rev 15906)
@@ -0,0 +1,35 @@
+## Description: Add a manpage for the slashtime binary.
+## Origin/Author: Guillaume Mazoyer
+## Bug: bug URL
+Index: slashtime-0.5.13/slashtime.1
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ slashtime-0.5.13/slashtime.1 2011-12-19 14:48:49.616930245 +0100
+@@ -0,0 +1,27 @@
++.TH slashtime 1 "December 2011" "Slashtime manpage" "User commands"
++.SH NAME
++Shashtime \- Display the time in various places.
++.SH SYNOPSIS
++.B slashtime
++[\fB--hidden\fP]
++.SH DESCRIPTION
++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.
++.SH OPTIONS
++Only one option is available:
++.TP
++\fB--hidden\fP
++Do not maximize the window at startup.
++.SH BUGS
++No bugs.
++.SH AUTHOR
++Slashtime is written by Andrew Cowie.
Deleted: trunk/slashtime/debian/patches/03_manpage.patch
===================================================================
--- trunk/slashtime/debian/patches/03_manpage.patch 2012-04-06 11:07:20 UTC
(rev 15905)
+++ trunk/slashtime/debian/patches/03_manpage.patch 2012-04-06 19:39:00 UTC
(rev 15906)
@@ -1,35 +0,0 @@
-## Description: Add a manpage for the slashtime binary.
-## Origin/Author: Guillaume Mazoyer
-## Bug: bug URL
-Index: slashtime-0.5.13/slashtime.1
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ slashtime-0.5.13/slashtime.1 2011-12-19 14:48:49.616930245 +0100
-@@ -0,0 +1,27 @@
-+.TH slashtime 1 "December 2011" "Slashtime manpage" "User commands"
-+.SH NAME
-+Shashtime \- Display the time in various places.
-+.SH SYNOPSIS
-+.B slashtime
-+[\fB--hidden\fP]
-+.SH DESCRIPTION
-+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.
-+.SH OPTIONS
-+Only one option is available:
-+.TP
-+\fB--hidden\fP
-+Do not maximize the window at startup.
-+.SH BUGS
-+No bugs.
-+.SH AUTHOR
-+Slashtime is written by Andrew Cowie.
Modified: trunk/slashtime/debian/patches/series
===================================================================
--- trunk/slashtime/debian/patches/series 2012-04-06 11:07:20 UTC (rev
15905)
+++ trunk/slashtime/debian/patches/series 2012-04-06 19:39:00 UTC (rev
15906)
@@ -1,3 +1,2 @@
-01_manifest.patch
-02_launcher_script.patch
-03_manpage.patch
+01_launcher_script.patch
+02_manpage.patch
Modified: trunk/slashtime/debian/rules
===================================================================
--- trunk/slashtime/debian/rules 2012-04-06 11:07:20 UTC (rev 15905)
+++ trunk/slashtime/debian/rules 2012-04-06 19:39:00 UTC (rev 15906)
@@ -1,8 +1,9 @@
#!/usr/bin/make -f
+JAVA_HOME=/usr/lib/jvm/default-java
override_dh_auto_configure:
./configure prefix=/usr libdir=/usr/lib/jni jardir=/usr/share/java
%:
- dh $@
+ dh $@ --with javahelper
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
