[Pkg-wmaker-commits] [wmclockmon.git] 03/31: Imported Debian patch 0.8.0-2
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 6bda946899b057e81fdfe26c520133313bc50a2f
Author: Marc 'HE' Brockschmidt <he at debian.org>
Date: Sun Jun 27 22:36:54 2004 +0200
Imported Debian patch 0.8.0-2
---
debian/changelog | 55 +++++++++++++++++++++++++++++++++++++++++++++
debian/compat | 1 +
debian/control | 11 ++++-----
debian/docs | 2 +-
debian/examples | 2 ++
debian/menu | 4 ++--
debian/rules | 11 ++++-----
debian/watch | 3 +++
src/main.c | 24 --------------------
wmclockmon-cal/mainwindow.c | 2 +-
10 files changed, 77 insertions(+), 38 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 18eee8b..f6062d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,58 @@
+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..4954d79 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);
@@ -1326,17 +1324,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 +1458,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;
diff --git a/wmclockmon-cal/mainwindow.c b/wmclockmon-cal/mainwindow.c
index d2db477..6a4b4bf 100644
--- a/wmclockmon-cal/mainwindow.c
+++ b/wmclockmon-cal/mainwindow.c
@@ -167,7 +167,7 @@ static void editor_flush() {
static void editor_fill(int which) {
- char *filename, *dstr;
+ char *dstr;
GtkWidget *label;
switch (which) {
--
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