[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#292736: marked as done (wmcalclock: 30-hour mode)

Your message dated Tue, 05 Jun 2007 19:02:06 +0000
with message-id <E1HveIA-0000Yb-LJ@ries.debian.org>
and subject line Bug#292736: fixed in wmcalclock 1.25-12
has caused the attached Bug report to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere.  Please contact me immediately.)

Debian bug tracking system administrator
(administrator, Debian Bugs database)

--- Begin Message ---
Package: wmcalclock
Version: 1.25-9
Severity: wishlist

I tend to think of days as ending when I go to sleep, usually after
midnight, and I sometimes get confused when my computer clock shows
the date change at midnight.  So I wrote this patch to wmCalClock to
make it display what one might call "30-hour mode": Times between
midnight and 6 AM are displayed as belonging to the previous day, so
the range of hours runs from 6 to 29.  Maybe other people would find
it useful as well.  Here is the patch:

diff -Naur wmcalclock-1.25/Src/wmCalClock.1 wmcalclock-1.25-rwbarton/Src/wmCalClock.1
--- wmcalclock-1.25/Src/wmCalClock.1	2005-01-29 10:16:35.000000000 +0000
+++ wmcalclock-1.25-rwbarton/Src/wmCalClock.1	2005-01-29 10:30:06.000000000 +0000
@@ -25,6 +25,11 @@
 .B \-24
 Show time in 24-hour format instead of default 12-hour AM/PM format.
+.B \-30
+Show local time in 30-hour format.  Times between midnight and 6 AM
+are displayed as belonging to the previous day, so the hour ranges
+from 6 to 29.
 .B \-g
 Show Greenwich Mean Time (GMT).
diff -Naur wmcalclock-1.25/Src/wmCalClock.c wmcalclock-1.25-rwbarton/Src/wmCalClock.c
--- wmcalclock-1.25/Src/wmCalClock.c	2005-01-29 10:06:31.000000000 +0000
+++ wmcalclock-1.25-rwbarton/Src/wmCalClock.c	2005-01-29 10:31:11.000000000 +0000
@@ -259,6 +259,7 @@
 int	yAMPM  = 95;
 int	ydAMPM = 6;
 int	Show24HourTime = 0;
+int	Show30HourTime = 0;
 int	ShowGreenwichTime = 0;
 int	ShowSiderealTime = 0;
 double	Longitude;
@@ -502,6 +503,26 @@
 		gmst  = (gmst - (double)Mins)*60.0;
 		Secs  = (int)gmst;
+	    } else if (Show30HourTime){
+                CurrentLocalTime = time(CurrentTime);
+	        Time = localtime(&CurrentLocalTime);
+		/* Careful.  Need to handle daylight savings time changes correctly. */
+		if (Time->tm_hour < 6){
+		    int old_hour = Time->tm_hour;
+		    time_t new_time = CurrentLocalTime - 24 * 60 * 60;
+		    Time = localtime(&new_time);
+		    Time->tm_hour = old_hour + 24;
+		}
+	        DayOfMonth = Time->tm_mday-1;
+	        DayOfWeek = Time->tm_wday;
+	        Month = Time->tm_mon;
+	        Hours = Time->tm_hour;
+	        Mins  = Time->tm_min;
+	        Secs  = Time->tm_sec;
 	    } else {
                 CurrentLocalTime = time(CurrentTime);
@@ -803,6 +824,11 @@
 	    Show24HourTime = 1;
+        } else if (!strcmp(argv[i], "-30")){
+	    Show24HourTime = 1;	/* Don't display AM/PM */
+	    Show30HourTime = 1;
         } else if (!strcmp(argv[i], "-b")){
             if ((i+1 >= argc)||(argv[i+1][0] == '-')) {
@@ -883,6 +909,7 @@
     printf("\t-e \"Command\"\tCommand to execute via double click of mouse button 1.\n");
     printf("\t-S\t\tDo not show seconds.\n");
     printf("\t-24\t\tShow 24-hour time. Default is 12 hour AM/PM Time.\n");
+    printf("\t-30\t\tShow 30-hour local time (hour ranges from 6 to 29).\n");
     printf("\t-g\t\tShow Greenwich time.\n");
     printf("\t-s\t\tShow Greenwich Mean Sidereal Time (GMST) in 24-hour format. \n");
     printf("\t-L <Longitude>\tShow Local Sidereal Time (LST) in 24-hour format. \n");

-- System Information:
Debian Release: testing/unstable
  APT prefers testing
  APT policy: (500, 'testing')
Architecture: i386 (i686)
Kernel: Linux 2.4.24

Versions of packages wmcalclock depends on:
ii  libc6                       2.3.2.ds1-11 GNU C Library: Shared libraries an
ii  xlibs                       4.3.0-7      X Window System client libraries m

-- no debconf information

--- End Message ---
--- Begin Message ---
Source: wmcalclock
Source-Version: 1.25-12

We believe that the bug you reported is fixed in the latest version of
wmcalclock, which is due to be installed in the Debian FTP archive:

  to pool/main/w/wmcalclock/wmcalclock_1.25-12.diff.gz
  to pool/main/w/wmcalclock/wmcalclock_1.25-12.dsc
  to pool/main/w/wmcalclock/wmcalclock_1.25-12_i386.deb

A summary of the changes between this version and the previous one is

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 292736@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
Kevin Coyner <kevin@rustybear.com> (supplier of updated wmcalclock package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)

Hash: SHA1

Format: 1.7
Date: Mon, 04 Jun 2007 09:17:20 -0400
Source: wmcalclock
Binary: wmcalclock
Architecture: source i386
Version: 1.25-12
Distribution: unstable
Urgency: low
Maintainer: Kevin Coyner <kevin@rustybear.com>
Changed-By: Kevin Coyner <kevin@rustybear.com>
 wmcalclock - A dock.app which simply tells time and date
Closes: 292735 292736 427133
 wmcalclock (1.25-12) unstable; urgency=low
   * New maintainer. Closes: #427133.
   * debian/control:
     - Bumped Standards-Version to 3.7.2. No changes.
     - Bumped debhelper version to 5.0.
     - Added homepage URL.
     - Changed description to support 30-hour day, an option added via a patch.
       Thanks to Reid Barton. Closes: #292736.
     - Added misc:Depends to Depends.
     - Added dpatch to Build-Depends.
   * Reformatted debian/copyright.
   * man page updated to support 30-hr day and corrected missing -g option.
     Thanks to Reid Barton again. Closes: #292735.
   * Bumped debian/compat to 5.
   * Added dpatch related language to debian/rules. Cleaned up minor cruft.
   * Removed debian/docs in favor of listing as parameters to dh_installdocs in
     debian/rules. Content of HINTS moved to README.Debian. No longer including
     README file from source.
 fe9d11ba179c7685e6b80ae4fa7814dc 622 x11 optional wmcalclock_1.25-12.dsc
 79b19cc8dccd1af37a2ceb227100c1f2 4977 x11 optional wmcalclock_1.25-12.diff.gz
 6a7d07fbe5e33a6e5ac4b5d1a7cee7ec 49072 x11 optional wmcalclock_1.25-12_i386.deb

Version: GnuPG v1.4.6 (GNU/Linux)


--- End Message ---

Reply to: