[Pkg-wmaker-commits] [wmclock] 17/66: Imported Debian patch 1.0.12.2-4
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Thu Aug 20 10:52:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclock.
commit dbc0541a854beec1412fc40a09d1aaf71a106571
Author: Romain Francoise <rfrancoise at debian.org>
Date: Sun Jan 25 15:48:43 2004 +0100
Imported Debian patch 1.0.12.2-4
---
debian/README.Debian | 10 ++
debian/changelog | 44 +++++++-
debian/compat | 1 +
debian/control | 20 ++--
debian/copyright | 15 +--
debian/dirs | 2 -
debian/rules | 58 +++++------
debian/wmclock.1 | 230 ------------------------------------------
debian/wmclock.dirs | 3 +
debian/{docs => wmclock.docs} | 0
debian/wmclock.menu | 3 +
debian/wmclock.postinst | 24 +++++
debian/wmclock.postrm | 27 +++++
wmclock.c | 13 ++-
wmclock.man.in | 15 +++
15 files changed, 178 insertions(+), 287 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..950b1bd
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,10 @@
+wmclock for Debian
+------------------
+
+This package of wmclock comes with XPM images for different languages,
+you can use them to have a localized display with options -monthxpm and
+-weekdayxpm, e.g. to have a French display:
+
+wmclock -monthxpm /usr/share/wmclock/lang.french/month.xpm -weekdayxpm /usr/share/wmclock/lang.french/weekday.xpm
+
+ -- Romain Francoise <rfrancoise at debian.org>, Sun Oct 5 22:09:10 2003
diff --git a/debian/changelog b/debian/changelog
index b66a36f..a1a272f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+wmclock (1.0.12.2-4) unstable; urgency=low
+
+ * Apply patch from Vino Fernando Crescini <jcrescin at cit.uws.edu.au> to
+ fix -12 and -year combined display (closes: #228985).
+
+ -- Romain Francoise <rfrancoise at debian.org> Sun, 25 Jan 2004 15:48:43 +0100
+
+wmclock (1.0.12.2-3) unstable; urgency=low
+
+ * New maintainer (closes: #214392).
+ * debian/control:
+ + Update maintainer contact info.
+ + Bump Standards-Version to 3.6.1.0.
+ + Build-Depends on debhelper (>= 4).
+ + Add Depends on ${misc:Depends}.
+ + Add Recommends on wmaker.
+ + Rewrite synopsis and description, including upstream URL.
+ * debian/copyright:
+ + Update maintainer information.
+ + Clarify license info.
+ + Reword sentence about the location of the GNU GPL on Debian
+ systems.
+ * debian/rules:
+ + Major facelift, separating configure and build stages.
+ + Remove old DH_COMPAT variables.
+ + Install localized XPM images in /usr/share/wmclock/.
+ + Call dh_installmenu -n.
+ * debian/compat: New file.
+ * debian/README.Debian: New file, explaining how to use the localized
+ display.
+ * debian/wmclock.{postinst,postrm,menu}: New files. Install wmclock
+ in the Debian menu in Apps/Tools.
+ * Don't ship the manpage in the Debian diff, use the version provided
+ by upstream since they are identical. Include information about the
+ localized XPM files.
+ * Acknowledging NMU (closes: #105699).
+ * Include patch to fix -year display (closes: #126742).
+
+ -- Romain Francoise <rfrancoise at debian.org> Mon, 6 Oct 2003 20:19:30 +0200
+
wmclock (1.0.12.2-2.1) unstable; urgency=low
* NMU
@@ -17,6 +57,4 @@ wmclock (1.0.12.2-1) unstable; urgency=low
-- Szabolcs Horvath <horvaths at janus.gimsz.sulinet.hu> Sun, 15 Apr 2001 07:08:38 +0000
-Local variables:
-mode: debian-changelog
-End:
+
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..b8626c4
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+4
diff --git a/debian/control b/debian/control
index bed58e9..ad8aa39 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,17 @@
Source: wmclock
Section: x11
Priority: optional
-Build-Depends: debhelper (>= 2.0.86), xlibs-dev (>> 4.0.3), xutils
-Maintainer: Szabolcs Horvath <horvaths at janus.gimsz.sulinet.hu>
-Standards-Version: 3.1.0
+Maintainer: Romain Francoise <rfrancoise at debian.org>
+Build-Depends: debhelper (>= 4), xlibs-dev (>> 4.0.3), xutils
+Standards-Version: 3.6.1.0
Package: wmclock
Architecture: any
-Depends: ${shlibs:Depends}
-Description: dockable clock applet for Window Maker
- Wmclock is a dockable applet which displays the date and time in a
- dockable tile. Wmclock is specially designed for the Window Maker window
- manager, and features multiple language support, am/pm time display, and
- can run a user-specified program on a mouse click.
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Recommends: wmaker
+Description: A dockable clock applet for Window Maker
+ Wmclock is an applet for Window Maker which displays the date and time
+ in a dockable tile. It features multiple language support, 24h or 12h
+ time display, and can run a user-specified program on mouse click.
+ .
+ For further information see http://www.jmknoble.net/WindowMaker/wmclock/
diff --git a/debian/copyright b/debian/copyright
index ae79942..a5c810e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,14 @@
-This package was debianized by HORVATH Szabolcs <horvaths at janus.gimsz.sulinet.hu> on
-Sun, 15 Apr 2001 07:08:38 +0000.
+This package was debianized by Szabolcs Horvath
+<horvaths at janus.gimsz.sulinet.hu> on Sun, 15 Apr 2001 07:08:38 +0000.
+It is now maintained by Romain Francoise <rfrancoise at debian.org>.
It was downloaded from http://www.bensinclair.com/dockapp/
Upstream Author: Jim Knoble <jmknoble at pobox.com>
-Copyright:
+Copyright: wmclock contains parts from asclock and original code, all
+licensed under the GNU General Public License (GPL), with additional
+warranty-voiding clauses.
-GPL
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+On Debian GNU/Linux systems, the complete text of the GNU General Public
+License can be found in `/usr/share/common-licenses/GPL'.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 74c5069..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/bin
-
diff --git a/debian/rules b/debian/rules
index 93be278..b89c41c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,29 @@
#!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+configure: configure-stamp
-# This is the debhelper compatability version to use.
-export DH_COMPAT=1
+configure-stamp:
+ dh_testdir
+ ./configure --prefix=/usr \
+ --mandir=/usr/share/man
+ touch configure-stamp
build: build-stamp
-build-stamp:
- dh_testdir
- ./configure --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
- # Add here commands to compile the package.
+build-stamp: configure-stamp
+ dh_testdir
$(MAKE)
-
touch build-stamp
clean:
dh_testdir
dh_testroot
- rm -f build-stamp
-
- # Add here commands to clean up after the build process.
- #-$(MAKE) distclean
-
+ rm -f build-stamp configure-stamp
+ if [ -f Makefile ]; then \
+ rm -f month.xpm weekday.xpm; \
+ $(MAKE) clean; \
+ rm -f Makefile wmclock.man wmclock._man; \
+ fi
dh_clean
install: build
@@ -33,39 +31,33 @@ install: build
dh_testroot
dh_clean -k
dh_installdirs
+ $(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin
+ for dir in lang.*; do \
+ cp -r "$$dir" $(CURDIR)/debian/wmclock/usr/share/wmclock; \
+ done
- # Add here commands to install the package into debian/tmp.
- # $(MAKE) install prefix=`pwd`/debian/tmp/usr
- install wmclock `pwd`/debian/tmp/usr/bin
-
-
-# Build architecture-independent files here.
-binary-indep: build install
-# We have nothing to do by default.
-
+binary-indep: build install;
# Build architecture-dependent files here.
binary-arch: build install
-# dh_testversion
dh_testdir
dh_testroot
# dh_installdebconf
dh_installdocs
dh_installexamples
- dh_installmenu
+ dh_installmenu -n
+# dh_installlogrotate
# dh_installemacsen
# dh_installpam
+# dh_installmime
# dh_installinit
- dh_installcron
- dh_installmanpages
- dh_installinfo
+# dh_installcron
+ dh_installman wmclock.man
# dh_undocumented
dh_installchangelogs ChangeLog
dh_link
dh_strip
dh_compress
dh_fixperms
- # You may want to make some executables suid here.
-# dh_suidregister
# dh_makeshlibs
dh_installdeb
# dh_perl
@@ -75,4 +67,4 @@ binary-arch: build install
dh_builddeb
binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+.PHONY: build clean binary-indep binary-arch binary install configure
diff --git a/debian/wmclock.1 b/debian/wmclock.1
deleted file mode 100644
index f55d0e8..0000000
--- a/debian/wmclock.1
+++ /dev/null
@@ -1,230 +0,0 @@
-.\" wmclock.man: manual page for wmclock -*- nroff -*-
-.\" created 1999-Apr-09 jmk
-.\" autodate: 1999-Apr-09 04:17
-.\"
-.\" by Jim Knoble <jmknoble at pobox.com>
-.\" Copyright � 1999 Jim Knoble
-.\" Based on asclock.man by Dan Weeks.
-.\"
-.\" Disclaimer:
-.\"
-.\" The software is provided "as is", without warranty of any kind,
-.\" express or implied, including but not limited to the warranties of
-.\" merchantability, fitness for a particular purpose and
-.\" noninfringement. In no event shall the author(s) be liable for any
-.\" claim, damages or other liability, whether in an action of
-.\" contract, tort or otherwise, arising from, out of or in connection
-.\" with the software or the use or other dealings in the software.
-.\"
-.de TQ
-.br
-.ns
-.TP \\$1
-..
-.\" ----------------------------------------------------------------
-.TH wmclock 1x "2000-Apr-13" "Version 1.0.12.2"
-.\" ----------------------------------------------------------------
-.SH NAME
-.PP
-.BR wmclock :
-a dockable clock for the Window Maker window manager
-.\" ----------------------------------------------------------------
-.SH SYNOPSIS
-.HP
-\fBwmclock\fP [{\-12|\-24|\-year}] [\-noblink] [\-exe \fIprogram\fP]
-[\-led \fIcolor\fP] [\-monthxpm \fIfilename\fP] [\-weekdayxpm
-\fIfilename\fP]
-.\" ----------------------------------------------------------------
-.SH DESCRIPTION
-.PP
-.B Wmclock
-is an applet which displays the date and time in a dockable tile in the
-same style as the clock from the NEXTSTEP(tm) operating system.
-.B Wmclock
-is specially designed for the Window Maker window manager, by Alfredo
-Kojima, and features multiple language support, twenty-four-hour and
-twelve-hour (am/pm) time display, and, optionally, can run a
-user-specified program on a mouse click.
-.B Wmclock
-is derived from
-.BR asclock ,
-a similar clock for the AfterStep window manager.
-.\" ----------------------------------------------------------------
-.SH OPTIONS
-.TP
-\fB\-12\fR or \fB\-24\fR
-Display the time in either twelve-hour format (with am/pm) or
-twenty-four-hour format. Defaults to twenty-four-hour display.
-.TP
-\fB\-year\fR
-Display the current year in the LED display instead of the time.
-.TP
-\fB\-noblink\fR
-The separator between the hours and minutes in the time display blinks
-by default. This option turns off the blinking and displays a steadily
-lit separator instead.
-.TP
-\fB\-exe\fR \fIcommand\fR
-Run
-.I command
-in the background when a mouse button is pressed over
-.BR wmclock .
-See below for details.
-.TP
-\fB\-led\fR \fIcolor\fR
-Use
-.I color
-as the foreground color of the LED display.
-.I Color
-may be either a named color from the rgb.txt database (for example,
-`red' or `chartreuse') or a numeric color specification in any of the usual
-X11 formats (for example, `#ff0000' or `rgb:7f/ff/00'). See the
-.BR X (1)
-man page for more information.
-.TP
-\fB\-monthxpm\fR \fIfilename\fR
-Get month abbreviations from
-.IR filename ,
-which is expected to be in the XPM format. See below for details.
-.TP
-\fB\-weekdayxpm\fR \fIfilename\fR
-Get weekday abbreviations from
-.IR filename ,
-which is expected to be in the XPM format. See below for details.
-.\" ----------------------------------------------------------------
-.SH INVOCATION AND EXAMPLES
-.PP
-The simplest way to start
-.B wmclock
-is:
-.PP
-.RS
-.TQ
-wmclock
-.RE
-.PP
-.B Wmclock
-displays in its own appicon, which you can place in Window Maker's dock
-by holding down the [Alt] or [Meta] key and dragging
-.B wmclock
-to the dock with the primary mouse button (usually the left one).
-.PP
-For a more complicated example:
-.PP
-.RS
-.TQ
-wmclock \-12 \-led gold \-exe /usr/GNUstep/Apps/WPrefs.app/WPrefs
-.RE
-.PP
-This displays 12-hour time in an amber-colored LED display, and starts
-Window Maker's preferences utility when you click on
-.BR wmclock .
-.\" ----------------------------------------------------------------
-.SH DETAILS
-.SS Running Commands
-.PP
-When you use
-.B wmclock
-with the
-.B \-exe
-option,
-.B wmclock
-will run the command you specify whenever you press a mouse button
-while the mouse cursor is over
-.BR wmclock .
-.B Wmclock
-uses the
-.BR system (3)
-function from the C library (and ultimately
-.BR /bin/sh )
-to run the command; hence, the command must be in Bourne-shell syntax.
-.SS Using Alternate Month and Weekday Abbreviations
-.PP
-You can use the
-.B \-monthxpm
-and
-.B \-weekdayxpm
-options to convince
-.B wmclock
-to display month and day-of-week abbreviations in a language besides
-the one it was compiled with, or to display them in a language that
-.B wmclock
-does not yet support. The files you specify must be in the XPM format,
-and they must follow the same strict size and placement as the month
-and weekday XPMs that come in the
-.B wmclock
-source package. Each weekday abbreviation must be 21 pixels wide and 6
-pixels high; each month abbreviation must be 22 pixels wide and 6
-pixels high. The month abbreviations must be arranged vertically,
-beginning with January at the top and continuing down to December at
-the bottom. The weekday abbreviations must also be arranged
-vertically, beginning with Monday at the top and continuing to Sunday
-at the bottom.
-.SS Obsolete Options
-.PP
-In order to maintain command-line compatibility (mostly) with
-.BR asclock ,
-.B wmclock
-accepts a few options on the command line without complaining, even
-though they don't have any effect. The options which
-.B wmclock
-accepts in this manner are
-.B \-shape
-and
-.BR \-iconic .
-Some dockable versions of
-.B asclock
-required one or both of these options to become properly dockable.
-However, Since
-.B wmclock
-is designed for Window Maker's dock, it already displays in a shaped
-window in its own dockable appicon.
-.\" ----------------------------------------------------------------
-.SH BUGS
-.PP
-.B Wmclock
-shouldn't run a command on a single click; should use a double click
-instead.
-.PP
-.B Wmclock
-should use Alfredo Kojima's libdockapp library instead of inventing its
-own wheel.
-.\" ----------------------------------------------------------------
-.SH SEE ALSO
-.PP
-X(1), asclock(1x), wmaker(1x), system(3)
-.\" ----------------------------------------------------------------
-.SH COPYRIGHT AND LICENSE
-.PP
-Copyright � 1999 by Jim Knoble <jmknoble at pobox.com>. Significant
-portions of
-.B wmclock
-are directly derived from
-.B asclock
-by Beat Christen, who, along with
-.BR asclock 's
-other authors, owns the copyright to those portions of
-.BR wmclock .
-.PP
-.B Wmclock
-is licensed under the GNU General Public License, version 2, or (at
-your option) any later version. See <http://www.gnu.org/> for more
-information.
-.SH AUTHORS
-.TQ
-Jim Knoble <jmknoble at pobox.com>
-.TQ
-Beat Christen <spiff at longstreet.ch>, author of \fBasclock\fI
-.\" ----------------------------------------------------------------
-.SH DISCLAIMER
-.PP
-The software is provided ``as is'', without warranty of any kind,
-express or implied, including but not limited to the warranties of
-merchantability, fitness for a particular purpose and noninfringement.
-In no event shall the author(s) be liable for any claim, damages or
-other liability, whether in an action of contract, tort or otherwise,
-arising from, out of or in connection with the software or the use or
-other dealings in the software.
-.PP
-Your mileage may vary. Eat your vegetables.
-
diff --git a/debian/wmclock.dirs b/debian/wmclock.dirs
new file mode 100644
index 0000000..7b71a3c
--- /dev/null
+++ b/debian/wmclock.dirs
@@ -0,0 +1,3 @@
+usr/bin
+usr/share/man/man1
+usr/share/wmclock
diff --git a/debian/docs b/debian/wmclock.docs
similarity index 100%
rename from debian/docs
rename to debian/wmclock.docs
diff --git a/debian/wmclock.menu b/debian/wmclock.menu
new file mode 100644
index 0000000..3810326
--- /dev/null
+++ b/debian/wmclock.menu
@@ -0,0 +1,3 @@
+?package(wmclock):needs="x11" \
+ section="Apps/Tools" hints="Clocks" title="Wmclock" \
+ command="/usr/bin/wmclock"
diff --git a/debian/wmclock.postinst b/debian/wmclock.postinst
new file mode 100644
index 0000000..ef8e044
--- /dev/null
+++ b/debian/wmclock.postinst
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ configure)
+ if [ -x /usr/bin/update-menus ]; then
+ update-menus;
+ fi
+ ;;
+
+ abort-upgrade|abort-remove|abort-deconfigure)
+
+ ;;
+
+ *)
+ echo "postinst called with unknown argument \`$1'" >&2
+ exit 0
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/wmclock.postrm b/debian/wmclock.postrm
new file mode 100644
index 0000000..e8baecb
--- /dev/null
+++ b/debian/wmclock.postrm
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+set -e
+
+case "$1" in
+ remove)
+ if [ -x /usr/bin/update-menus ]; then
+ update-menus;
+ fi
+ ;;
+
+ purge|upgrade|abort-install|abort-upgrade|disappear)
+ ;;
+
+ failed-upgrade)
+ exit 1
+ ;;
+
+ *)
+ echo "postrm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/wmclock.c b/wmclock.c
index 5844331..d3a0eba 100644
--- a/wmclock.c
+++ b/wmclock.c
@@ -470,11 +470,11 @@ void showYear()
XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
xPos[DIGIT_1_X_POS], yPos[DIGIT_Y_POS]);
- digitXOffset = LED_NUM_WIDTH * (year % 1000);
+ digitXOffset = LED_NUM_WIDTH * (year % 1000 / 100);
XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
xPos[DIGIT_2_X_POS], yPos[DIGIT_Y_POS]);
- digitXOffset = LED_NUM_WIDTH * (year % 100);
+ digitXOffset = LED_NUM_WIDTH * (year % 100 / 10);
XCopyArea(dpy, led.pixmap, visible.pixmap, normalGC,
digitXOffset , digitYOffset, LED_NUM_WIDTH, LED_NUM_HEIGHT,
xPos[DIGIT_3_X_POS], yPos[DIGIT_Y_POS]);
@@ -828,7 +828,14 @@ int main(int argc, char **argv)
#endif /* !ONLY_SHAPED_WINDOW */
for (i = 0; i < NUM_TIME_POSITIONS; i++)
{
- xPos[i] += enable12HourClock ? timePos24[i] : timePos12[i];
+ if (enable12HourClock && (!enableYearDisplay))
+ {
+ xPos[i] += timePos24[i];
+ }
+ else
+ {
+ xPos[i] += timePos12[i];
+ }
}
/* Open the display */
diff --git a/wmclock.man.in b/wmclock.man.in
index bf0f018..81fd224 100644
--- a/wmclock.man.in
+++ b/wmclock.man.in
@@ -160,6 +160,21 @@ beginning with January at the top and continuing down to December at
the bottom. The weekday abbreviations must also be arranged
vertically, beginning with Monday at the top and continuing to Sunday
at the bottom.
+.PP
+On Debian systems you can find XPM files for a variety of languages in:
+.PP
+.RS
+.BR /usr/share/wmclock/
+.RE
+.PP
+For example, to have a French display, you could use the following
+command line:
+.PP
+.RS
+.TQ
+wmclock \-monthxpm /usr/share/wmclock/lang.french/month.xpm \-weekdayxpm /usr/share/wmclock/lang.french/weekday.xpm
+.RE
+.PP
.SS Obsolete Options
.PP
In order to maintain command-line compatibility (mostly) with
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclock.git
More information about the Pkg-wmaker-commits
mailing list