head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.1
	OPENPKG_E1_MP:1.1
	OPENPKG_E1_MP_2_STABLE:1.1.2.2
	OPENPKG_E1_FP:1.1.2.2
	OPENPKG_2_STABLE_MP:1.1
	OPENPKG_2_STABLE_20061018:1.1.2.2
	OPENPKG_2_STABLE:1.1.0.2;
locks; strict;
comment	@# @;


1.2
date	2007.11.10.17.21.42;	author rse;	state Exp;
branches;
next	1.1;
commitid	q1NBQHG46wsxj3Fs;

1.1
date	2005.10.14.19.32.04;	author rse;	state Exp;
branches
	1.1.2.1;
next	;

1.1.2.1
date	2005.10.14.19.32.04;	author rse;	state dead;
branches;
next	1.1.2.2;
commitid	iZxwRSmmWscPXUQr;

1.1.2.2
date	2006.10.16.14.49.33;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.2
log
@upgrading package: diogene87 1.0.0rc4 -> 1.0.0rc5
@
text
@Index: narcisse81-0.0.4/src/Makefile
--- narcisse81-0.0.4/src/Makefile.orig	2005-10-12 20:37:57 +0200
+++ narcisse81-0.0.4/src/Makefile	2007-11-10 18:18:42 +0100
@@@@ -1,6 +1,6 @@@@
 CC=gcc
 LDLIBS=`gtk-config --libs`
-CFLAGS=-Wall -Werror -g `gtk-config --cflags`
+CFLAGS=`gtk-config --cflags`
 
 OBJECTS = main.o mainmenu.o global.o icon.o command.o \
 	ref_view.o ref_edit.o ref_dele.o ref_copy.o ref_plan.o \
@@@@ -24,7 +24,7 @@@@
 	user_view.o user_edit.o user_dele.o \
 	monitor.o connection.o about.o graph.o message.o
 
-all: run 
+all: narcisse81 
 
 run: narcisse81
 	./narcisse81 -s
@@@@ -33,7 +33,7 @@@@
 	$(CC) $(CFLAGS) -c $< -o $@@ 
 	
 narcisse81: $(OBJECTS) 
-	$(CC) $(LDLIBS) $(OBJECTS) -o narcisse81
+	$(CC) $(OBJECTS) -o narcisse81 $(LDLIBS)
 
 main.o: main.c global.h icon.h
 mainmenu.o: mainmenu.c global.h icon.h
Index: narcisse81-0.0.4/src/main.c
--- narcisse81-0.0.4/src/main.c.orig	2005-10-11 20:38:40 +0200
+++ narcisse81-0.0.4/src/main.c	2007-11-10 18:18:42 +0100
@@@@ -27,7 +27,7 @@@@
 #include "global.h"
 #include "icon.h"
 
-static GtkWidget *main_window;
+GtkWidget *main_window;
 static GtkWidget *actual_form = NULL;
 static GtkWidget *form_container;
 static GtkWidget *menu_item_edit;
Index: src/dio87d/r_cmdjob.c
--- src/dio87d/r_cmdjob.c.orig	2007-10-19 17:37:41 +0200
+++ src/dio87d/r_cmdjob.c	2007-11-10 18:19:51 +0100
@@@@ -27,6 +27,7 @@@@
 #include <unistd.h>
 #include <string.h>
 #include <assert.h>
+#include <sys/signal.h>
 
 #include <libdg87/daemon.h>
 #include <libdg87/command.h>
@


1.1
log
@add narcisse81, a X11/Gtk GUI for diogene87
@
text
@d1 3
a3 3
Index: src/Makefile
--- src/Makefile.orig	2005-10-12 20:37:57 +0200
+++ src/Makefile	2005-10-14 21:28:04 +0200
d30 3
a32 3
Index: src/main.c
--- src/main.c.orig	2005-10-11 20:38:40 +0200
+++ src/main.c	2005-10-14 21:28:09 +0200
d42 11
@


1.1.2.1
log
@file diogene87.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:33 +0000
@
text
@d1 41
@


1.1.2.2
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@a0 41
Index: src/Makefile
--- src/Makefile.orig	2005-10-12 20:37:57 +0200
+++ src/Makefile	2005-10-14 21:28:04 +0200
@@@@ -1,6 +1,6 @@@@
 CC=gcc
 LDLIBS=`gtk-config --libs`
-CFLAGS=-Wall -Werror -g `gtk-config --cflags`
+CFLAGS=`gtk-config --cflags`
 
 OBJECTS = main.o mainmenu.o global.o icon.o command.o \
 	ref_view.o ref_edit.o ref_dele.o ref_copy.o ref_plan.o \
@@@@ -24,7 +24,7 @@@@
 	user_view.o user_edit.o user_dele.o \
 	monitor.o connection.o about.o graph.o message.o
 
-all: run 
+all: narcisse81 
 
 run: narcisse81
 	./narcisse81 -s
@@@@ -33,7 +33,7 @@@@
 	$(CC) $(CFLAGS) -c $< -o $@@ 
 	
 narcisse81: $(OBJECTS) 
-	$(CC) $(LDLIBS) $(OBJECTS) -o narcisse81
+	$(CC) $(OBJECTS) -o narcisse81 $(LDLIBS)
 
 main.o: main.c global.h icon.h
 mainmenu.o: mainmenu.c global.h icon.h
Index: src/main.c
--- src/main.c.orig	2005-10-11 20:38:40 +0200
+++ src/main.c	2005-10-14 21:28:09 +0200
@@@@ -27,7 +27,7 @@@@
 #include "global.h"
 #include "icon.h"
 
-static GtkWidget *main_window;
+GtkWidget *main_window;
 static GtkWidget *actual_form = NULL;
 static GtkWidget *form_container;
 static GtkWidget *menu_item_edit;
@