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

Mon Dec 19 14:16:30 UTC 2011

Author: gmazoyer-guest
Date: 2011-12-19 14:16:30 +0000 (Mon, 19 Dec 2011)
New Revision: 15561

Added:
   trunk/slashtime/debian/patches/
   trunk/slashtime/debian/patches/01_manifest.patch
   trunk/slashtime/debian/patches/02_launcher_script.patch
   trunk/slashtime/debian/patches/03_manpage.patch
   trunk/slashtime/debian/patches/series
   trunk/slashtime/debian/slashtime.manpages
Modified:
   trunk/slashtime/debian/control
   trunk/slashtime/debian/copyright
Log:
slashtime: fix some lintian errors and warnings.

Modified: trunk/slashtime/debian/control
===================================================================

--- trunk/slashtime/debian/control	2011-12-18 23:33:50 UTC (rev 15560)
+++ trunk/slashtime/debian/control	2011-12-19 14:16:30 UTC (rev 15561)
@@ -15,10 +15,10 @@
 Depends: default-jre | java6-runtime,
          libjava-gnome-java (>= 4.1.1),
          ${misc:Depends}
-Description: Slashtime - Display the time in various places.
- Slashtime is 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.
+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

Modified: trunk/slashtime/debian/copyright
===================================================================
--- trunk/slashtime/debian/copyright	2011-12-18 23:33:50 UTC (rev 15560)
+++ trunk/slashtime/debian/copyright	2011-12-19 14:16:30 UTC (rev 15561)
@@ -21,8 +21,7 @@
  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/copyleft/gpl.html or write to the Free Software Foundation,
- Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ <http://www.gnu.org/licenses/>
 
 Files: debian/*
 Copyright: 2011 Guillaume Mazoyer <respawneral at gmail.com>

Added: trunk/slashtime/debian/patches/01_manifest.patch
===================================================================
--- trunk/slashtime/debian/patches/01_manifest.patch	                        (rev 0)
+++ trunk/slashtime/debian/patches/01_manifest.patch	2011-12-19 14:16:30 UTC (rev 15561)
@@ -0,0 +1,24 @@
+## 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

Added: trunk/slashtime/debian/patches/02_launcher_script.patch
===================================================================
--- trunk/slashtime/debian/patches/02_launcher_script.patch	                        (rev 0)
+++ trunk/slashtime/debian/patches/02_launcher_script.patch	2011-12-19 14:16:30 UTC (rev 15561)
@@ -0,0 +1,35 @@
+## 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/03_manpage.patch
===================================================================
--- trunk/slashtime/debian/patches/03_manpage.patch	                        (rev 0)
+++ trunk/slashtime/debian/patches/03_manpage.patch	2011-12-19 14:16:30 UTC (rev 15561)
@@ -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.

Added: trunk/slashtime/debian/patches/series
===================================================================
--- trunk/slashtime/debian/patches/series	                        (rev 0)
+++ trunk/slashtime/debian/patches/series	2011-12-19 14:16:30 UTC (rev 15561)
@@ -0,0 +1,3 @@
+01_manifest.patch
+02_launcher_script.patch
+03_manpage.patch

Added: trunk/slashtime/debian/slashtime.manpages
===================================================================
--- trunk/slashtime/debian/slashtime.manpages	                        (rev 0)
+++ trunk/slashtime/debian/slashtime.manpages	2011-12-19 14:16:30 UTC (rev 15561)
@@ -0,0 +1 @@
+slashtime.1


