[Pkg-wmaker-commits] [wmtime] 22/101: Imported Debian patch 1.0b2-3

[Doug Torrance]

This is an automated email from the git hooks/post-receive script.

dtorrance-guest pushed a commit to branch master
in repository wmtime.

commit 19096fee3202ed919ea3df75445c5eddc20c005c
Author: Fredrik Hallenberg <hallon at debian.org>
Date:   Sun Feb 6 21:01:55 2000 +0100

    Imported Debian patch 1.0b2-3
---
 debian/changelog   | 14 ++++++++++++++
 debian/control     | 11 ++++++-----
 debian/copyright   |  2 +-
 debian/rules       |  1 +
 debian/wmtime.menu |  5 +++++
 wmtime/wmtime.c    | 13 ++++++++-----
 6 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6bfe156..a8d0090 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+wmtime (1.0b2-3) frozen unstable; urgency=low
+
+  * Fixed monthname (NOV instead of NOW).
+  * Added menu entry. (closes: #51996)
+  * Bumped standards revision to 3.1.1.
+
+ -- Fredrik Hallenberg <hallon at debian.org>  Sun,  6 Feb 2000 21:01:55 +0100
+
+wmtime (1.0b2-2) unstable; urgency=low
+
+  * WMTime didn't work properly with -digital flag. (closes: #31869)
+
+ -- Fredrik Hallenberg <hallon at debian.org>  Mon,  5 Jul 1999 09:32:59 +0200
+
 wmtime (1.0b2-1) unstable; urgency=low
 
   * Initial Release.
diff --git a/debian/control b/debian/control
index 7173055..36afc93 100644
--- a/debian/control
+++ b/debian/control
@@ -2,14 +2,15 @@ Source: wmtime
 Section: x11
 Priority: optional
 Maintainer: Fredrik Hallenberg <hallon at debian.org>
-Standards-Version: 2.4.1
+Standards-Version: 3.1.1
+Build-Depends: debhelper, libxpm4-dev
 
 Package: wmtime
 Architecture: any
 Depends: ${shlibs:Depends}
 Description: Displays time and date
- WMTime, guess what, displays the time and date and gives you
- some nice additional features too...
+ WMTime displays the time and date and gives you some nice additional 
+ features too. It is intended for docking in WindowMaker.
  .
  WMTime currently provides:
  .
@@ -17,7 +18,7 @@ Description: Displays time and date
    * Realtime morphing UI (analog <> digital mode);
    * Autoscaling and anti aliased hands;
    * Locale, can display DAY and DATE in various languages;
-   * Can lauch 3 user definable commands through ~/.wmtimerc;
+   * Can launch 3 user definable commands through ~/.wmtimerc;
    * Can be run multiple times;
    * Commandline options for help (-h), version (-v), digital
-     clock mode (-digital) and and display (-d);
+     clock mode (-digital) and and display (-d)
diff --git a/debian/copyright b/debian/copyright
index 34d8462..3c80bb3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,6 +24,6 @@ Foundation, 59 Temple Place - Suite 330,
 Boston, MA 02111-1307, USA.
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/doc/copyright/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL'.
 
 
diff --git a/debian/rules b/debian/rules
index 29775b5..e29b3c5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -40,6 +40,7 @@ binary-arch: build install
 #	dh_testversion
 	dh_testdir
 	dh_testroot
+	dh_installmenu
 	dh_installdocs BUGS HINTS INSTALL README TODO
 	dh_undocumented wmtime.1x
 	dh_installchangelogs CHANGES
diff --git a/debian/wmtime.menu b/debian/wmtime.menu
new file mode 100644
index 0000000..a0396d1
--- /dev/null
+++ b/debian/wmtime.menu
@@ -0,0 +1,5 @@
+?package(wmtime):\
+  needs=X11\
+  section=Apps/Tools hints="Clocks"\
+  title="wmtime"\
+  command="/usr/X11R6/bin/wmtime"
diff --git a/wmtime/wmtime.c b/wmtime/wmtime.c
index 800d2f3..b6353a1 100644
--- a/wmtime/wmtime.c
+++ b/wmtime/wmtime.c
@@ -89,7 +89,7 @@
 char	*ProgName;
 int		digital = 0;
 char	day_of_week[7][3] = { "SU", "MO", "TU", "WE", "TH", "FR", "SA" };
-char	mon_of_year[12][4] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOW", "DEC" };
+char	mon_of_year[12][4] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
 
 /* functions */
 void usage(void);
@@ -215,7 +215,10 @@ void wmtime_routine(int argc, char **argv) {
 	openXwindow(argc, argv, wmtime_master_xpm, wmtime_mask_bits, 128, 64);
 
 	copyXPMArea(0, 0, 128, 64, 0, 98);
-	if (digital) {
+
+        copyXPMArea(0, 0, 64, 64, 64, 0);
+	setMaskXY(0, 0);
+        if (digital) {
 		copyXPMArea(64, 0, 64, 64, 0, 0);
 		setMaskXY(-64, 0);
 	} else {
@@ -223,7 +226,7 @@ void wmtime_routine(int argc, char **argv) {
 		setMaskXY(0, 0);
 	}
 
-	/* add mouse region */
+        /* add mouse region */
 	AddMouseRegion(0, 5, 48, 58, 60);
 	AddMouseRegion(1, 5, 5, 58, 46);
 
@@ -286,8 +289,8 @@ void wmtime_routine(int argc, char **argv) {
 							DrawTime(time_struct->tm_hour, time_struct->tm_min, time_struct->tm_sec);
 							DrawDate(time_struct->tm_wday, time_struct->tm_mday, time_struct->tm_mon);
 						} else {
-							copyXPMArea(0, 98, 64, 64, 0, 0);
-							setMaskXY(0, 0);
+							copyXPMArea(0, 98, 64, 64, 0, 0);	
+						        setMaskXY(0, 0);
 							DrawWijzer(time_struct->tm_hour, time_struct->tm_min, time_struct->tm_sec);
 							DrawDate(time_struct->tm_wday, time_struct->tm_mday, time_struct->tm_mon);
 						}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmtime.git