--- wmcalclock-1.25.orig/debian/compat +++ wmcalclock-1.25/debian/compat @@ -0,0 +1 @@ +7 --- wmcalclock-1.25.orig/debian/copyright +++ wmcalclock-1.25/debian/copyright @@ -0,0 +1,25 @@ +This package was debianized by Dan Nguyen on +Tue, 25 May 1999 23:51:54 -0400. + +It was downloaded from http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml + +Copyright: 1998, 1999 Michael G. Henderson + +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'. --- wmcalclock-1.25.orig/debian/README.Debian +++ wmcalclock-1.25/debian/README.Debian @@ -0,0 +1,29 @@ +wmcalclock for Debian +--------------------- + +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 --- wmcalclock-1.25.orig/debian/control +++ wmcalclock-1.25/debian/control @@ -0,0 +1,16 @@ +Source: wmcalclock +Section: x11 +Priority: optional +Maintainer: Kevin Coyner +Build-Depends: debhelper (>= 7.4~), libx11-dev, libxext-dev, libxpm-dev, x11proto-core-dev, dpatch +Standards-Version: 3.8.3 + +Package: wmcalclock +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: A dock.app which simply tells time and date + 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. --- wmcalclock-1.25.orig/debian/menu +++ wmcalclock-1.25/debian/menu @@ -0,0 +1,2 @@ +?package(wmcalclock):needs="X11" section="Applications/System/Administration" hints="Clocks"\ + title="wmcalclock" command="/usr/bin/wmCalClock" --- wmcalclock-1.25.orig/debian/README.source +++ wmcalclock-1.25/debian/README.source @@ -0,0 +1,6 @@ +This package is using the dpatch patch system. + +To get the fully patched source after unpacking the source package, cd to +the root level of the source package and run `./debian/rules patch` + +See /usr/share/doc/dpatch/README.source.gz for more information. --- wmcalclock-1.25.orig/debian/rules +++ wmcalclock-1.25/debian/rules @@ -0,0 +1,81 @@ +#!/usr/bin/make -f + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + +MAKE=make -C Src +CFLAGS=-W -Wall +INSTALL=/usr/bin/install +INSTALL_PROGRAM = $(INSTALL) -p -o root -g root -m 755 +INSTALL_FILE = $(INSTALL) -p -o root -g root -m 644 +BUILDDIR = $(CURDIR)/debian/wmcalclock +PACKAGE = wmcalclock + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CFLAGS += -g +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +build: build-stamp + +build-stamp: patch-stamp + dh_testdir + $(MAKE) CFLAGS="$(CFLAGS)" + touch build-stamp + +clean: clean1 unpatch +clean1: + dh_testdir + dh_testroot + rm -rf build-stamp install-stamp ./debian/$(PACKAGE) + -find ./Src -name '*.o' | xargs rm -f + $(MAKE) clean + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_prep + dh_installdirs + $(MAKE) install DESTDIR=$(BUILDDIR)/usr INSTALL_PROGRAM="$(INSTALL_PROGRAM)" + 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. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs TODO BUGS + dh_installmenu + dh_installchangelogs CHANGES + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +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 install patch unpatch --- wmcalclock-1.25.orig/debian/changelog +++ wmcalclock-1.25/debian/changelog @@ -0,0 +1,141 @@ +wmcalclock (1.25-15) unstable; urgency=low + + * debian/control: + - Changed Build-Depends from x-dev to x11proto-core-dev. Closes: #515486. + - Bumped Standards-Version to 3.8.3. No changes. + - Bumped debhelper version to 7.4~. + - Removed homepage reference. + * Changed debian/compat to version 7. + * Small edit to 02_30hr_patch regarding daylight savings time. Closes: #506379. + * Added new 04_makefile_modifications patch. + * Removed debian/watch. Unable to find homepage or source code repository + for upstream. Please file a bug if you find a legitimate homepage. + * debian/rules: + - Changed dh_clean -k to dh_prep. + - Reworked file to use dpatch.make. + * Added debian/README.source. + + -- Kevin Coyner Wed, 21 Oct 2009 11:17:22 -0400 + +wmcalclock (1.25-14) unstable; urgency=low + + * Add line to debian/rules to ensure *.o binary files are removed during + clean process. Closes: #442761. + * In debian/menu, changed section title from Apps/Tools to + Applications/System/Administration to conform with new menu policy. + + -- Kevin Coyner Mon, 17 Sep 2007 14:26:45 -0400 + +wmcalclock (1.25-13) unstable; urgency=low + + * Added new watch file. + * Throughout debian/* changed references to maintainer e-mail to my new + address. + + -- Kevin Coyner Sun, 05 Aug 2007 12:01:35 -0400 + +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 + + -- Gordon Fraser Sat, 02 Jun 2007 06:18:19 +0200 + +wmcalclock (1.25-10) unstable; urgency=low + + * Fix build dependencies (Closes: #347018) + + -- Gordon Fraser Sun, 15 Jan 2006 13:03:20 +0100 + +wmcalclock (1.25-9) unstable; urgency=low + + * Use lower case only letters for binary name (Closes: #149916) + * Add symbolic links to wmcalclock and wmcalclock.1.gz for + backward compatibility. + * Standards-version to 3.6.1.0 + * Remove dh_make boilerplate from debian/copyright + * Update DH_BUILD_OPTIONS handling + * Remove trailing dot from short description + + -- Gordon Fraser Sun, 21 Sep 2003 13:40:03 +0200 + +wmcalclock (1.25-8) unstable; urgency=low + + * New maintainer (Closes: #145494) + * Correct example on usage screen + * Minor debhelper and packaging cleanups + * Get rid of Lintian warnings + + -- Gordon Fraser Thu, 2 May 2002 19:24:51 +0200 + +wmcalclock (1.25-7) unstable; urgency=low + + * Orphaning package, changing owner to QA + + -- Dan Nguyen Thu, 2 May 2002 00:10:33 -0500 + +wmcalclock (1.25-6) unstable; urgency=low + + * Change /usr/X11R6/bin/wmCalClock to /usr/bin/wmCalClock in + debian/menu (closes: #92177) + + -- Dan Nguyen Sat, 31 Mar 2001 20:26:14 -0500 + +wmcalclock (1.25-5) unstable; urgency=low + + * Moved the binary to /usr/bin, as specified by Policy 12.8.7 + + -- Dan Nguyen Tue, 27 Mar 2001 18:48:27 -0500 + +wmcalclock (1.25-4) unstable; urgency=low + + * Recompile for woody. + + -- Dan Nguyen Tue, 27 Mar 2001 17:05:34 -0500 + +wmcalclock (1.25-3) unstable; urgency=low + + * Changed wmcalclock to wmCalClock in menu file. (closes: #54019) + + -- Dan Nguyen Tue, 4 Jan 2000 12:41:54 -0500 + +wmcalclock (1.25-2) unstable; urgency=low + + * Added hints to the menu file (closes: Bug#52005) + * Suppress lintian errors + + -- Dan Nguyen Sun, 5 Dec 1999 21:30:16 -0500 + +wmcalclock (1.25-1) unstable; urgency=low + + * New upstream version. + + -- Dan Nguyen Sun, 5 Sep 1999 03:19:04 -0400 + +wmcalclock (1.24-1) unstable; urgency=low + + * Initial Release. + * My first package. + + -- Dan Nguyen Fri, 9 Apr 1999 00:12:45 -0400 --- wmcalclock-1.25.orig/debian/dirs +++ wmcalclock-1.25/debian/dirs @@ -0,0 +1,3 @@ +usr/bin +usr/man/man1 +usr/share --- wmcalclock-1.25.orig/debian/patches/01_manpage_patch.dpatch +++ wmcalclock-1.25/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 --- wmcalclock-1.25.orig/debian/patches/03_manapge_30hr_patch.dpatch +++ wmcalclock-1.25/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 --- wmcalclock-1.25.orig/debian/patches/04_makefile_modifications.dpatch +++ wmcalclock-1.25/debian/patches/04_makefile_modifications.dpatch @@ -0,0 +1,34 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_makefile_modifications.dpatch by Kevin Coyner +## +## DP: Modifications to Src/Makefile + +@DPATCH@ +diff -urNad wmcalclock-1.25~/Src/Makefile wmcalclock-1.25/Src/Makefile +--- wmcalclock-1.25~/Src/Makefile 2009-10-18 22:35:56.000000000 -0400 ++++ wmcalclock-1.25/Src/Makefile 2009-10-21 12:31:49.000000000 -0400 +@@ -1,9 +1,9 @@ +-CC = gcc +-CFLAGS = -O2 -Wall ++CC = $(DEB_HOST_GNU_TYPE)-gcc ++CFLAGS = -W -Wall + INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include + DESTDIR= /usr/X11R6 + LIBDIR = -L/usr/X11R6/lib +-INSTALL_PROGRAM = install -c -s -m 0755 ++INSTALL_PROGRAM = install -p -o root -g root -m 755 + + # for Linux + LIBS = -lXpm -lX11 -lXext +@@ -14,11 +14,9 @@ + OBJS = wmCalClock.o \ + xutils.o + +- + .c.o: + $(CC) $(CFLAGS) -D$(shell echo `uname -s`) -c $< -o $*.o $(INCDIR) + +- + all: wmCalClock.o wmCalClock + + wmCalClock.o: wmCalClock_master.xpm wmCalClock_mask.xbm --- wmcalclock-1.25.orig/debian/patches/02_30hr_patch.dpatch +++ wmcalclock-1.25/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 - 12 * 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"); --- wmcalclock-1.25.orig/debian/patches/00list +++ wmcalclock-1.25/debian/patches/00list @@ -0,0 +1,4 @@ +01_manpage_patch +02_30hr_patch +03_manapge_30hr_patch +04_makefile_modifications --- wmcalclock-1.25.orig/Src/wmCalClock.c +++ wmcalclock-1.25/Src/wmCalClock.c @@ -890,7 +890,7 @@ printf("\t-l\t\tUse a low-color pixmap to conserve colors. On 8-bit displays the\n"); printf("\t \t\tlow color pixmap will always be used.\n"); printf("\t-h\t\tDisplay help screen.\n"); - printf("\nExample: wmCalClock -b 100 -tc #001100 -bc #7e9e69 \n\n"); + printf("\nExample: wmCalClock -b 100 -tc '#001100' -bc '#7e9e69' \n\n"); } --- wmcalclock-1.25.orig/Src/Makefile +++ wmcalclock-1.25/Src/Makefile @@ -3,6 +3,7 @@ INCDIR = -I/usr/X11R6/include/X11 -I/usr/X11R6/include DESTDIR= /usr/X11R6 LIBDIR = -L/usr/X11R6/lib +INSTALL_PROGRAM = install -c -s -m 0755 # for Linux LIBS = -lXpm -lX11 -lXext @@ -31,6 +32,6 @@ rm -f wmCalClock install:: wmCalClock - install -c -s -m 0755 wmCalClock $(DESTDIR)/bin - install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1 + $(INSTALL_PROGRAM) wmCalClock $(DESTDIR)/bin/wmcalclock + install -c -m 0644 wmCalClock.1 $(DESTDIR)/man/man1/wmcalclock.1