diff options
| author | Jacques Vidrine <nectar@FreeBSD.org> | 1999-03-09 01:13:40 +0000 |
|---|---|---|
| committer | Jacques Vidrine <nectar@FreeBSD.org> | 1999-03-09 01:13:40 +0000 |
| commit | f4442a7aa7d134c8de8574845b26edddcac65935 (patch) | |
| tree | 0f55c576fb88ce09083373c32ab8312529d29dc5 /x11/gnomecore/files/patch-ae | |
| parent | Upgrade to strobe 1.05 (diff) | |
Upgrade to GNOME 1.0. The following are the details:
ports/audio/esound 0.2.7 -> 0.2.8 PR ports/10422
ports/audio/gnomeaudio 0.99.8 -> 1.0.0 PR ports/10426
ports/audio/libaudiofile 0.1.5 -> 0.1.6 PR ports/10421
ports/deskutils/gnomepim 0.99.8.1 -> 1.0.1 PR ports/10435
ports/devel/ORBit 0.3.98 -> 0.4.0 PR ports/10423
ports/devel/gettext shared libs now PR ports/10293
ports/devel/glib12 1.1.16 -> 1.2.0 PR ports/10419
ports/devel/libgtop 0.99.8 -> 1.0.1 PR ports/10430
ports/games/gnomegames 0.99.8 -> 1.0.1 PR ports/10436
ports/graphics/electriceyes distfile moved PR ports/10437
ports/graphics/imlib 1.9.3 -> 1.9.4 PR ports/10424
ports/lang/gnomeobjc 0.99.3 -> 1.0.1 PR ports/10441
ports/math/gnumeric 0.6 -> 0.15 PR ports/10439
ports/misc/gnomeutils 0.99.5 -> 1.0.1 PR ports/10442
ports/sysutils/gnomeadmin 0.99.1 -> 1.0.1 PR ports/10445
ports/sysutils/gnomecontrolcenter 0.99.3.1 -> 1.0.1 PR ports/10446
ports/sysutils/gtop 0.99.2 -> 1.0.1 PR ports/10477
ports/textproc/libxml 0.99.8 -> 1.0.0 PR ports/10438
ports/www/libghttp distfile moved PR ports/10429
ports/x11/gnome 0.99.3 -> 1.0.0 PR ports/10450
ports/x11/gnomecore 0.99.8.1 -> 1.0.1 PR ports/10432
ports/x11/gnomelibs 0.99.8.1 -> 1.0.1 PR ports/10425
ports/x11-fm/gnomemc 4.5.10 -> 4.5.23 PR ports/10448
ports/x11-toolkits/gtk-engines 0.1 -> 0.5 PR ports/10427
ports/x11-toolkits/gtk12 1.1.6 -> 1.2.0 PR ports/10420
Note that repository copies were made before this commit, as follows:
ports/devel/glib11-devel -> ports/devel/glib12
ports/x11-toolkits/gtk11-devel -> ports/x11-toolkits/gtk12
Submitted by: Jeremy Lea <reg@shale.csir.co.za>
Notes
Notes:
svn path=/head/; revision=17091
Diffstat (limited to 'x11/gnomecore/files/patch-ae')
| -rw-r--r-- | x11/gnomecore/files/patch-ae | 500 |
1 files changed, 268 insertions, 232 deletions
diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae index 320b3643a70b..464ef2979f01 100644 --- a/x11/gnomecore/files/patch-ae +++ b/x11/gnomecore/files/patch-ae @@ -1,7 +1,18 @@ ---- applets/asclock/Makefile.in.orig Mon Feb 1 07:46:49 1999 -+++ applets/asclock/Makefile.in Tue Feb 2 05:58:39 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/Makefile.in.orig Tue Mar 2 01:53:28 1999 ++++ applets/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc ++always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb jbc + + @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager + @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = +--- applets/asclock/Makefile.in.orig Tue Mar 2 01:53:34 1999 ++++ applets/asclock/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -9,10 +20,10 @@ bin_PROGRAMS = asclock_applet ---- applets/battery/Makefile.in.orig Mon Feb 1 07:47:01 1999 -+++ applets/battery/Makefile.in Tue Feb 2 05:58:56 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/battery/Makefile.in.orig Tue Mar 2 01:54:01 1999 ++++ applets/battery/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -20,10 +31,10 @@ bin_PROGRAMS = battery_applet ---- applets/cdplayer/Makefile.in.orig Mon Feb 1 07:47:23 1999 -+++ applets/cdplayer/Makefile.in Tue Feb 2 05:59:18 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/cdplayer/Makefile.in.orig Tue Mar 2 01:54:53 1999 ++++ applets/cdplayer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -31,10 +42,10 @@ bin_PROGRAMS = cdplayer_applet ---- applets/charpick/Makefile.in.orig Mon Feb 1 07:47:03 1999 -+++ applets/charpick/Makefile.in Tue Feb 2 05:59:36 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/charpick/Makefile.in.orig Tue Mar 2 01:54:05 1999 ++++ applets/charpick/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -42,10 +53,10 @@ bin_PROGRAMS = charpick_applet ---- applets/clockmail/Makefile.in.orig Mon Feb 1 07:46:58 1999 -+++ applets/clockmail/Makefile.in Tue Feb 2 05:59:54 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/clockmail/Makefile.in.orig Tue Mar 2 01:53:53 1999 ++++ applets/clockmail/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -53,10 +64,10 @@ bin_PROGRAMS = clockmail_applet ---- applets/cpumemusage/Makefile.in.orig Mon Feb 1 07:47:14 1999 -+++ applets/cpumemusage/Makefile.in Tue Feb 2 06:00:13 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/cpumemusage/Makefile.in.orig Tue Mar 2 01:54:37 1999 ++++ applets/cpumemusage/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -I$(LIBGTOP_INCS) @@ -64,10 +75,10 @@ bin_PROGRAMS = cpumemusage_applet ---- applets/dialer/Makefile.in.orig Mon Feb 1 07:46:52 1999 -+++ applets/dialer/Makefile.in Tue Feb 2 06:00:34 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/dialer/Makefile.in.orig Tue Mar 2 01:53:41 1999 ++++ applets/dialer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -75,10 +86,10 @@ bin_PROGRAMS = dialer_applet ---- applets/diskusage/Makefile.in.orig Mon Feb 1 07:47:15 1999 -+++ applets/diskusage/Makefile.in Tue Feb 2 06:00:51 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/diskusage/Makefile.in.orig Tue Mar 2 01:54:40 1999 ++++ applets/diskusage/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -86,10 +97,10 @@ bin_PROGRAMS = diskusage_applet ---- applets/drivemount/Makefile.in.orig Mon Feb 1 07:46:56 1999 -+++ applets/drivemount/Makefile.in Tue Feb 2 06:01:10 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/drivemount/Makefile.in.orig Tue Mar 2 01:53:49 1999 ++++ applets/drivemount/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -97,10 +108,10 @@ bin_PROGRAMS = drivemount_applet ---- applets/esd-manager/Makefile.in.orig Mon Feb 1 07:47:12 1999 -+++ applets/esd-manager/Makefile.in Tue Feb 2 06:01:26 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/esd-manager/Makefile.in.orig Tue Mar 2 01:54:35 1999 ++++ applets/esd-manager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(shell esd-config --cflags) @@ -108,10 +119,10 @@ bin_PROGRAMS = esdmanager_applet ---- applets/fifteen/Makefile.in.orig Mon Feb 1 07:46:59 1999 -+++ applets/fifteen/Makefile.in Tue Feb 2 06:01:43 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/fifteen/Makefile.in.orig Tue Mar 2 01:53:57 1999 ++++ applets/fifteen/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -119,10 +130,10 @@ bin_PROGRAMS = fifteen_applet ---- applets/fish/Makefile.in.orig Mon Feb 1 07:46:51 1999 -+++ applets/fish/Makefile.in Tue Feb 2 06:01:58 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/fish/Makefile.in.orig Tue Mar 2 01:53:38 1999 ++++ applets/fish/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -130,21 +141,24 @@ #if DO_EXE ---- applets/fvwm-pager/Makefile.in.orig Mon Feb 1 07:47:32 1999 -+++ applets/fvwm-pager/Makefile.in Tue Feb 2 06:02:15 1999 -@@ -151,7 +151,7 @@ +--- applets/fvwm-pager/Makefile.in.orig Tue Mar 2 01:55:08 1999 ++++ applets/fvwm-pager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -153,9 +153,9 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ - Utilitiesdir = $(datadir)/apps/Utilities +-Utilitiesdir = $(datadir)/gnome/apps/Utilities ++Utilitiesdir = $(datadir)/apps/Utilities -INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) +INCLUDES = -Dsafemalloc=g_malloc -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(prefix)/share/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) bin_PROGRAMS = fvwm-pager ---- applets/gen_util/Makefile.in.orig Mon Feb 1 07:46:46 1999 -+++ applets/gen_util/Makefile.in Tue Feb 2 06:07:49 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/gen_util/Makefile.in.orig Tue Mar 2 01:53:32 1999 ++++ applets/gen_util/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -152,9 +166,9 @@ bin_PROGRAMS = gen_util_applet ---- applets/gkb/Makefile.in.orig Fri Feb 19 03:47:32 1999 -+++ applets/gkb/Makefile.in Fri Feb 19 03:47:52 1999 -@@ -152,7 +152,7 @@ +--- applets/gkb/Makefile.in.orig Tue Mar 2 01:54:21 1999 ++++ applets/gkb/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ cxxflags_set = @cxxflags_set@ l = @l@ @@ -163,10 +177,10 @@ #if DO_EXE ---- applets/gnome-pager/Makefile.in.orig Mon Feb 1 07:47:04 1999 -+++ applets/gnome-pager/Makefile.in Tue Feb 2 06:02:53 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/gnome-pager/Makefile.in.orig Tue Mar 2 01:54:08 1999 ++++ applets/gnome-pager/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -174,10 +188,30 @@ bin_PROGRAMS = gnomepager_applet ---- applets/mini-commander/src/Makefile.in.orig Tue Feb 2 06:03:17 1999 -+++ applets/mini-commander/src/Makefile.in Tue Feb 2 06:03:29 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/mini-commander/docs/Makefile.in.orig Tue Mar 2 01:54:17 1999 ++++ applets/mini-commander/docs/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-docdir = $(datadir)/gnome/help/mini-commander_applet/C ++docdir = $(datadir)/help/mini-commander_applet/C + + # .html files which are generated by db2html; precompiled .html files + # are included, so people without db2html (the DocBook to HTML converter) +@@ -247,7 +247,7 @@ + install: install-am + uninstall-am: uninstall-docDATA + uninstall: uninstall-am +-all-am: Makefile $(DATA) ++all-am: Makefile + all-redirect: all-am + install-strip: + $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install +--- applets/mini-commander/src/Makefile.in.orig Tue Mar 2 01:54:14 1999 ++++ applets/mini-commander/src/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(top_srcdir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -185,10 +219,10 @@ bin_PROGRAMS = mini_commander_applet ---- applets/mixer/Makefile.in.orig Tue Feb 2 06:03:35 1999 -+++ applets/mixer/Makefile.in Tue Feb 2 06:03:45 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/mixer/Makefile.in.orig Tue Mar 2 01:54:57 1999 ++++ applets/mixer/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -196,10 +230,10 @@ bin_PROGRAMS = mixer_applet ---- applets/modemlights/Makefile.in.orig Tue Feb 2 06:03:50 1999 -+++ applets/modemlights/Makefile.in Tue Feb 2 06:04:01 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/modemlights/Makefile.in.orig Tue Mar 2 01:55:01 1999 ++++ applets/modemlights/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) -DVERSION=\""$(VERSION)"\" @@ -207,10 +241,10 @@ bin_PROGRAMS = modemlights_applet ---- applets/multiload/Makefile.in.orig Tue Feb 2 06:04:06 1999 -+++ applets/multiload/Makefile.in Tue Feb 2 06:04:18 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/multiload/Makefile.in.orig Tue Mar 2 01:54:44 1999 ++++ applets/multiload/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_builddir)/panel -I$(srcdir)/../../panel -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -218,10 +252,10 @@ bin_PROGRAMS = multiload_applet ---- applets/netload/Makefile.in.orig Tue Feb 2 06:04:23 1999 -+++ applets/netload/Makefile.in Tue Feb 2 06:04:33 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/netload/Makefile.in.orig Tue Mar 2 01:54:46 1999 ++++ applets/netload/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) $(LIBGTOP_INCS) @@ -229,10 +263,10 @@ bin_PROGRAMS = netload_applet ---- applets/slashapp/Makefile.in.orig Tue Feb 2 06:04:37 1999 -+++ applets/slashapp/Makefile.in Tue Feb 2 06:04:51 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/slashapp/Makefile.in.orig Tue Mar 2 01:54:49 1999 ++++ applets/slashapp/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(srcdir)/../../panel -I$(top_builddir)/panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -240,10 +274,10 @@ bin_PROGRAMS = slash_applet ---- applets/webcontrol/Makefile.in.orig Tue Feb 2 06:04:56 1999 -+++ applets/webcontrol/Makefile.in Tue Feb 2 06:05:06 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/webcontrol/Makefile.in.orig Tue Mar 2 01:53:45 1999 ++++ applets/webcontrol/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -251,10 +285,10 @@ bin_PROGRAMS = webcontrol_applet ---- applets/winlist/Makefile.in.orig Tue Feb 2 06:05:11 1999 -+++ applets/winlist/Makefile.in Tue Feb 2 06:05:23 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- applets/winlist/Makefile.in.orig Tue Mar 2 01:55:05 1999 ++++ applets/winlist/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I. -I$(srcdir) -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(top_builddir)/panel -I$(srcdir)/../../panel -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(includedir) $(GNOME_INCLUDEDIR) @@ -262,10 +296,32 @@ bin_PROGRAMS = winlist_applet ---- gmenu/Makefile.in.orig Tue Feb 2 06:11:35 1999 -+++ gmenu/Makefile.in Tue Feb 2 06:11:47 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- core-docs/Makefile.in.orig Tue Mar 2 01:52:59 1999 ++++ core-docs/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -162,7 +162,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C ++gnome_intro_helpdir = $(datadir)/help/gnome-intro/C + + GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css + +--- desktop-links/Makefile.in.orig Tue Mar 2 01:52:28 1999 ++++ desktop-links/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-appsdir = $(datadir)/gnome/apps ++appsdir = $(datadir)/apps + + Rootdir = $(appsdir) + Applicationsdir = $(appsdir)/Applications +--- gmenu/Makefile.in.orig Tue Mar 2 01:53:06 1999 ++++ gmenu/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -DGNOMELOCALEDIR=\""$(datadir)/locale"\" -I$(top_srcdir)/intl -I$(top_builddir)/intl -I$(includedir) $(GNOME_INCLUDEDIR) @@ -273,21 +329,53 @@ bin_PROGRAMS = gmenu ---- gnome-terminal/Makefile.in.orig Tue Feb 2 06:12:12 1999 -+++ gnome-terminal/Makefile.in Tue Feb 2 06:12:21 1999 -@@ -153,7 +153,7 @@ +@@ -167,7 +167,7 @@ + + EXTRA_DIST = gmenu.desktop top.xpm folder.xpm unknown.xpm - SUBDIRS = C +-sysdir = $(datadir)/gnome/apps/Settings ++sysdir = $(datadir)/apps/Settings + sys_DATA = gmenu.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gnome-terminal/C/Makefile.in.orig Tue Mar 2 01:52:56 1999 ++++ gnome-terminal/C/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C ++gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C + + gnome_terminal_help_DATA = index.html topic.dat + +--- gnome-terminal/Makefile.in.orig Tue Mar 2 01:52:55 1999 ++++ gnome-terminal/Makefile.in Sat Mar 6 18:05:08 1999 +@@ -155,9 +155,9 @@ + cxxflags_set = @cxxflags_set@ + l = @l@ + +-SUBDIRS = C ++# SUBDIRS = C -INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" +INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" - LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) -lzvt $(INTLLIBS) ---- gsm/Makefile.in.orig Tue Feb 2 06:12:36 1999 -+++ gsm/Makefile.in Tue Feb 2 06:12:47 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ + LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(ZVT_LIBS) $(INTLLIBS) +@@ -174,7 +174,7 @@ + + CFLAGS = @CFLAGS@ -Wall + +-utildir = $(datadir)/gnome/apps/Utilities ++utildir = $(datadir)/apps/Utilities + util_DATA = gnome-terminal.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- gsm/Makefile.in.orig Tue Mar 2 01:52:17 1999 ++++ gsm/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -I$(top_srcdir)/intl -I$(top_builddir)/intl -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DDEFAULTDIR="\"$(datadir)\"" @@ -295,9 +383,29 @@ LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- help-browser/help/C/Makefile.in.orig Tue Feb 2 06:13:57 1999 -+++ help-browser/help/C/Makefile.in Tue Feb 2 06:14:14 1999 -@@ -153,7 +153,7 @@ +--- help-browser/Makefile.in.orig Tue Mar 2 01:52:32 1999 ++++ help-browser/Makefile.in Sat Mar 6 17:59:43 1999 +@@ -156,7 +156,7 @@ + + SUBDIRS = help gnome-man2html gnome-info2html + +-INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" ++INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" + + + LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) +@@ -197,7 +197,7 @@ + gnorbadir = $(sysconfdir)/CORBA/servers + gnorba_DATA = help-browser.gnorba + +-sysdir = $(datadir)/gnome/apps ++sysdir = $(datadir)/apps + sys_DATA = gnome-help.desktop + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../config.h +--- help-browser/help/C/Makefile.in.orig Tue Mar 2 01:52:38 1999 ++++ help-browser/help/C/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat @@ -306,9 +414,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- help-browser/help/es/Makefile.in.orig Tue Feb 2 06:14:18 1999 -+++ help-browser/help/es/Makefile.in Tue Feb 2 06:14:27 1999 -@@ -153,7 +153,7 @@ +--- help-browser/help/es/Makefile.in.orig Tue Mar 2 01:52:41 1999 ++++ help-browser/help/es/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html @@ -317,9 +425,9 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- help-browser/help/fr/Makefile.in.orig Tue Feb 2 06:14:31 1999 -+++ help-browser/help/fr/Makefile.in Tue Feb 2 06:14:40 1999 -@@ -153,7 +153,7 @@ +--- help-browser/help/fr/Makefile.in.orig Tue Mar 2 01:52:43 1999 ++++ help-browser/help/fr/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html @@ -328,9 +436,42 @@ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../../config.h CONFIG_CLEAN_FILES = ---- panel/Makefile.in.orig Tue Feb 2 06:15:25 1999 -+++ panel/Makefile.in Tue Feb 2 06:15:58 1999 -@@ -156,7 +156,7 @@ +--- help-browser/help/hu/Makefile.in.orig Tue Mar 2 01:52:44 1999 ++++ help-browser/help/hu/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html gnome-logo-large.png sample-help.html sample-topic.dat + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/hu ++help_browser_helpdir = $(datadir)/help/help-browser/hu + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/it/Makefile.in.orig Tue Mar 2 01:52:46 1999 ++++ help-browser/help/it/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/it ++help_browser_helpdir = $(datadir)/help/help-browser/it + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- help-browser/help/no/Makefile.in.orig Tue Mar 2 01:52:47 1999 ++++ help-browser/help/no/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -157,7 +157,7 @@ + EXTRA_DIST = gnome-help-browser-help.html gnome-help-browser-topic.dat default-page.html + + +-help_browser_helpdir = $(datadir)/gnome/help/help-browser/no ++help_browser_helpdir = $(datadir)/help/help-browser/no + mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs + CONFIG_HEADER = ../../../config.h + CONFIG_CLEAN_FILES = +--- panel/Makefile.in.orig Tue Mar 2 01:53:16 1999 ++++ panel/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -160,7 +160,7 @@ AUTOMAKE_OPTIONS = 1.3 @@ -339,7 +480,7 @@ bin_PROGRAMS = panel -@@ -176,7 +176,7 @@ +@@ -180,7 +180,7 @@ libpanel_appletinclude_HEADERS = applet-widget.h gnome-panel.h panel-types.h @@ -348,19 +489,19 @@ libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB) BUILT_SOURCES = $(CORBA_SRCLIST) -@@ -198,7 +198,7 @@ +@@ -202,7 +202,7 @@ EXTRA_DIST = panelrc.in panel.in appletsConf.sh.in panel.gnorba panel.soundlist -confexecdir = $(libdir) -+confexecdir = $(datadir) ++confexecdir = $(sysconfdir) confexec_DATA = appletsConf.sh panelgnorbadir = $(sysconfdir)/CORBA/servers ---- smproxy/Makefile.in.orig Tue Feb 2 06:16:19 1999 -+++ smproxy/Makefile.in Tue Feb 2 06:16:30 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ +--- smproxy/Makefile.in.orig Tue Mar 2 01:52:21 1999 ++++ smproxy/Makefile.in Sat Mar 6 17:59:42 1999 +@@ -154,7 +154,7 @@ + cxxflags_set = @cxxflags_set@ l = @l@ -INCLUDES = -I$(includedir) $(GNOME_INCLUDEDIR) -DGNOMELOCALEDIR=\""$(datadir)/locale\"" @@ -368,108 +509,3 @@ LDADD = -lXt -lXmu $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS) ---- core-docs/Makefile.in.orig Tue Feb 2 06:16:47 1999 -+++ core-docs/Makefile.in Tue Feb 2 06:16:58 1999 -@@ -158,7 +158,7 @@ - YACC = @YACC@ - l = @l@ - --gnome_intro_helpdir = $(datadir)/gnome/help/gnome-intro/C -+gnome_intro_helpdir = $(datadir)/help/gnome-intro/C - - GNOME_INTRO_HTML_FILES = gnome-intro/c93191.html gnome-intro/f13.html gnome-intro/a-sample-session.html gnome-intro/c93230.html gnome-intro/f1346.html gnome-intro/a-sample-session75.html gnome-intro/c93302.html gnome-intro/gnome-intro.html gnome-intro/c93.html gnome-intro/c93372.html gnome-intro/c93127.html gnome-intro/c93412.html gnome-intro/c93175.html gnome-intro/docbook.css - ---- po/Makefile.in.in.orig Tue Feb 2 06:17:12 1999 -+++ po/Makefile.in.in Tue Feb 2 06:17:23 1999 -@@ -18,7 +18,7 @@ - - prefix = @prefix@ - exec_prefix = @exec_prefix@ --datadir = $(prefix)/@DATADIRNAME@ -+datadir = $(prefix)/share - localedir = $(datadir)/locale - gnulocaledir = $(prefix)/share/locale - gettextsrcdir = $(prefix)/share/gettext/po ---- applets/mini-commander/docs/Makefile.in.orig Tue Feb 2 06:17:44 1999 -+++ applets/mini-commander/docs/Makefile.in Tue Feb 2 06:18:12 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ - l = @l@ - --docdir = $(datadir)/gnome/help/mini-commander_applet/C -+docdir = $(datadir)/help/mini-commander_applet/C - - # .html files which are generated by db2html; precompiled .html files - # are included, so people without db2html (the DocBook to HTML converter) -@@ -243,7 +243,7 @@ - install: install-am - uninstall-am: uninstall-docDATA - uninstall: uninstall-am --all-am: Makefile $(DATA) -+all-am: Makefile - all-redirect: all-am - install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install ---- help-browser/Makefile.in.orig Tue Feb 2 06:13:07 1999 -+++ help-browser/Makefile.in Tue Feb 2 06:19:22 1999 -@@ -152,7 +152,7 @@ - - SUBDIRS = help gnome-man2html gnome-info2html - --INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/gnome/help\"" -DGNOMELOCALEDIR=\""$(datadir)/locale\"" -DVERSION=\""$(VERSION)"\" -+INCLUDES = -I$(includedir) -I$(top_srcdir)/intl -I$(top_builddir)/intl $(GNOME_INCLUDEDIR) -DGNOMEHELPPATH=\""$(datadir)/help\"" -DGNOMELOCALEDIR=\""$(prefix)/share/locale\"" -DVERSION=\""$(VERSION)"\" - - - LDADD = -lgnorba $(GNOMEUI_LIBS) $(GNOME_LIBDIR) $(ORBIT_LIBS) $(INTLLIBS) ---- gnome-terminal/C/Makefile.in.orig Tue Feb 2 07:21:51 1999 -+++ gnome-terminal/C/Makefile.in Tue Feb 2 07:22:07 1999 -@@ -150,7 +150,7 @@ - YACC = @YACC@ - l = @l@ - --gnome_terminal_helpdir = $(datadir)/gnome/help/gnome-terminal/C -+gnome_terminal_helpdir = $(datadir)/help/gnome-terminal/C - - gnome_terminal_help_DATA = index.html topic.dat - ---- applets/cpumemusage/proc.c.orig Fri Feb 19 04:07:15 1999 -+++ applets/cpumemusage/proc.c Fri Feb 19 04:07:29 1999 -@@ -1,3 +1,4 @@ -+#include <sys/types.h> - #include <glibtop.h> - #include <glibtop/cpu.h> - #include <glibtop/mem.h> ---- applets/diskusage/diskusage_read.c.orig Fri Feb 19 04:09:00 1999 -+++ applets/diskusage/diskusage_read.c Fri Feb 19 04:09:13 1999 -@@ -1,3 +1,4 @@ -+#include <sys/types.h> - #include <glibtop.h> - #include <glibtop/fsusage.h> - #include <glibtop/mountlist.h> ---- applets/Makefile.in.orig Fri Feb 19 04:43:52 1999 -+++ applets/Makefile.in Fri Feb 19 04:44:40 1999 -@@ -152,13 +152,13 @@ - cxxflags_set = @cxxflags_set@ - l = @l@ - --always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol drivemount clockmail fifteen battery charpick gnome-pager mini-commander gkb -+always_built_SUBDIRS = applet-dirs gen_util asclock fish dialer webcontrol clockmail fifteen battery charpick gnome-pager mini-commander gkb - - @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager - @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = - - @FALSE_TRUE@@HAVE_FVWM_TRUE@fvwm = fvwm-pager --@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload netload -+@HAVE_LIBGTOP_TRUE@libgtop_SUBDIRS = cpumemusage diskusage multiload - @HAVE_LIBGTOP_FALSE@libgtop_SUBDIRS = - - @HAVE_LIBGHTTP_TRUE@slashapp = slashapp -@@ -174,7 +174,7 @@ - SUBDIRS = $(always_built_SUBDIRS) $(libgtop_SUBDIRS) $(cdplayer) $(mixer) $(modemlights) $(winlist) $(slashapp) $(esdmanager) $(fvwm) - - --DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload netload slashapp cdplayer mixer modemlights winlist fvwm-pager -+DIST_SUBDIRS = $(always_built_SUBDIRS) esd-manager cpumemusage diskusage multiload slashapp cdplayer mixer modemlights winlist fvwm-pager - - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = ../config.h |