PR: ports/14303

Submitted by:Ade Lovett <ade@lovett.com>
Update to 1.0.53
This is the core module for 'October GNOME'!

1 files changed, 97 insertions, 22 deletions

diff --git a/x11/gnomecore/files/patch-ae b/x11/gnomecore/files/patch-ae
index cac9615b9fac..c672f4c26557 100644
--- a/x11/gnomecore/files/patch-ae
+++ b/x11/gnomecore/files/patch-ae
@@ -1,14 +1,14 @@
---- applets/Makefile.in.orig	Sat Apr 10 01:10:57 1999
-+++ applets/Makefile.in	Thu May  6 07:43:27 1999
-@@ -154,7 +154,7 @@
+--- applets/Makefile.in.orig	Thu Sep 23 03:52:47 1999
++++ applets/Makefile.in	Fri Sep 24 10:59:30 1999
+@@ -153,7 +153,7 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
--always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	 drivemount clockmail fifteen life battery charpick 	 gnome-pager mini-commander gkb jbc another_clock
-+always_built_SUBDIRS = applet-dirs gen_util asclock 	 fish dialer webcontrol 	clockmail fifteen life battery charpick 	 gnome-pager mini-commander gkb jbc another_clock
+-always_built_SUBDIRS = applet-dirs gen_util asclock 	fish dialer webcontrol 	drivemount clockmail fifteen life battery charpick 	gnome-pager mini-commander gkb jbc another_clock 	desk-guide tasklist
++always_built_SUBDIRS = applet-dirs gen_util asclock 	fish dialer webcontrol 	clockmail fifteen life battery charpick 	gnome-pager mini-commander gkb jbc another_clock 	desk-guide tasklist
  
- @FALSE_TRUE@@HAVE_LIBESD_TRUE@esdmanager = esd-manager
- @FALSE_TRUE@@HAVE_LIBESD_FALSE@esdmanager = 
+ @FALSE_TRUE@esdmanager = esd-manager
+ @FALSE_FALSE@esdmanager = 
 --- applets/asclock/Makefile.in.orig	Sat Apr 10 01:11:04 1999
 +++ applets/asclock/Makefile.in	Thu May  6 07:47:12 1999
 @@ -156,7 +156,7 @@
@@ -64,17 +64,28 @@
  
  
  bin_PROGRAMS = clockmail_applet
---- 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 @@
+--- applets/cpumemusage/Makefile.in.orig	Thu Sep 23 03:54:10 1999
++++ applets/cpumemusage/Makefile.in	Fri Sep 24 11:01:36 1999
+@@ -153,7 +153,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)
-+INCLUDES = -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)			-I$(LIBGTOP_INCS)
+-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)
++INCLUDES = -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)			$(LIBGTOP_INCS)
  
  
  bin_PROGRAMS = cpumemusage_applet
+--- applets/desk-guide/Makefile.in.orig	Thu Sep 23 03:54:03 1999
++++ applets/desk-guide/Makefile.in	Fri Sep 24 11:03:26 1999
+@@ -153,7 +153,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)"\"
++INCLUDES = -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)			-DVERSION=\""$(VERSION)"\"
+ 
+ 
+ bin_PROGRAMS = deskguide_applet
 --- 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 @@
@@ -188,18 +199,18 @@
  
  
  bin_PROGRAMS = gnomepager_applet
---- 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 @@
+--- applets/mini-commander/docs/Makefile.in.orig	Sun Oct  3 16:35:27 1999
++++ applets/mini-commander/docs/Makefile.in	Mon Oct  4 13:24:50 1999
+@@ -153,7 +153,7 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
 -docdir = $(datadir)/gnome/help/mini-commander_applet/C
 +docdir = $(datadir)/help/mini-commander_applet/C
+ doc_DATA =  	index.html		topic.dat
  
- # .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 @@
+ 
+@@ -238,7 +238,7 @@
  install: install-am
  uninstall-am: uninstall-docDATA
  uninstall: uninstall-am
@@ -274,6 +285,17 @@
  
  
  bin_PROGRAMS = slash_applet
+--- applets/tasklist/Makefile.in.orig	Thu Sep 23 03:54:05 1999
++++ applets/tasklist/Makefile.in	Fri Sep 24 11:04:32 1999
+@@ -153,7 +153,7 @@
+ cxxflags_set = @cxxflags_set@
+ l = @l@
+ 
+-INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(srcdir)/../desk-guide				-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
++INCLUDES = -I. -I$(srcdir) 					-I$(top_srcdir)/intl -I$(top_builddir)/intl		-I$(srcdir)/../../panel					-I$(srcdir)/../desk-guide				-I$(top_builddir)/panel 	-DGNOMELOCALEDIR=\""$(prefix)/share/locale"\"		-I$(includedir) $(GNOME_INCLUDEDIR)			-DVERSION=\""$(VERSION)"\"
+ 
+ 
+ bin_PROGRAMS = tasklist_applet
 --- 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 @@
@@ -372,9 +394,9 @@
  util_DATA = gnome-terminal.desktop
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../config.h
---- gsm/Makefile.in.orig	Sat Mar 27 00:09:08 1999
-+++ gsm/Makefile.in	Wed Apr  7 19:01:24 1999
-@@ -154,9 +154,9 @@
+--- gsm/Makefile.in.orig	Thu Sep 23 03:51:28 1999
++++ gsm/Makefile.in	Fri Sep 24 11:33:32 1999
+@@ -153,9 +153,9 @@
  cxxflags_set = @cxxflags_set@
  l = @l@
  
@@ -386,6 +408,15 @@
  
  
  LDADD = $(GNOME_LIBDIR) $(GNOMEUI_LIBS) $(INTLLIBS)
+@@ -178,7 +178,7 @@
+ 
+ default_DATA = default.session default.wm
+ 
+-desktopdir = $(datadir)/gnome/apps/Settings
++desktopdir = $(datadir)/apps/Settings
+ desktop_DATA = save-session.desktop session.desktop
+ 
+ EXTRA_DIST =  	default.in			default.wm.in			gnome-wm 			save-session.desktop 		session.desktop
 --- 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 @@
@@ -417,6 +448,17 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
+--- help-browser/help/ca/Makefile.in.orig	Thu Sep 23 03:52:01 1999
++++ help-browser/help/ca/Makefile.in	Fri Sep 24 11:29:22 1999
+@@ -157,7 +157,7 @@
+ 
+ EXTRA_DIST = default-page.html
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ca
++help_browser_helpdir = $(datadir)/help/help-browser/ca
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
 --- 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 @@
@@ -428,6 +470,28 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
+--- help-browser/help/et/Makefile.in.orig	Thu Sep 23 03:52:05 1999
++++ help-browser/help/et/Makefile.in	Fri Sep 24 11:29:43 1999
+@@ -157,7 +157,7 @@
+ 
+ EXTRA_DIST = default-page.html
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/et
++help_browser_helpdir = $(datadir)/help/help-browser/et
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
+--- help-browser/help/eu/Makefile.in.orig	Thu Sep 23 03:52:06 1999
++++ help-browser/help/eu/Makefile.in	Fri Sep 24 11:29:56 1999
+@@ -157,7 +157,7 @@
+ 
+ EXTRA_DIST = default-page.html
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/eu
++help_browser_helpdir = $(datadir)/help/help-browser/eu
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
 --- 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 @@
@@ -461,6 +525,17 @@
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
  CONFIG_HEADER = ../../../config.h
  CONFIG_CLEAN_FILES = 
+--- help-browser/help/ja/Makefile.in.orig	Thu Sep 23 03:52:14 1999
++++ help-browser/help/ja/Makefile.in	Fri Sep 24 11:30:09 1999
+@@ -156,7 +156,7 @@
+ EXTRA_DIST = gnome-help-browser-help.html 	     gnome-help-browser-topic.dat 	     default-page.html sample-help.html sample-topic.dat
+ 
+ 
+-help_browser_helpdir = $(datadir)/gnome/help/help-browser/ja
++help_browser_helpdir = $(datadir)/help/help-browser/ja
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../../config.h
+ CONFIG_CLEAN_FILES = 
 --- help-browser/help/ko/Makefile.in.orig	Tue Mar  2 01:52:46 1999
 +++ help-browser/help/ko/Makefile.in	Sat Mar  6 17:59:42 1999
 @@ -157,7 +157,7 @@
@@ -510,7 +585,7 @@
  
  
 -libpanel_applet_la_LDFLAGS = -version-info 0:0:0 -rpath $(libdir)
-+libpanel_applet_la_LDFLAGS = -version-info 1:0:0
++libpanel_applet_la_LDFLAGS = -version-info 2:0:0
  libpanel_applet_la_LIBADD = $(ORB_LIBS) -lm $(DL_LIB)
  
  BUILT_SOURCES = $(CORBA_SRCLIST)