[Pkg-wmaker-commits] [wmclockmon.git] 04/31: Imported Debian patch 0.8.1-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 f8311b31ced0d1eb5051074f0c72737857c7e4d6
Merge: 6bda946 c147bc3
Author: Marc 'HE' Brockschmidt <he at debian.org>
Date: Sun Aug 16 13:05:34 2009 +0200
Imported Debian patch 0.8.1-2
.ChangeLog.swp | Bin 20480 -> 0 bytes
ChangeLog | 12 +++++--
configure | 18 +++++------
configure.ac | 6 ++--
debian/changelog | 20 ++++++++++++
debian/compat | 2 +-
debian/control | 4 +--
debian/menu | 2 +-
debian/rules | 20 +++++++++---
src/main.c | 11 +++----
wmclockmon-cal/Makefile.in | 4 +--
wmclockmon-cal/mainwindow.c | 71 ++++++++++++++++++++---------------------
wmclockmon-config/Makefile.in | 4 +--
wmclockmon-config/dialogs.c | 2 --
wmclockmon-config/edit.c | 1 -
wmclockmon-config/mainwindow.c | 25 +++++++--------
16 files changed, 118 insertions(+), 84 deletions(-)
diff --cc configure.ac
index 4412825,06a5760..9accaf3
--- a/configure.ac
+++ b/configure.ac
@@@ -98,7 -98,7 +98,7 @@@ linux*
ignore_buffers=yes
ignore_cached=yes
;;
--freebsd*)
++[k]freebsd*)
OS=freebsd
ignore_wired=yes
ignore_cached=yes
diff --cc debian/changelog
index f6062d3,e40795a..283aed0
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,10 +1,23 @@@
++wmclockmon (0.8.1-2) unstable; urgency=low
++
++ * Port to Gtk+ 2, patch provided by Julien BLACHE <jblache at debian.org> -
++ Thanks! (Closes: #437442, #527784)
++ * Fix configure.ac to correctly handle kfreebsd (not only freebsd), patch
++ provided by Pierre Chifflier <chifflier at cpe.fr>. (Closes: #376735)
++ * Fixed packaging to drag in fresh config.{sub,guess} at every build.
++ (Closes: #355731)
++ * Updated to debhelper 7 and policy 3.8.3.
++ * Squashed several lintian warnings (doing the menu transition on the way)
++
++ -- Marc 'HE' Brockschmidt <he at debian.org> Sun, 16 Aug 2009 13:05:34 +0200
++
+ 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:
diff --cc debian/compat
index b8626c4,b8626c4..7f8f011
--- a/debian/compat
+++ b/debian/compat
@@@ -1,1 -1,1 +1,1 @@@
--4
++7
diff --cc debian/control
index b32999e,b32999e..09995ef
--- a/debian/control
+++ b/debian/control
@@@ -2,8 -2,8 +2,8 @@@ Source: wmclockmo
Section: x11
Priority: optional
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
++Build-Depends: libgtk2.0-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 (>= 7), autotools-dev
++Standards-Version: 3.8.3
Package: wmclockmon
Architecture: any
diff --cc debian/menu
index 650d59c,650d59c..1b7a5d2
--- a/debian/menu
+++ b/debian/menu
@@@ -1,6 -1,6 +1,6 @@@
?package(wmclockmon):\
needs="X11"\
-- section="Apps/Tools"\
++ section="Applications/System/Monitoring"\
hints="Clocks"\
title="wmclockmon"\
command="/usr/bin/wmclockmon"
diff --cc debian/rules
index ef5abd9,ef5abd9..1bea238
--- a/debian/rules
+++ b/debian/rules
@@@ -12,6 -12,6 +12,14 @@@ endi
configure: configure-stamp
configure-stamp:
dh_testdir
++ if [ -r /usr/share/misc/config.sub ]; then\
++ mv $(CURDIR)/config.sub $(CURDIR)/config.sub.backup;\
++ cp /usr/share/misc/config.sub $(CURDIR)/config.sub;\
++ fi
++ if [ -r /usr/share/misc/config.guess ]; then\
++ mv $(CURDIR)/config.guess $(CURDIR)/config.guess.backup;\
++ cp /usr/share/misc/config.guess $(CURDIR)/config.guess;\
++ fi
CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --mandir=/usr/share/man
touch configure-stamp
@@@ -25,7 -25,7 +33,13 @@@ clean
dh_testdir
dh_testroot
rm -f build-stamp install-stamp configure-stamp
-- -$(MAKE) maintainer-clean
++ [ ! -f Makefile ] || $(MAKE) maintainer-clean
++ if [ -r $(CURDIR)/config.sub.backup ]; then\
++ mv $(CURDIR)/config.sub.backup $(CURDIR)/config.sub;\
++ fi
++ if [ -r $(CURDIR)/config.guess.backup ]; then\
++ mv $(CURDIR)/config.guess.backup $(CURDIR)/config.guess;\
++ fi
rm -f config.h config.log config.status stamp-h Makefile src/Makefile doc/Makefile wmclockmon-config/Makefile wmclockmon-cal/Makefile
dh_clean
@@@ -33,7 -33,7 +47,7 @@@ install: install-stam
install-stamp: build-stamp
dh_testdir
dh_testroot
-- dh_clean -k
++ dh_prep
$(MAKE) install DESTDIR=$(TMP)
touch install-stamp
@@@ -50,9 -50,9 +64,7 @@@ binary-arch: build instal
dh_installmenu
dh_installmanpages
dh_installchangelogs ChangeLog
--ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
dh_strip
--endif
dh_compress
dh_fixperms
dh_installdeb
diff --cc wmclockmon-cal/Makefile.in
index 0ca65db,0ca65db..10cbc19
--- a/wmclockmon-cal/Makefile.in
+++ b/wmclockmon-cal/Makefile.in
@@@ -96,14 -96,14 +96,14 @@@ PROGRAMS = $(bin_PROGRAMS
DEFS = @DEFS@ -I. -I$(srcdir) -I..
--LDFLAGS = @LDFLAGS@ `gtk-config --libs`
++LDFLAGS = @LDFLAGS@ `pkg-config gtk+-2.0 --libs`
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
wmclockmon_OBJECTS = main.o mainwindow.o tools.o
wmclockmon_DEPENDENCIES =
wmclockmon_LDFLAGS =
--CFLAGS = @CFLAGS@ `gtk-config --cflags`
++CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --cc wmclockmon-cal/mainwindow.c
index 6a4b4bf,ea2c23d..179f90f
--- a/wmclockmon-cal/mainwindow.c
+++ b/wmclockmon-cal/mainwindow.c
@@@ -51,7 -51,7 +51,6 @@@ static void show_editor()
gtk_widget_hide(calendar);
gtk_widget_hide(closewindow);
gtk_widget_grab_default(GTK_WIDGET(cancel));
-- gtk_widget_draw_default(GTK_WIDGET(cancel));
gtk_widget_grab_focus(GTK_WIDGET(edit));
gtk_widget_show(text_buttons);
gtk_widget_show(edit);
@@@ -69,7 -69,7 +68,6 @@@ static void hide_editor()
gtk_widget_hide(cancel);
gtk_widget_show(calendar);
gtk_widget_grab_default(GTK_WIDGET(closewindow));
-- gtk_widget_draw_default(GTK_WIDGET(closewindow));
gtk_widget_grab_focus(GTK_WIDGET(closewindow));
gtk_widget_show(closewindow);
}
@@@ -93,13 -93,13 +91,20 @@@ static void load_file(const char *dates
FILE *file;
char *filename = get_file(datestr);
++ GtkTextIter iter;
++ GtkTextBuffer *buf;
++
++ buf = GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit)));
++ gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
++ gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
++
if ((file = fopen(filename, "r")) != NULL) {
while (! feof(file)) {
char line[MAXSTRLEN + 1];
bzero(line, MAXSTRLEN + 1);
fgets(line, MAXSTRLEN, file);
if (line[0] != 0)
-- gtk_text_insert(GTK_TEXT(edit), NULL, NULL, NULL, line, -1);
++ gtk_text_buffer_insert(buf, &iter, line, -1);
}
fclose(file);
}
@@@ -154,21 -154,21 +159,14 @@@ static void set_buttons_text()
static void editor_flush() {
-- int cont = TRUE;
--
-- while (cont) {
-- cont = gtk_text_backward_delete(GTK_TEXT(edit), 1);
-- }
-- cont = TRUE;
-- while (cont) {
-- cont = gtk_text_forward_delete(GTK_TEXT(edit), 1);
-- }
++ gtk_text_buffer_set_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), "", 0);
}
static void editor_fill(int which) {
char *dstr;
- GtkWidget *label;
+ GtkWidget *label = NULL;
++ GtkTextIter iter;
switch (which) {
case UNIQUE: label = label_u; break;
@@@ -179,11 -179,11 +177,10 @@@
gtk_label_get(GTK_LABEL(label), &dstr);
strcpy(daystr, dstr);
to_button(which);
-- gtk_text_freeze(GTK_TEXT(edit));
editor_flush();
load_file(daystr);
-- gtk_text_set_point(GTK_TEXT(edit), gtk_text_get_length(GTK_TEXT(edit)));
-- gtk_text_thaw(GTK_TEXT(edit));
++ gtk_text_buffer_get_end_iter(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
++ gtk_text_buffer_place_cursor(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &iter);
}
@@@ -225,23 -225,23 +222,28 @@@ static void save_datas()
char *dirname = xmalloc(len + 2);
struct stat stat_buf;
++ GtkTextIter ts, te;
++ gchar *tbuf;
++ int tlen;
++
++ tlen = gtk_text_buffer_get_char_count(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))));
++ gtk_text_buffer_get_bounds(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &ts, &te);
++
sprintf(dirname, "%s/%s", robust_home(), DEFAULT_CONFIGDIR);
-- if (gtk_text_get_length(GTK_TEXT(edit)) > 0) {
++ if (tlen > 0) {
if (! ((stat(dirname, &stat_buf) == 0) && S_ISDIR(stat_buf.st_mode)))
mkdir(dirname, 0755);
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;
-- for (i = 0 ; i < gtk_text_get_length(GTK_TEXT(edit)) ; i++) {
-- char t = GTK_TEXT_INDEX(GTK_TEXT(edit), i);
-- fprintf(file, "%c", t);
-- }
-- fflush(file);
-- fclose(file);
++ tbuf = gtk_text_buffer_get_text(GTK_TEXT_BUFFER(gtk_text_view_get_buffer(GTK_TEXT_VIEW(edit))), &ts, &te, TRUE);
++ fprintf(file, "%s", tbuf);
++ g_free(tbuf);
++ fflush(file);
++ fclose(file);
}
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
gtk_calendar_mark_day(GTK_CALENDAR(calendar), day);
@@@ -259,9 -259,9 +261,7 @@@ static void delete_file()
gtk_calendar_get_date(GTK_CALENDAR(calendar), &year, &month, &day);
gtk_calendar_unmark_day(GTK_CALENDAR(calendar), day);
FREE(filename);
-- gtk_text_freeze(GTK_TEXT(edit));
editor_flush();
-- gtk_text_thaw(GTK_TEXT(edit));
}
@@@ -357,10 -357,10 +357,10 @@@ void create_mainwindow()
GTK_SIGNAL_FUNC(mark_days), NULL);
gtk_widget_show(calendar);
-- edit = gtk_text_new(NULL, NULL);
-- gtk_text_set_editable(GTK_TEXT(edit), TRUE);
-- gtk_text_set_word_wrap(GTK_TEXT(edit), TRUE);
-- gtk_text_set_line_wrap(GTK_TEXT(edit), TRUE);
++ edit = gtk_text_view_new();
++ gtk_text_view_set_editable(GTK_TEXT_VIEW(edit), TRUE);
++ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(edit), GTK_WRAP_WORD_CHAR);
++
gtk_box_pack_start(GTK_BOX(main_vbox), edit, TRUE, TRUE, 1);
@@@ -413,7 -413,7 +413,6 @@@
gtk_box_pack_start(GTK_BOX(buttons_hbox), closewindow, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(closewindow), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(closewindow));
-- gtk_widget_draw_default(GTK_WIDGET(closewindow));
gtk_widget_show(closewindow);
diff --cc wmclockmon-config/Makefile.in
index 641c551,641c551..99008e5
--- a/wmclockmon-config/Makefile.in
+++ b/wmclockmon-config/Makefile.in
@@@ -96,14 -96,14 +96,14 @@@ PROGRAMS = $(bin_PROGRAMS
DEFS = @DEFS@ -I. -I$(srcdir) -I..
--LDFLAGS = @LDFLAGS@ `gtk-config --libs`
++LDFLAGS = @LDFLAGS@ `pkg-config gtk+-2.0 --libs`
X_CFLAGS = @X_CFLAGS@
X_LIBS = @X_LIBS@
X_PRE_LIBS = @X_PRE_LIBS@
wmclockmon_OBJECTS = actions.o dialogs.o edit.o main.o mainwindow.o tools.o
wmclockmon_DEPENDENCIES =
wmclockmon_LDFLAGS =
--CFLAGS = @CFLAGS@ `gtk-config --cflags`
++CFLAGS = @CFLAGS@ `pkg-config gtk+-2.0 --cflags`
COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
CCLD = $(CC)
LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --cc wmclockmon-config/dialogs.c
index d497ed1,d497ed1..978dbe9
--- a/wmclockmon-config/dialogs.c
+++ b/wmclockmon-config/dialogs.c
@@@ -38,7 -38,7 +38,6 @@@ void ync_dialog(const char *title, cons
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
-- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label("No");
@@@ -96,7 -96,7 +95,6 @@@ void ok_dialog(const char *title, cons
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
-- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
gtk_container_set_border_width(GTK_CONTAINER
diff --cc wmclockmon-config/edit.c
index f9800c1,f9800c1..bfb03a9
--- a/wmclockmon-config/edit.c
+++ b/wmclockmon-config/edit.c
@@@ -76,7 -76,7 +76,6 @@@ void edit_dialog(const char *title
bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
-- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label("Cancel");
diff --cc wmclockmon-config/mainwindow.c
index d1deca7,d1deca7..a62d789
--- a/wmclockmon-config/mainwindow.c
+++ b/wmclockmon-config/mainwindow.c
@@@ -10,9 -10,9 +10,9 @@@
#include "actions.h"
--static GtkWidget *edit;
--static GtkWidget *set;
--static GtkWidget *remove;
++static GtkWidget *b_edit;
++static GtkWidget *b_set;
++static GtkWidget *b_remove;
static gint list_sel_cb (GtkCList *clist,
gint row,
@@@ -20,9 -20,9 +20,9 @@@
GdkEventButton *event,
void *data) {
selected_row = row;
-- gtk_widget_set_sensitive(edit, TRUE);
-- gtk_widget_set_sensitive(set, TRUE);
-- gtk_widget_set_sensitive(remove, TRUE);
++ gtk_widget_set_sensitive(b_edit, TRUE);
++ gtk_widget_set_sensitive(b_set, TRUE);
++ gtk_widget_set_sensitive(b_remove, TRUE);
return TRUE;
}
@@@ -33,9 -33,9 +33,9 @@@ gint list_unsel_cb (GtkCList *clist
GdkEventButton *event,
void *data) {
selected_row = -1;
-- gtk_widget_set_sensitive(edit, FALSE);
-- gtk_widget_set_sensitive(set, FALSE);
-- gtk_widget_set_sensitive(remove, FALSE);
++ gtk_widget_set_sensitive(b_edit, FALSE);
++ gtk_widget_set_sensitive(b_set, FALSE);
++ gtk_widget_set_sensitive(b_remove, FALSE);
return TRUE;
}
@@@ -267,7 -267,7 +267,7 @@@ void create_mainwindow()
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 0, 1, 1, 2);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
-- edit = bouton;
++ b_edit = bouton;
bouton = gtk_button_new_with_label(" Switch On/Off ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@@ -275,7 -275,7 +275,7 @@@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 1, 2);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
-- set = bouton;
++ b_set = bouton;
bouton = gtk_button_new_with_label(" Remove alarm ");
gtk_signal_connect(GTK_OBJECT(bouton), "clicked",
@@@ -283,7 -283,7 +283,7 @@@
gtk_table_attach_defaults(GTK_TABLE(table), bouton, 1, 2, 0, 1);
gtk_widget_set_sensitive(bouton, FALSE);
gtk_widget_show(bouton);
-- remove = bouton;
++ b_remove = bouton;
label = gtk_label_new(" Alarms ");
@@@ -312,7 -312,7 +312,6 @@@
gtk_box_pack_start(GTK_BOX(buttons_hbox), bouton, TRUE, TRUE, 0);
GTK_WIDGET_SET_FLAGS(GTK_WIDGET(bouton), GTK_CAN_DEFAULT);
gtk_widget_grab_default(GTK_WIDGET(bouton));
-- gtk_widget_draw_default(GTK_WIDGET(bouton));
gtk_widget_show(bouton);
bouton = gtk_button_new_with_label(" Cancel ");
--
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