Your message dated Mon, 31 May 2004 03:47:09 -0400 with message-id <[EMAIL PROTECTED]> and subject line Bug#206317: fixed in xdkcal 0.9d-1 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) -------------------------------------- Received: (at submit) by bugs.debian.org; 20 Aug 2003 03:38:16 +0000 >From [EMAIL PROTECTED] Tue Aug 19 22:37:59 2003 Return-path: <[EMAIL PROTECTED]> Received: from mailhub1.otago.ac.nz [139.80.64.218] by master.debian.org with esmtp (Exim 3.35 1 (Debian)) id 19pJnI-0004t7-00; Tue, 19 Aug 2003 22:37:56 -0500 Received: (from [EMAIL PROTECTED]) by mailhub1.otago.ac.nz (8.12.9/8.12.9) id h7K3beKr013688; Wed, 20 Aug 2003 15:37:40 +1200 Received: from galadriel.otago.ac.nz (galadriel.otago.ac.nz [139.80.64.213]) by mailhub1.otago.ac.nz (8.12.9/8.12.9) with ESMTP id h7K3be5u013633; Wed, 20 Aug 2003 15:37:40 +1200 Received: from bofh.otago.ac.nz (bofh.otago.ac.nz [139.80.76.162]) by galadriel.otago.ac.nz (8.12.8/8.12.8) with ESMTP id h7K3bdIv014707; Wed, 20 Aug 2003 15:37:39 +1200 (NZST) Received: from mjb by bofh.otago.ac.nz with local (Exim 3.36 #1 (Debian)) id 19pJmz-0001Lf-00; Wed, 20 Aug 2003 15:37:37 +1200 Content-Type: multipart/mixed; boundary="===============0839594901==" MIME-Version: 1.0 From: Michael Beattie <[EMAIL PROTECTED]> To: Debian Bug Tracking System <[EMAIL PROTECTED]> Subject: xdkcal: Add option to start a week on a monday X-Mailer: reportbug 2.22 Date: Wed, 20 Aug 2003 15:37:37 +1200 Message-Id: <[EMAIL PROTECTED]> X-scanner: scanned by Inflex 1.0.12.7 Delivered-To: [EMAIL PROTECTED] X-Spam-Status: No, hits=-12.3 required=4.0 tests=BAYES_20,HAS_PACKAGE,PATCH_UNIFIED_DIFF autolearn=ham version=2.53-bugs.debian.org_2003_8_17 X-Spam-Level: X-Spam-Checker-Version: SpamAssassin 2.53-bugs.debian.org_2003_8_17 (1.174.2.15-2003-03-30-exp) This is a multi-part MIME message sent by reportbug. --===============0839594901== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline Package: xdkcal Version: 0.9d-0.1 Severity: wishlist Tags: patch It would be nice if xdkcal would have an option to start weeks on mondays, instead of splitting the weekend as it does currently. The attached patch does this, by creating a new 'style'. the only thing it doesnt do, is allow for the possible need for/lack of, an extra row. (The patch also * uncomments the $(MAKE) in debian/rules under the build target to be a little more as expected... * Fixes the FTBFS bug for multiline strings under gcc-3.3 ) It's a starting point. Mike. -- System Information: Debian Release: testing/unstable Architecture: i386 Kernel: Linux bofh 2.4.20 #1 Tue Aug 12 10:25:16 NZST 2003 i686 Locale: LANG=C, LC_CTYPE=C Versions of packages xdkcal depends on: ii libc6 2.3.2-2 GNU C Library: Shared libraries an ii xlibs 4.2.1-9 X Window System client libraries -- no debconf information --===============0839594901== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="/home/mjb/xdkcal_monday_start.patch" diff -urN xdkcal-0.9d.orig/debian/rules xdkcal-0.9d/debian/rules --- xdkcal-0.9d.orig/debian/rules 2003-08-20 15:29:07.000000000 +1200 +++ xdkcal-0.9d/debian/rules 2003-08-20 15:13:20.000000000 +1200 @@ -14,7 +14,7 @@ ./configure --prefix=/usr/X11R6 --mandir=\$${prefix}/man --infodir=\$${prefix}/share/info # Add here commands to compile the package. - #$(MAKE) + $(MAKE) touch build-stamp diff -urN xdkcal-0.9d.orig/window.c xdkcal-0.9d/window.c --- xdkcal-0.9d.orig/window.c 1999-11-22 21:15:20.000000000 +1300 +++ xdkcal-0.9d/window.c 2003-08-20 15:07:47.000000000 +1200 @@ -144,6 +144,10 @@ rows = calc_rows(target_year,target_month); columns = 7; break; + case MONDAY_STYLE: + rows = calc_rows(target_year,target_month); + columns = 7; + break; case LINE_STYLE: rows = 1; columns = calc_lastday(target_year,target_month); @@ -312,9 +316,13 @@ switch(style) { case NORMAL_STYLE: - loop = 7; + loop = columns; i_start = 0; break; + case MONDAY_STYLE: + loop = columns + 1; + i_start = 1; + break; case LINE_STYLE: loop = columns + offset; i_start = offset; @@ -346,6 +354,9 @@ case NORMAL_STYLE: day = day-offset; break; + case MONDAY_STYLE: + day = day-offset+1; + break; case LINE_STYLE: break; } diff -urN xdkcal-0.9d.orig/window.h xdkcal-0.9d/window.h --- xdkcal-0.9d.orig/window.h 1999-11-22 21:15:20.000000000 +1300 +++ xdkcal-0.9d/window.h 2003-08-20 15:04:11.000000000 +1200 @@ -16,6 +16,7 @@ enum Style { NORMAL_STYLE, + MONDAY_STYLE, LINE_STYLE }; diff -urN xdkcal-0.9d.orig/xdkcal.1x xdkcal-0.9d/xdkcal.1x --- xdkcal-0.9d.orig/xdkcal.1x 2000-07-23 19:32:01.000000000 +1200 +++ xdkcal-0.9d/xdkcal.1x 2003-08-20 15:11:37.000000000 +1200 @@ -61,7 +61,7 @@ padding .TP .B \-s, \-\-style \fIstyle_num\fP -drawing style (0:normal 1:line) +drawing style (0:normal 1:monday 2:line) .TP .B \-m, \-\-draw_month \fIon/off\fP draw month (default on) diff -urN xdkcal-0.9d.orig/xdkcal.c xdkcal-0.9d/xdkcal.c --- xdkcal-0.9d.orig/xdkcal.c 2000-02-25 01:11:20.000000000 +1300 +++ xdkcal-0.9d/xdkcal.c 2003-08-20 15:28:58.000000000 +1200 @@ -218,9 +218,9 @@ void short_usage() { fprintf(stderr, -"Usage: %s [-h][-x window_x][-y window_y][-f fontset][-C default_color] - [-H holiday_color][-T today_color][-M month_color][-t on/off] - [-p padding][-s style_num][-m on/off][-y on/off] +"Usage: %s [-h][-x window_x][-y window_y][-f fontset][-C default_color]\n\ + [-H holiday_color][-T today_color][-M month_color][-t on/off]\n\ + [-p padding][-s style_num][-m on/off][-y on/off]\n\ [-n num_week] [month [year]]\n",PACKAGE); } @@ -243,7 +243,7 @@ fprintf(stderr," -t\t--%s\t\t on/off transparent(default off)\n",properties[SHAPE].name); #endif fprintf(stderr," -p\t--%s\t padding padding\n",properties[PADDING].name); - fprintf(stderr," -s\t--%s\t\t style_num drawing style(0:normal 1:line)\n",properties[STYLE].name); + fprintf(stderr," -s\t--%s\t\t style_num drawing style(0:normal 1:monday 2:line)\n",properties[STYLE].name); fprintf(stderr," -m\t--%s\t on/off draw month(default on)\n",properties[DRAW_MONTH].name); fprintf(stderr," -w\t--%s\t on/off draw weeks(default on)\n",properties[DRAW_WEEK].name); fprintf(stderr," -n\t--%s\t num\t number of chars for weeks(default 2)\n",properties[NUM_WEEK].name); --===============0839594901==-- --------------------------------------- Received: (at 206317-close) by bugs.debian.org; 31 May 2004 07:53:02 +0000 >From [EMAIL PROTECTED] Mon May 31 00:53:02 2004 Return-path: <[EMAIL PROTECTED]> Received: from newraff.debian.org [208.185.25.31] (mail) by spohr.debian.org with esmtp (Exim 3.35 1 (Debian)) id 1BUhbS-0001d8-00; Mon, 31 May 2004 00:53:02 -0700 Received: from katie by newraff.debian.org with local (Exim 3.35 1 (Debian)) id 1BUhVl-0006GU-00; Mon, 31 May 2004 03:47:09 -0400 From: Michael Beattie <[EMAIL PROTECTED]> To: [EMAIL PROTECTED] X-Katie: $Revision: 1.49 $ Subject: Bug#206317: fixed in xdkcal 0.9d-1 Message-Id: <[EMAIL PROTECTED]> Sender: Archive Administrator <[EMAIL PROTECTED]> Date: Mon, 31 May 2004 03:47:09 -0400 Delivered-To: [EMAIL PROTECTED] X-Spam-Checker-Version: SpamAssassin 2.60-bugs.debian.org_2004_03_25 (1.212-2003-09-23-exp) on spohr.debian.org X-Spam-Status: No, hits=-6.0 required=4.0 tests=BAYES_00,HAS_BUG_NUMBER autolearn=no version=2.60-bugs.debian.org_2004_03_25 X-Spam-Level: Source: xdkcal Source-Version: 0.9d-1 We believe that the bug you reported is fixed in the latest version of xdkcal, which is due to be installed in the Debian FTP archive: xdkcal_0.9d-1.diff.gz to pool/main/x/xdkcal/xdkcal_0.9d-1.diff.gz xdkcal_0.9d-1.dsc to pool/main/x/xdkcal/xdkcal_0.9d-1.dsc xdkcal_0.9d-1_i386.deb to pool/main/x/xdkcal/xdkcal_0.9d-1_i386.deb A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to [EMAIL PROTECTED], and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Michael Beattie <[EMAIL PROTECTED]> (supplier of updated xdkcal 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 [EMAIL PROTECTED]) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.7 Date: Mon, 31 May 2004 18:59:00 +1200 Source: xdkcal Binary: xdkcal Architecture: source i386 Version: 0.9d-1 Distribution: unstable Urgency: low Maintainer: Michael Beattie <[EMAIL PROTECTED]> Changed-By: Michael Beattie <[EMAIL PROTECTED]> Description: xdkcal - Desktop Calendar for X Closes: 206317 210889 Changes: xdkcal (0.9d-1) unstable; urgency=low . * New Maintainer (Closes: Bug#210889) * Added the option to start a week on a Monday, as oppsed to a Sunday (Closes: Bug#206317) * Fixed a bug where the month data is not changed on the 1st of the month on a long running copy of xdkcal. Files: 639a98b6bec617333d4a321d389a30a8 602 x11 optional xdkcal_0.9d-1.dsc 380344b0d2410a710ab4bf3729c465c3 5547 x11 optional xdkcal_0.9d-1.diff.gz 53142854533a65925fbc2101f3f4a4ec 15314 x11 optional xdkcal_0.9d-1_i386.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.4 (GNU/Linux) Comment: Michael Beattie <[EMAIL PROTECTED]> iEYEARECAAYFAkC63SEACgkQP11OPXNL8MmWmwCfQM3zPFbTXaVojMrQCV6Ay2B2 l5oAn3oz752WCbZ2pKgolg3yM0VMvJS/ =AIHS -----END PGP SIGNATURE-----