head 1.7; access; symbols OPENPKG_E1_MP_HEAD:1.7 OPENPKG_E1_MP:1.7 OPENPKG_E1_MP_2_STABLE:1.7.2.2 OPENPKG_E1_FP:1.7.2.2 OPENPKG_2_STABLE_MP:1.7 OPENPKG_2_STABLE_20061018:1.7.2.2 OPENPKG_2_STABLE:1.7.0.2 OPENPKG_CW_FP:1.5; locks; strict; comment @# @; 1.7 date 2006.08.27.09.17.29; author rse; state Exp; branches 1.7.2.1; next 1.6; commitid 6xMSbwfpiFsiMsKr; 1.6 date 2005.08.02.17.44.29; author thl; state Exp; branches; next 1.5; 1.5 date 2004.12.26.17.41.02; author rse; state Exp; branches; next 1.4; 1.4 date 2004.10.26.17.38.50; author rse; state Exp; branches; next 1.3; 1.3 date 2004.10.10.07.20.08; author rse; state Exp; branches; next 1.2; 1.2 date 2004.09.09.17.28.52; author ms; state Exp; branches; next 1.1; 1.1 date 2004.08.14.09.42.39; author rse; state Exp; branches; next ; 1.7.2.1 date 2006.08.27.09.17.29; author rse; state dead; branches; next 1.7.2.2; commitid iZxwRSmmWscPXUQr; 1.7.2.2 date 2006.10.16.14.49.38; author rse; state Exp; branches; next ; commitid iZxwRSmmWscPXUQr; desc @@ 1.7 log @upgrading package: doodle 0.6.4 -> 0.6.5 @ text @Index: src/doodle/Makefile.in --- src/doodle/Makefile.in.orig 2006-05-03 02:22:35 +0200 +++ src/doodle/Makefile.in 2006-08-27 11:13:48 +0200 @@@@ -69,8 +69,7 @@@@ am_libhelper1_la_OBJECTS = grow.lo libhelper1_la_OBJECTS = $(am_libhelper1_la_OBJECTS) libhelper2_la_LIBADD = -am_libhelper2_la_OBJECTS = help.lo files.lo index.lo getopt.lo \ - getopt1.lo +am_libhelper2_la_OBJECTS = help.lo files.lo index.lo libhelper2_la_OBJECTS = $(am_libhelper2_la_OBJECTS) @@HAVE_FAM_TRUE@@am__EXEEXT_1 = doodled$(EXEEXT) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) Index: src/doodle/index.c --- src/doodle/index.c.orig 2006-05-03 11:21:21 +0200 +++ src/doodle/index.c 2006-08-27 11:15:01 +0200 @@@@ -35,6 +35,7 @@@@ #include "doodle.h" #include #include +#include #include #define DEBUG_IPC 0 @ 1.7.2.1 log @file doodle.patch was added on branch OPENPKG_2_STABLE on 2006-10-16 14:49:38 +0000 @ text @d1 24 @ 1.7.2.2 log @Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class) @ text @a0 24 Index: src/doodle/Makefile.in --- src/doodle/Makefile.in.orig 2006-05-03 02:22:35 +0200 +++ src/doodle/Makefile.in 2006-08-27 11:13:48 +0200 @@@@ -69,8 +69,7 @@@@ am_libhelper1_la_OBJECTS = grow.lo libhelper1_la_OBJECTS = $(am_libhelper1_la_OBJECTS) libhelper2_la_LIBADD = -am_libhelper2_la_OBJECTS = help.lo files.lo index.lo getopt.lo \ - getopt1.lo +am_libhelper2_la_OBJECTS = help.lo files.lo index.lo libhelper2_la_OBJECTS = $(am_libhelper2_la_OBJECTS) @@HAVE_FAM_TRUE@@am__EXEEXT_1 = doodled$(EXEEXT) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) Index: src/doodle/index.c --- src/doodle/index.c.orig 2006-05-03 11:21:21 +0200 +++ src/doodle/index.c 2006-08-27 11:15:01 +0200 @@@@ -35,6 +35,7 @@@@ #include "doodle.h" #include #include +#include #include #define DEBUG_IPC 0 @ 1.6 log @upgrading package: doodle 0.6.2 -> 0.6.3 @ text @d2 3 a4 3 --- src/doodle/Makefile.in.orig 2004-12-26 13:37:01 +0100 +++ src/doodle/Makefile.in 2004-12-26 18:39:44 +0100 @@@@ -77,8 +77,7 @@@@ d14 11 @ 1.5 log @upgrading package: doodle 0.6.0 -> 0.6.1 @ text @a13 11 Index: src/doodle/tree.c --- src/doodle/tree.c.orig 2004-12-26 13:15:32 +0100 +++ src/doodle/tree.c 2004-12-26 18:40:00 +0100 @@@@ -1806,7 +1806,6 @@@@ /* make certain that the dirty marker is on disk... */ flush_buffer(ret->fd); - fdatasync(ret->fd->fd); ret->modified = 1; } @ 1.4 log @upgrading package: doodle 0.5.0 -> 0.6.0 @ text @d2 3 a4 3 --- src/doodle/Makefile.in.orig 2004-10-23 20:38:22 +0200 +++ src/doodle/Makefile.in 2004-10-26 19:37:12 +0200 @@@@ -67,8 +67,7 @@@@ d14 11 @ 1.3 log @upgrading package: doodle 0.4.0 -> 0.5.0 @ text @d2 11 a12 4 --- src/doodle/Makefile.in.orig 2004-10-05 06:42:09 +0200 +++ src/doodle/Makefile.in 2004-10-10 09:18:47 +0200 @@@@ -65,8 +65,7 @@@@ libdoodle_la_OBJECTS = $(am_libdoodle_la_OBJECTS) a13 23 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -am_doodle_OBJECTS = doodle.$(OBJEXT) getopt1.$(OBJEXT) \ - getopt.$(OBJEXT) +am_doodle_OBJECTS = doodle.$(OBJEXT) doodle_OBJECTS = $(am_doodle_OBJECTS) doodle_DEPENDENCIES = $(top_builddir)/src/doodle/libdoodle.la am_logreplay_OBJECTS = logreplay.$(OBJEXT) Index: src/doodle/tree.c --- src/doodle/tree.c.orig 2004-10-06 00:51:15 +0200 +++ src/doodle/tree.c 2004-10-10 09:17:34 +0200 @@@@ -32,11 +32,11 @@@@ #include "config.h" #include "doodle.h" +#include #include #include #include #include -#include #include #include #include @ 1.2 log @upgrading package: doodle 0.3.0 -> 0.4.0 @ text @d1 13 a13 11 Index: src/doodle/doodle.c --- src/doodle/doodle.c.orig 2004-08-13 16:24:40 +0200 +++ src/doodle/doodle.c 2004-08-14 11:07:14 +0200 @@@@ -31,6 +31,7 @@@@ */ +#include "config.h" #include #include #include d15 3 a17 4 --- src/doodle/tree.c.orig 2004-08-13 17:01:26 +0200 +++ src/doodle/tree.c 2004-08-14 11:06:18 +0200 @@@@ -31,11 +31,11 @@@@ */ d19 1 a29 13 Index: src/doodle/Makefile.in --- src/doodle/Makefile.in.orig 2004-09-09 19:19:46 +0200 +++ src/doodle/Makefile.in 2004-09-09 19:19:52 +0200 @@@@ -63,8 +63,7 @@@@ libdoodle_la_OBJECTS = $(am_libdoodle_la_OBJECTS) binPROGRAMS_INSTALL = $(INSTALL_PROGRAM) PROGRAMS = $(bin_PROGRAMS) -am_doodle_OBJECTS = doodle.$(OBJEXT) getopt1.$(OBJEXT) \ - getopt.$(OBJEXT) +am_doodle_OBJECTS = doodle.$(OBJEXT) doodle_OBJECTS = $(am_doodle_OBJECTS) doodle_DEPENDENCIES = $(top_builddir)/src/doodle/libdoodle.la am_proftree_OBJECTS = proftree.$(OBJEXT) @ 1.1 log @new package: doodle 0.3.0 (Filesystem Searching Tool) @ text @d29 5 a33 4 --- src/doodle/Makefile.in.orig 2004-08-13 17:32:05 +0200 +++ src/doodle/Makefile.in 2004-08-14 11:38:56 +0200 @@@@ -201,7 +201,7 @@@@ check_PROGRAMS = testio$(EXEEXT) testtree$(EXEEXT) d35 3 a37 3 -am_doodle_OBJECTS = doodle.$(OBJEXT) getopt1.$(OBJEXT) getopt.$(OBJEXT) +am_doodle_OBJECTS = doodle.$(OBJEXT) d40 1 a40 1 am_testio_OBJECTS = testio.$(OBJEXT) @