reverted: --- wmclock-1.0.12.2/wmclock.c +++ wmclock-1.0.12.2.orig/wmclock.c @@ -470,11 +470,11 @@ 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,14 +828,7 @@ #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 */ reverted: --- wmclock-1.0.12.2/wmclock.man.in +++ wmclock-1.0.12.2.orig/wmclock.man.in @@ -160,21 +160,6 @@ 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 diff -u wmclock-1.0.12.2/debian/changelog wmclock-1.0.12.2/debian/changelog --- wmclock-1.0.12.2/debian/changelog +++ wmclock-1.0.12.2/debian/changelog @@ -1,3 +1,68 @@ +wmclock (1.0.12.2-7ubuntu1) hardy; urgency=low + + * Merge from debian unstable (LP: #163709) + - Merged changes from previous changelog entry + - Updated Standards-Version to 3.7.2 + - Noted new XSBC-Original-Maintainer + + -- Chess Griffin Sun, 18 Nov 2007 21:35:47 -0500 + +wmclock (1.0.12.2-7) unstable; urgency=low + + * Adopting package (Closes: #439966) + * debian/control + - add myself as maintainer + - added Homepage field to source stanza + - little reorg of short and long description + - depends against debhelper at least version 5 + - added dependency against dpatch + * debian/watch + - added + * debian/compat + - bump to 5 + * debian/copyright + - added myself as new maintainer + - added new upstram website address + - reported upstream as copyright holder, along with asclock copyright + holders, since wmclock derives from that + - separated license and copyright section (previous mixed up) + - fixed license location on a debian machine (it is GPLv2 not GPLv1) + * debian/rules + - removed unused dh_ tools calls + - added explicit file names to dh_installdocs + - removed "-n" param from dh_installmenu call + - added dpatch stuff + - installing debian/lang.* too + * debian/wmclock.docs + - removed since merged with debian/rules + * debian/wmclock.menu + - renamed wmclock.menu to menu + * debian/menu + - manu section is Applications + * debian/wmclock.post{inst,rm} + - deleted since menu update is managed by dh_installmenu + * wmclock.man.in + - taken back to upstream version + * debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch + - apply source code modification done (before adoption) without patching + * debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch + - apply source code modification done (before adoption) without patching + * debian/patches/10-fix_manpage_lintian_warning.dpatch + - added to fix a lintian warning about (c) character in manpage + represented using extended char and not with "\(co)" escape sequence + * debian/lang.polish/* + - moved here since they are provided buy Debian maintainer, not upstream + + -- Sandro Tosi Wed, 03 Oct 2007 22:54:36 +0200 + +wmclock (1.0.12.2-6) unstable; urgency=low + + * debian/control: + + Set maintainer to Debian QA group. + + Bump Standards-Version to 3.7.2, no changes needed. + + -- Romain Francoise Tue, 28 Aug 2007 21:38:43 +0200 + wmclock (1.0.12.2-5ubuntu3) gutsy; urgency=low * Remove superfluous debian/changelog.mine file. Hmph. @@ -86 +150,0 @@ - diff -u wmclock-1.0.12.2/debian/compat wmclock-1.0.12.2/debian/compat --- wmclock-1.0.12.2/debian/compat +++ wmclock-1.0.12.2/debian/compat @@ -1 +1 @@ -4 +5 diff -u wmclock-1.0.12.2/debian/control wmclock-1.0.12.2/debian/control --- wmclock-1.0.12.2/debian/control +++ wmclock-1.0.12.2/debian/control @@ -5,14 +5,14 @@ -XSBC-Original-Maintainer: Romain Francoise -Build-Depends: debhelper (>= 4), libxpm-dev, libx11-dev, xutils, x11proto-xext-dev, libxt-dev, libxext-dev -Standards-Version: 3.6.1.0 +XSBC-Original-Maintainer: Sandro Tosi +Build-Depends: debhelper (>= 5), libxpm-dev, libx11-dev, xutils, x11proto-xext-dev, libxt-dev, libxext-dev, dpatch +Standards-Version: 3.7.2 +Homepage: http://www.jmknoble.net/WindowMaker/wmclock/ Package: wmclock Architecture: any 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/ +Description: 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. diff -u wmclock-1.0.12.2/debian/copyright wmclock-1.0.12.2/debian/copyright --- wmclock-1.0.12.2/debian/copyright +++ wmclock-1.0.12.2/debian/copyright @@ -3,12 +3,31 @@ -It is now maintained by Romain Francoise . -It was downloaded from http://www.bensinclair.com/dockapp/ +It was maintained by Romain Francoise . +Is is not maintained by Sandro Tosi + +It was downloaded from http://www.bensinclair.com/dockapp/ and it is +now available on http://www.jmknoble.net/WindowMaker/wmclock/ . Upstream Author: Jim Knoble -Copyright: wmclock contains parts from asclock and original code, all -licensed under the GNU General Public License (GPL), with additional -warranty-voiding clauses. +Copyright: 1999 Jim Knoble + Significant portions of wmclock are directly derived from + asclock by Beat Christen , who, along + with asclock's other authors, owns the copyright to those + portions of wmclock. + +License: + + Wmclock is licensed under the GNU General Public License, version + 2, or (at your option) any later version. See + for more information. + + 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. On Debian GNU/Linux systems, the complete text of the GNU General Public -License can be found in `/usr/share/common-licenses/GPL'. +License, version 2, can be found in `/usr/share/common-licenses/GPL-2'. diff -u wmclock-1.0.12.2/debian/rules wmclock-1.0.12.2/debian/rules --- wmclock-1.0.12.2/debian/rules +++ wmclock-1.0.12.2/debian/rules @@ -1,7 +1,8 @@ #!/usr/bin/make -f -configure: configure-stamp +include /usr/share/dpatch/dpatch.make +configure: configure-stamp configure-stamp: dh_testdir ./configure --prefix=/usr \ @@ -9,13 +10,12 @@ touch configure-stamp build: build-stamp - -build-stamp: configure-stamp +build-stamp: patch-stamp configure-stamp dh_testdir $(MAKE) touch build-stamp -clean: +clean: unpatch dh_testdir dh_testroot rm -f build-stamp configure-stamp @@ -32,7 +32,7 @@ dh_clean -k dh_installdirs $(MAKE) install BINDIR=$(CURDIR)/debian/wmclock/usr/bin - for dir in lang.*; do \ + for dir in lang.* debian/lang.*; do \ cp -r "$$dir" $(CURDIR)/debian/wmclock/usr/share/wmclock; \ done @@ -41,26 +41,16 @@ binary-arch: build install dh_testdir dh_testroot -# dh_installdebconf - dh_installdocs + dh_installdocs README dh_installexamples - dh_installmenu -n -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime -# dh_installinit -# dh_installcron - dh_installman wmclock.man -# dh_undocumented - dh_installchangelogs ChangeLog + dh_installmenu + dh_installman wmclock.man + dh_installchangelogs ChangeLog dh_link dh_strip dh_compress dh_fixperms -# dh_makeshlibs dh_installdeb -# dh_perl dh_shlibdeps dh_gencontrol dh_md5sums reverted: --- wmclock-1.0.12.2/debian/wmclock.docs +++ wmclock-1.0.12.2.orig/debian/wmclock.docs @@ -1 +0,0 @@ -README reverted: --- wmclock-1.0.12.2/debian/wmclock.menu +++ wmclock-1.0.12.2.orig/debian/wmclock.menu @@ -1,3 +0,0 @@ -?package(wmclock):needs="x11" \ - section="Apps/Tools" hints="Clocks" title="Wmclock" \ - command="/usr/bin/wmclock" reverted: --- wmclock-1.0.12.2/debian/wmclock.postinst +++ wmclock-1.0.12.2.orig/debian/wmclock.postinst @@ -1,24 +0,0 @@ -#!/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 reverted: --- wmclock-1.0.12.2/debian/wmclock.postrm +++ wmclock-1.0.12.2.orig/debian/wmclock.postrm @@ -1,27 +0,0 @@ -#!/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 reverted: --- wmclock-1.0.12.2/lang.polish/weekday.xpm +++ wmclock-1.0.12.2.orig/lang.polish/weekday.xpm @@ -1,47 +0,0 @@ -/* XPM */ -static char * asclock_tydzien_xpm[] = { -"20 42 2 1", -" c #FFFFFF", -". c #000000", -" ", -" .... .... . . ", -" . . . . .. . ", -" .... . . . . . ", -" . . . . .. ", -" . .... . . ", -" ", -" . . ..... .... ", -" . . . . .", -" . .. . . . .", -" .. .. . . .", -" . . . .... ", -" . ", -" .... ..... .... ", -" . . . . .", -" ... ..... . .", -" . . . . .", -" .... . . .... ", -" ", -" ... ..... . . ", -" . . . . . ", -" . . . .. . ", -" . . . .. .. ", -" ... ..... . . ", -" ", -" .... ..... .. ", -" . . . . . ", -" .... . . . ", -" . . ...... ", -" . ..... . ..", -" ", -" .... .... .... ", -" . . . . . ", -" ... . . .... ", -" . . . . . ", -" .... .... .... ", -" ", -" . . ..... ..... ", -" .. . . . ", -" . . . . .... ", -" . .. . . ", -" . . ..... ..... "}; reverted: --- wmclock-1.0.12.2/lang.polish/month.xpm +++ wmclock-1.0.12.2.orig/lang.polish/month.xpm @@ -1,81 +0,0 @@ -/* XPM */ -static char * month_xpm[] = { -"22 72 6 1", -" c #FFFFFF", -". c #AAAAAA", -"+ c #000000", -"@ c #555555", -"# c #AEAAAE", -"$ c #515551", -" ", -" .++++ +++++ + + ", -" + .+ + + ", -" .++. +. .+ ", -" + .+ + ", -" ++++. + + ", -" ", -" + + .+ +++++ ", -" .+ .+ + .+ ", -" +. +. .+ +. ", -" + + +. .+ ", -" @++++ @++ + ", -" ", -" + + + +++++", -" + ++ +. + +", -" + + + + + + +++++ ", -" + + + ++++ + + ", -"+ + + + + + ", -" ", -" +# + + + + ", -" #+ +# + + +. #+ ", -" + + +.++.+ + ", -" #+ #+ ++ +. #+ ", -" + +# + + + ", -" ", -" + + + + ", -" .+ ++ + .+ ", -" +.+ + + + + +. ", -" .+ + + ++++ + + ", -" + + + + ++ ", -" ", -" +++ +++++ +++++ ", -" + #+ .+ ", -" + +# ++++ ", -" + #+# + ", -" +++++ #+++++ @++++ ", -" ", -" + + @+++@ ", -" .+ #+ .+ + ", -" +. + +++++ ", -" + #+ .+ ", -" @++++ + + ", -" ", -" .++++ + +++++ ", -" + #+ .+ ", -" .++. + ++++ ", -" + #+ + ", -" ++++. + @++++ ", -" ", -" + + +++++ + ", -" + + +. + + #+ ", -" +.++.+ +++++ + ", -" ++ +. + + #+ ", -" + + + + + ", -" ", -" @+++@ + +++++ ", -" .+ + + #+ ", -" +++++ + + +# ", -" .+ ++++ #+# ", -" + + + #+++++ ", -" ", -" + + #++++ ", -" #+ #+ + ", -" +# + #++# ", -" + #+ + ", -" $++++ + ++++# ", -" ", -" .++++ +++++ + .+ ", -" + + + .+ + ", -" .+ +++ +++++ +. .+ ", -" +. + + + + +. ", -" +++ + + @++ "}; only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/patches/10-fix_manpage_lintian_warning.dpatch +++ wmclock-1.0.12.2/debian/patches/10-fix_manpage_lintian_warning.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10-fix_manpage_lintian_warning.dpatch by Sandro Tosi +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in +--- wmclock~/wmclock.man.in 2007-10-03 22:47:17.000000000 +0200 ++++ wmclock/wmclock.man.in 2007-10-03 22:47:51.000000000 +0200 +@@ -211,7 +211,7 @@ + .\" ---------------------------------------------------------------- + .SH COPYRIGHT AND LICENSE + .PP +-Copyright © 1999 by Jim Knoble . Significant ++Copyright \(co 1999 by Jim Knoble . Significant + portions of + .B wmclock + are directly derived from only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch +++ wmclock-1.0.12.2/debian/patches/00-fix_wmclockc_source_chgs_prior_adoption.dpatch @@ -0,0 +1,24 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00-fix_wmclockc_source_chgs_prior_adoption.dpatch by Sandro Tosi +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wmclock~/wmclock.c wmclock/wmclock.c +--- wmclock~/wmclock.c 2000-03-08 08:31:33.000000000 +0100 ++++ wmclock/wmclock.c 2007-10-03 22:42:36.000000000 +0200 +@@ -470,11 +470,11 @@ + 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]); only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/patches/00list +++ wmclock-1.0.12.2/debian/patches/00list @@ -0,0 +1,3 @@ +00-fix_manpage_source_chgs_prior_adoption +00-fix_wmclockc_source_chgs_prior_adoption +10-fix_manpage_lintian_warning only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch +++ wmclock-1.0.12.2/debian/patches/00-fix_manpage_source_chgs_prior_adoption.dpatch @@ -0,0 +1,32 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 00-fix_manpage_source_chgs_prior_adoption.dpatch by Sandro Tosi +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad wmclock~/wmclock.man.in wmclock/wmclock.man.in +--- wmclock~/wmclock.man.in 2000-03-08 07:56:36.000000000 +0100 ++++ wmclock/wmclock.man.in 2007-10-03 22:40:05.000000000 +0200 +@@ -160,6 +160,21 @@ + 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 only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/menu +++ wmclock-1.0.12.2/debian/menu @@ -0,0 +1,3 @@ +?package(wmclock):needs="x11" \ + section="Applications/Tools" hints="Clocks" title="Wmclock" \ + command="/usr/bin/wmclock" only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/lang.polish/month.xpm +++ wmclock-1.0.12.2/debian/lang.polish/month.xpm @@ -0,0 +1,81 @@ +/* XPM */ +static char * month_xpm[] = { +"22 72 6 1", +" c #FFFFFF", +". c #AAAAAA", +"+ c #000000", +"@ c #555555", +"# c #AEAAAE", +"$ c #515551", +" ", +" .++++ +++++ + + ", +" + .+ + + ", +" .++. +. .+ ", +" + .+ + ", +" ++++. + + ", +" ", +" + + .+ +++++ ", +" .+ .+ + .+ ", +" +. +. .+ +. ", +" + + +. .+ ", +" @++++ @++ + ", +" ", +" + + + +++++", +" + ++ +. + +", +" + + + + + + +++++ ", +" + + + ++++ + + ", +"+ + + + + + ", +" ", +" +# + + + + ", +" #+ +# + + +. #+ ", +" + + +.++.+ + ", +" #+ #+ ++ +. #+ ", +" + +# + + + ", +" ", +" + + + + ", +" .+ ++ + .+ ", +" +.+ + + + + +. ", +" .+ + + ++++ + + ", +" + + + + ++ ", +" ", +" +++ +++++ +++++ ", +" + #+ .+ ", +" + +# ++++ ", +" + #+# + ", +" +++++ #+++++ @++++ ", +" ", +" + + @+++@ ", +" .+ #+ .+ + ", +" +. + +++++ ", +" + #+ .+ ", +" @++++ + + ", +" ", +" .++++ + +++++ ", +" + #+ .+ ", +" .++. + ++++ ", +" + #+ + ", +" ++++. + @++++ ", +" ", +" + + +++++ + ", +" + + +. + + #+ ", +" +.++.+ +++++ + ", +" ++ +. + + #+ ", +" + + + + + ", +" ", +" @+++@ + +++++ ", +" .+ + + #+ ", +" +++++ + + +# ", +" .+ ++++ #+# ", +" + + + #+++++ ", +" ", +" + + #++++ ", +" #+ #+ + ", +" +# + #++# ", +" + #+ + ", +" $++++ + ++++# ", +" ", +" .++++ +++++ + .+ ", +" + + + .+ + ", +" .+ +++ +++++ +. .+ ", +" +. + + + + +. ", +" +++ + + @++ "}; only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/lang.polish/weekday.xpm +++ wmclock-1.0.12.2/debian/lang.polish/weekday.xpm @@ -0,0 +1,47 @@ +/* XPM */ +static char * asclock_tydzien_xpm[] = { +"20 42 2 1", +" c #FFFFFF", +". c #000000", +" ", +" .... .... . . ", +" . . . . .. . ", +" .... . . . . . ", +" . . . . .. ", +" . .... . . ", +" ", +" . . ..... .... ", +" . . . . .", +" . .. . . . .", +" .. .. . . .", +" . . . .... ", +" . ", +" .... ..... .... ", +" . . . . .", +" ... ..... . .", +" . . . . .", +" .... . . .... ", +" ", +" ... ..... . . ", +" . . . . . ", +" . . . .. . ", +" . . . .. .. ", +" ... ..... . . ", +" ", +" .... ..... .. ", +" . . . . . ", +" .... . . . ", +" . . ...... ", +" . ..... . ..", +" ", +" .... .... .... ", +" . . . . . ", +" ... . . .... ", +" . . . . . ", +" .... .... .... ", +" ", +" . . ..... ..... ", +" .. . . . ", +" . . . . .... ", +" . .. . . ", +" . . ..... ..... "}; only in patch2: unchanged: --- wmclock-1.0.12.2.orig/debian/watch +++ wmclock-1.0.12.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.jmknoble.net/WindowMaker/wmclock/ wmclock-([\d\.]*)\.tar\.gz