From 2d1efba33850d49fd2936263b665cfdd159dcf60 Mon Sep 17 00:00:00 2001 From: Kevin Coyner Date: Mon, 4 Jun 2007 09:17:20 -0400 Subject: [PATCH] Import Debian changes 1.25-12 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. --- debian/README.Debian | 28 +++++++- debian/changelog | 22 +++++++ debian/compat | 2 +- debian/control | 18 +++--- debian/copyright | 23 +++++-- debian/docs | 1 - debian/patches/00list | 3 + debian/patches/01_manpage_patch.dpatch | 19 ++++++ debian/patches/02_30hr_patch.dpatch | 72 +++++++++++++++++++++ debian/patches/03_manapge_30hr_patch.dpatch | 21 ++++++ debian/rules | 23 ++++--- 11 files changed, 207 insertions(+), 25 deletions(-) delete mode 100644 debian/docs create mode 100644 debian/patches/00list create mode 100644 debian/patches/01_manpage_patch.dpatch create mode 100644 debian/patches/02_30hr_patch.dpatch create mode 100644 debian/patches/03_manapge_30hr_patch.dpatch diff --git a/debian/README.Debian b/debian/README.Debian index 2c16b95..dab48af 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,7 +1,29 @@ wmcalclock for Debian --------------------- -This is Debian GNU/Linux's prepackaged version of wmCalclock, a simple -clock and calendar. - -- Dan Nguyen Fri, 9 Apr 1999 00:12:45 -0400 +The man page for wmcalclock documents everything you might need to know to run +the program. +These additional notes from upstream: + + WindowMaker. + ------------ + In WindowMaker simply drag and drop the wmCalClock App on the WindowMaker + Dock or Clip. + + Afterstep. + --------- + Afterstep users put the following in their .steprc "Wharf wmCalClock - + MaxSwallow "wmCalClock" wmCalClock &". Don't use Afterstep so I have no + idea if it works... + + Note: AfterStep's Wharf supposedly has a problem with pixmaps that are + larger than 60x60 pixels. Please tell the AfterStep authors to fix this, + this is not our fault, but a Wharf problem! + + Other window managers. + ---------------------- + wmCalClock shows as a 64x64 shaped icon on your desktop under other window + managers. + + -- Kevin Coyner Mon, 04 Jun 2007 09:17:20 -0400 diff --git a/debian/changelog b/debian/changelog index 42c0c0d..c63f8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,25 @@ +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. + + -- Kevin Coyner Mon, 04 Jun 2007 09:17:20 -0400 + wmcalclock (1.25-11) unstable; urgency=low * Orphan package, set maintainer to Debian QA Group diff --git a/debian/compat b/debian/compat index b8626c4..7ed6ff8 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -4 +5 diff --git a/debian/control b/debian/control index 4243a93..c41e7d4 100644 --- a/debian/control +++ b/debian/control @@ -1,16 +1,18 @@ Source: wmcalclock Section: x11 Priority: optional -Maintainer: Debian QA Group -Build-Depends: debhelper (>> 3.0.0), libx11-dev, libxext-dev, libxpm-dev, x-dev -Standards-Version: 3.6.1.0 +Maintainer: Kevin Coyner +Build-Depends: debhelper (>= 5.0), libx11-dev, libxext-dev, libxpm-dev, x-dev, dpatch +Standards-Version: 3.7.2 Package: wmcalclock Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Description: A dock.app which simply tells time and date - wmCalclock is a dock app specifically written for Window Maker, but will - work with other window managers. Some features include antialiased text - display, with the ability to choose between different fonts, and colors. - 12 and 24 hour time, Greenwich time, Greenwich Mean Sidereal Time, and + wmCalClock is a dock app specifically written for WindowMaker, but will work + with other window managers. It features antialiased text display with the + ability to choose between different fonts and colors. wmCalclock supports + 12, 24 and 30 hour time, Greenwich time, Greenwich Mean Sidereal Time, and Local Sidereal Time. + . + Homepage: http://dockapps.org/file.php/id/9 diff --git a/debian/copyright b/debian/copyright index 017f823..5899013 100644 --- a/debian/copyright +++ b/debian/copyright @@ -3,8 +3,23 @@ Tue, 25 May 1999 23:51:54 -0400. It was downloaded from http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml -Upstream Author: Michael G. Henderson +Copyright: 1998, 1999 Michael G. Henderson -Copyright: -It's license is GPLv2, which, on debian systems, is available at: -/usr/share/common-licenses/GPL. +License: + + 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 package; if not, write to the Free Software Foundation, 51 + Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +On Debian systems, the complete text of the GNU General Public License can be +found in `/usr/share/common-licenses/GPL'. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index 3b56489..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -BUGS README TODO HINTS diff --git a/debian/patches/00list b/debian/patches/00list new file mode 100644 index 0000000..e63baf2 --- /dev/null +++ b/debian/patches/00list @@ -0,0 +1,3 @@ +01_manpage_patch +02_30hr_patch +03_manapge_30hr_patch diff --git a/debian/patches/01_manpage_patch.dpatch b/debian/patches/01_manpage_patch.dpatch new file mode 100644 index 0000000..3b17ce4 --- /dev/null +++ b/debian/patches/01_manpage_patch.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_manpage_patch.dpatch by Kevin Coyner +## +## DP: manpage-patch + +@DPATCH@ + +--- wmcalclock-1.25/Src/wmCalClock.1 1999-03-28 22:16:23.000000000 +0000 ++++ wmcalclock-1.25-rwbarton/Src/wmCalClock.1 2005-01-29 10:02:30.000000000 +0000 +@@ -25,6 +25,9 @@ + .B \-24 + Show time in 24-hour format instead of default 12-hour AM/PM format. + .TP ++.B \-g ++Show Greenwich Mean Time (GMT). ++.TP + .B \-s + Show Greenwich Mean Sidereal Time (GMST) in 24-hour format. + .TP diff --git a/debian/patches/02_30hr_patch.dpatch b/debian/patches/02_30hr_patch.dpatch new file mode 100644 index 0000000..f8ad149 --- /dev/null +++ b/debian/patches/02_30hr_patch.dpatch @@ -0,0 +1,72 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_30hr_patch.dpatch by Kevin Coyner +## +## DP: 30hr-patch See Debian bug #292736 +## DP: Original patch from Reid W. Barton +## DP: Show local time in 30-hour format. Times between midnight and 6 AM +## DP: are displayed as belonging to the previous day, + +@DPATCH@ + +--- wmcalclock-1.25/Src/wmCalClock.c~ 2007-06-04 11:16:43.000000000 -0400 ++++ wmcalclock-1.25/Src/wmCalClock.c 2007-06-04 11:14:31.000000000 -0400 +@@ -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,16 @@ + + Show24HourTime = 1; + ++ } else if (!strcmp(argv[i], "-30")){ ++ ++ Show24HourTime = 1; /* Don't display AM/PM */ ++ Show30HourTime = 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 +914,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 \tShow Local Sidereal Time (LST) in 24-hour format. \n"); diff --git a/debian/patches/03_manapge_30hr_patch.dpatch b/debian/patches/03_manapge_30hr_patch.dpatch new file mode 100644 index 0000000..4ce2f25 --- /dev/null +++ b/debian/patches/03_manapge_30hr_patch.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_manpage-30hr.dpatch by Kevin Coyner +## +## DP: mapage 30hr + +@DPATCH@ + +--- wmcalclock-1.25/Src/wmCalClock.1~ 2007-06-04 11:37:04.000000000 -0400 ++++ wmcalclock-1.25/Src/wmCalClock.1 2007-06-04 11:37:46.000000000 -0400 +@@ -25,6 +25,11 @@ + .B \-24 + Show time in 24-hour format instead of default 12-hour AM/PM format. + .TP ++.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. ++.TP + .B \-g + Show Greenwich Mean Time (GMT). + .TP diff --git a/debian/rules b/debian/rules index 2858355..e8274d0 100755 --- a/debian/rules +++ b/debian/rules @@ -22,19 +22,28 @@ else endif build: build-stamp -build-stamp: +build-stamp: patch dh_testdir $(MAKE) CFLAGS="$(CFLAGS)" touch build-stamp -clean: +clean: clean-patched unpatch + +clean-patched: dh_testdir dh_testroot rm -f build-stamp install-stamp -$(MAKE) clean - dh_clean +patch: patch-stamp +patch-stamp: + dpatch apply-all + +unpatch: + dpatch deapply-all + rm -rf patch-stamp debian/patched + install: install-stamp install-stamp: build-stamp dh_testdir @@ -45,7 +54,6 @@ install-stamp: build-stamp mv $(BUILDDIR)/usr/man $(BUILDDIR)/usr/share ln -s wmcalclock $(BUILDDIR)/usr/bin/wmCalClock ln -s wmcalclock.1 $(BUILDDIR)/usr/share/man/man1/wmCalClock.1 - touch install-stamp # Build architecture-independent files here. @@ -54,10 +62,9 @@ binary-indep: build install # Build architecture-dependent files here. binary-arch: build install -# dh_testversion dh_testdir dh_testroot - dh_installdocs + dh_installdocs TODO BUGS dh_installmenu dh_installchangelogs CHANGES dh_link @@ -70,8 +77,8 @@ binary-arch: build install dh_md5sums dh_builddeb -source diff: +source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary +.PHONY: build clean binary-indep binary-arch binary install patch unpatch clean-patched