[Pkg-wmaker-commits] [wmclockmon.git] 02/31: Imported Upstream version 0.8.1
Doug Torrance
dtorrance-guest at moszumanska.debian.org
Wed Feb 17 10:49:47 UTC 2016
This is an automated email from the git hooks/post-receive script.
dtorrance-guest pushed a commit to branch master
in repository wmclockmon.git.
commit c147bc3bd6f0138399dceae4fa7025784199e505
Author: Doug Torrance <dtorrance at piedmont.edu>
Date: Wed Jan 27 21:18:31 2016 -0500
Imported Upstream version 0.8.1
---
.ChangeLog.swp | Bin 20480 -> 0 bytes
ChangeLog | 12 +++++++--
configure | 18 ++++++-------
configure.ac | 4 +--
debian/changelog | 62 ++++++++++++++++++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 11 ++++----
debian/docs | 2 +-
debian/examples | 2 ++
debian/menu | 4 +--
debian/rules | 11 ++++----
debian/watch | 3 +++
src/main.c | 35 ++++---------------------
wmclockmon-cal/mainwindow.c | 14 +++++-----
14 files changed, 116 insertions(+), 63 deletions(-)
diff --git a/.ChangeLog.swp b/.ChangeLog.swp
deleted file mode 100644
index 2197feb..0000000
Binary files a/.ChangeLog.swp and /dev/null differ
diff --git a/ChangeLog b/ChangeLog
index d8ed303..ff57852 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-07
+ * released version 0.8.1
+ * fixed a bug in configuration loading
+
+2005-02-06
+ * changed the way the dockapp is created so that the binary name is used
+ for the app properties (Nathan Mahon)
+
2004-05-31
* released version 0.8.0
* added monitoring of new calendar files
@@ -56,7 +64,7 @@
* fixed a bug in default background
2004-01-18
- * added label option (John McKerrell <john at mckerrell.net>)
+ * added label option (John McKerrel)
2004-01-12
* added netbsd to supported platforms
@@ -109,7 +117,7 @@
* updated manpage
2003-09-20
- * added new LED looks (Noberasco Michele <noberasco.gnu at disi.unige.it>)
+ * added new LED looks (Noberasco Michele)
* fixed a bug in -lc option's argument loading (Noberasco Michele)
2003-09-02
diff --git a/configure b/configure
index 3f7a3fd..75030ca 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.53 for wmclockmon 0.8.0.
+# Generated by GNU Autoconf 2.53 for wmclockmon 0.8.1.
#
# Report bugs to <tnemeth at free.fr>.
#
@@ -256,8 +256,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='wmclockmon'
PACKAGE_TARNAME='wmclockmon'
-PACKAGE_VERSION='0.8.0'
-PACKAGE_STRING='wmclockmon 0.8.0'
+PACKAGE_VERSION='0.8.1'
+PACKAGE_STRING='wmclockmon 0.8.1'
PACKAGE_BUGREPORT='tnemeth at free.fr'
ac_unique_file="src/main.c"
@@ -762,7 +762,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures wmclockmon 0.8.0 to adapt to many kinds of systems.
+\`configure' configures wmclockmon 0.8.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -833,7 +833,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of wmclockmon 0.8.0:";;
+ short | recursive ) echo "Configuration of wmclockmon 0.8.1:";;
esac
cat <<\_ACEOF
@@ -924,7 +924,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-wmclockmon configure 0.8.0
+wmclockmon configure 0.8.1
generated by GNU Autoconf 2.53
Copyright 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002
@@ -939,7 +939,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by wmclockmon $as_me 0.8.0, which was
+It was created by wmclockmon $as_me 0.8.1, which was
generated by GNU Autoconf 2.53. Invocation command line was
$ $0 $@
@@ -5318,7 +5318,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
-This file was extended by wmclockmon $as_me 0.8.0, which was
+This file was extended by wmclockmon $as_me 0.8.1, which was
generated by GNU Autoconf 2.53. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -5380,7 +5380,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-wmclockmon config.status 0.8.0
+wmclockmon config.status 0.8.1
configured by $0, generated by GNU Autoconf 2.53,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/configure.ac b/configure.ac
index 4412825..06a5760 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,8 +2,8 @@ dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.52)
dnl AC_INIT(src/main.c)
-dnl AM_INIT_AUTOMAKE(wmclockmon, 0.8.0)
-AC_INIT(wmclockmon, 0.8.0, tnemeth at free.fr)
+dnl AM_INIT_AUTOMAKE(wmclockmon, 0.8.1)
+AC_INIT(wmclockmon, 0.8.1, tnemeth at free.fr)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE($PACKAGE_NAME, $PACKAGE_VERSION)
diff --git a/debian/changelog b/debian/changelog
index 18eee8b..e40795a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,65 @@
+wmclockmon (0.8.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * src/main.c,wmclockmon-cal: Fixed some compilation warnings.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Wed, 15 Jun 2005 16:06:12 +0200
+
+wmclockmon (0.8.0-2) unstable; urgency=low
+
+ * debian/control: Added libxt-dev to make the damn thing build. (Closes:
+ #256421)
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Sun, 27 Jun 2004 22:36:54 +0200
+
+wmclockmon (0.8.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: I'm a DD.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Thu, 3 Jun 2004 20:24:21 +0200
+
+wmclockmon (0.7.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Tue, 9 Mar 2004 17:28:39 +0100
+
+wmclockmon (0.7.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/control: New xlib packaging, change build-depends.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Mon, 1 Mar 2004 00:23:58 +0100
+
+wmclockmon (0.7.0-1) unstable; urgency=low
+
+ * New upstream release: Now also provides a binary clock (this seems to be
+ a needed feature atm)
+ * debian/watch: Added, upstream releases fast :)
+ * debian/menu: Added quotes to make new lintian happy.
+
+ -- Marc 'HE' Brockschmidt <he at debian.org> Thu, 26 Feb 2004 13:51:24 +0100
+
+wmclockmon (0.6.2-1) unstable; urgency=low
+
+ * Yet another new upstream release.
+
+ -- Marc Brockschmidt <marc at dch-faq.de> Sat, 14 Feb 2004 12:20:44 +0100
+
+wmclockmon (0.6.1-1) unstable; urgency=low
+
+ * New upstream release.
+ * debian/rules: Some small changes to get the nostrip thing working.
+
+ -- Marc Brockschmidt <marc at dch-faq.de> Wed, 11 Feb 2004 20:28:13 +0100
+
+wmclockmon (0.5.2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Marc Brockschmidt <marc at dch-faq.de> Sun, 7 Dec 2003 16:09:49 +0100
+
wmclockmon (0.5.0-1) unstable; urgency=low
* New upstream release:
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 ce3c78c..b32999e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,13 +1,14 @@
Source: wmclockmon
Section: x11
Priority: optional
-Maintainer: Marc Brockschmidt <marc at dch-faq.de>
-Build-Depends: libglib1.2-dev, libgtk1.2-dev, xlibs-dev (>> 4.1.0), debhelper (>= 3.0.0)
-Standards-Version: 3.6.0
+Maintainer: Marc 'HE' Brockschmidt <he at debian.org>
+Build-Depends: libglib1.2-dev, libgtk1.2-dev, libx11-dev | xlibs-dev (>> 4.1.0), libxext-dev | xlibs-dev (>> 4.1.0), libxi-dev | xlibs-dev (>> 4.1.0), libxpm-dev | xlibs-dev (>> 4.1.0), libxt-dev | xlibs-dev (>> 4.1.0), debhelper (>= 4)
+Standards-Version: 3.6.1
Package: wmclockmon
Architecture: any
Depends: ${shlibs:Depends}
-Description: Displays a clock in 12/24h mode with alarm mode and 3 different LCD styles
+Description: Displays a clock in 12/24h mode with alarm mode
wmclockmon displays a clock like wmtime, but with an alarm timer and
- different styles.
+ different styles (14 + user customized ones). There's also a "binary
+ clock" style available.
diff --git a/debian/docs b/debian/docs
index 02c920b..8b13789 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-doc/sample.wmclockmonrc
+
diff --git a/debian/examples b/debian/examples
new file mode 100644
index 0000000..8a9aa81
--- /dev/null
+++ b/debian/examples
@@ -0,0 +1,2 @@
+doc/sample1.wmclockmonrc
+doc/sample2.wmclockmonrc
diff --git a/debian/menu b/debian/menu
index b84979d..650d59c 100644
--- a/debian/menu
+++ b/debian/menu
@@ -1,6 +1,6 @@
?package(wmclockmon):\
- needs=X11\
- section=Apps/Tools\
+ needs="X11"\
+ section="Apps/Tools"\
hints="Clocks"\
title="wmclockmon"\
command="/usr/bin/wmclockmon"
diff --git a/debian/rules b/debian/rules
old mode 100644
new mode 100755
index 7236184..ef5abd9
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,4 @@
#!/usr/bin/make -f
-export DH_COMPAT=3
TMP=$(CURDIR)/debian/wmclockmon
@@ -13,7 +12,7 @@ endif
configure: configure-stamp
configure-stamp:
dh_testdir
- CFLAGS="$(CFLAGS)" ./configure --prefix=$(TMP)/usr --mandir=$(TMP)/usr/share/man
+ CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man
touch configure-stamp
build: configure build-stamp
@@ -26,8 +25,8 @@ clean:
dh_testdir
dh_testroot
rm -f build-stamp install-stamp configure-stamp
- -$(MAKE) clean
- rm -f config.h config.log config.status stamp-h Makefile src/Makefile doc/Makefile wmclockmon-config/Makefile
+ -$(MAKE) maintainer-clean
+ rm -f config.h config.log config.status stamp-h Makefile src/Makefile doc/Makefile wmclockmon-config/Makefile wmclockmon-cal/Makefile
dh_clean
install: install-stamp
@@ -35,7 +34,7 @@ install-stamp: build-stamp
dh_testdir
dh_testroot
dh_clean -k
- $(MAKE) install-strip
+ $(MAKE) install DESTDIR=$(TMP)
touch install-stamp
# Build architecture-independent files here.
@@ -51,7 +50,9 @@ binary-arch: build install
dh_installmenu
dh_installmanpages
dh_installchangelogs ChangeLog
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
+endif
dh_compress
dh_fixperms
dh_installdeb
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..8f1addd
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,3 @@
+version=2
+
+http://tnemeth.free.fr/projets/programmes/wmclockmon-(.*)\.tar\.gz
diff --git a/src/main.c b/src/main.c
index 3102ced..0749d8b 100644
--- a/src/main.c
+++ b/src/main.c
@@ -251,14 +251,12 @@ static void parse_arguments(int argc, char **argv);
static void print_help(char *prog);
static void time_update();
static Bool raise_alarm();
-static Bool fexist(const char *filename);
static Bool filestat(const char *filename, time_t *time, int mode);
static int my_system(char *cmd, char *opt);
void *xmalloc(size_t size);
char *xstrdup(const char *string);
static void alrm_add(Alarm **list, const char *value);
static void free_alrm(Alarm **list);
-static int nb_alrm(Alarm *list);
static Bool alarms_on(Alarm *list);
static void switch_alarms(Alarm *list);
static Bool getbool(char *value);
@@ -271,9 +269,6 @@ static void reload_alarms();
static void show_cal_file(int type);
static void show_cal();
static char *robust_home();
-static void signal_reload();
-
-
int main(int argc, char **argv) {
XEvent event;
@@ -323,7 +318,7 @@ int main(int argc, char **argv) {
}
/* Initialize Application */
- dockapp_open_window(display_name, PACKAGE, SIZE, SIZE, argc, argv);
+ dockapp_open_window(display_name, argv[0], SIZE, SIZE, argc, argv);
dockapp_set_eventmask(ButtonPressMask);
graphics_init();
@@ -1326,17 +1321,6 @@ static Bool raise_alarm() {
return False;
}
-
-static Bool fexist(const char *filename) {
- FILE *file;
-
- if ((file = fopen(filename, "r")) == NULL) return False;
- fclose(file);
-
- return True;
-}
-
-
static Bool filestat(const char *filename, time_t *time, int mode) {
struct stat s;
time_t t = *time;
@@ -1471,17 +1455,6 @@ static void free_alrm(Alarm **list) {
}
-static int nb_alrm(Alarm *list) {
- Alarm *alrm = list;
- int n = 0;
- while (alrm) {
- n++;
- alrm = alrm->next;
- }
- return n;
-}
-
-
static Bool alarms_on(Alarm *list) {
Alarm *alrm = list;
@@ -1551,8 +1524,10 @@ static Bool load_cfgfile() {
i++;
if (line[strlen(line) - 1] == '\n') line[strlen(line) - 1] = 0;
if ((line[0] == '#') || (line[0] == 0)) continue;
- value = strchr (line, '=') + 1;
- while ((value[0] == ' ') && (value[0] != 0)) value++;
+ value = strchr(line, '=');
+ if (! value) continue;
+ value++;
+ while ((value[0] != 0) && (value[0] == ' ')) value++;
if (value[0] == 0) continue;
if (strncmp(line, "Backlight", 9) == 0) {
diff --git a/wmclockmon-cal/mainwindow.c b/wmclockmon-cal/mainwindow.c
index d2db477..ea2c23d 100644
--- a/wmclockmon-cal/mainwindow.c
+++ b/wmclockmon-cal/mainwindow.c
@@ -128,7 +128,7 @@ static void toggle_buttons(int button) {
static void to_button(int button) {
- if (dateb == 0) dateb == button;
+ if (dateb == 0) dateb = button;
if (button != dateb) {
int b = dateb;
dateb = button;
@@ -138,7 +138,7 @@ static void to_button(int button) {
static void set_buttons_text() {
- int year, month, day;
+ unsigned int year, month, day;
char datestr[MAXSTRLEN + 1];
bzero(datestr, MAXSTRLEN + 1);
@@ -167,8 +167,8 @@ static void editor_flush() {
static void editor_fill(int which) {
- char *filename, *dstr;
- GtkWidget *label;
+ char *dstr;
+ GtkWidget *label = NULL;
switch (which) {
case UNIQUE: label = label_u; break;
@@ -232,7 +232,7 @@ static void save_datas() {
if ((stat(dirname, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)) {
FILE *file = fopen(filename, "w");
- int year, month, day;
+ unsigned int year, month, day;
if (file) {
int i;
@@ -253,7 +253,7 @@ static void save_datas() {
static void delete_file() {
char *filename = get_file(daystr);
- int year, month, day;
+ unsigned int year, month, day;
unlink(filename);
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
@@ -293,7 +293,7 @@ static void mark_days() {
char startstr_u[9]; /* unique (full date) */
char startstr_y[9]; /* yearly date */
char startstr_m[9]; /* monthly date */
- int year, month, day;
+ unsigned int year, month, day;
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
month++;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wmaker/wmclockmon.git.git
More information about the Pkg-wmaker-commits
mailing list