+++ /dev/null
-diff -Nur control-center-1.99.8/Makefile.am control-center-1.99.8.new/Makefile.am
---- control-center-1.99.8/Makefile.am Thu Apr 11 04:06:40 2002
-+++ control-center-1.99.8.new/Makefile.am Tue Apr 30 03:23:48 2002
-@@ -1,4 +1,4 @@
--SUBDIRS = help po libsounds libbackground gnome-settings-daemon capplets control-center idl schemas
-+SUBDIRS = po libsounds libbackground gnome-settings-daemon capplets control-center idl schemas
-
- #I removed the root-manager for now
- #
-diff -Nur control-center-1.99.8/configure.in control-center-1.99.8.new/configure.in
---- control-center-1.99.8/configure.in Mon Apr 29 21:45:06 2002
-+++ control-center-1.99.8.new/configure.in Tue Apr 30 03:23:38 2002
-@@ -210,6 +210,4 @@
- capplets/accessibility/keyboard/Makefile
- capplets/network/Makefile
- schemas/Makefile
--help/Makefile
--help/C/Makefile
- libsounds/Makefile])
-diff -Nur control-center-1.99.8/schemas/Makefile.am control-center-1.99.8.new/schemas/Makefile.am
---- control-center-1.99.8/schemas/Makefile.am Tue Mar 26 18:22:22 2002
-+++ control-center-1.99.8.new/schemas/Makefile.am Tue Apr 30 03:15:49 2002
-@@ -5,7 +5,4 @@
-
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
-
--install-data-local: $(schema_installed_data)
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data)
--
- EXTRA_DIST=$(schema_DATA)
+++ /dev/null
---- control-center-1.4.0.4/configure.in.orig Sun Feb 10 22:07:34 2002
-+++ control-center-1.4.0.4/configure.in Tue Feb 12 04:20:15 2002
-@@ -40,9 +40,6 @@
- CFLAGS=$CFLAGS_save
- LIBS=$LIBS_save
-
--dnl utility conditional
--AM_CONDITIONAL(FALSE, test "x" = "y")
--
- ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hr hu it ja ko lt nl nn no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN zh_TW"
- AM_GNOME_GETTEXT
-
+++ /dev/null
-diff -urN control-center-1.4.0.1.org/capplets/background-properties/Makefile.am control-center-1.4.0.1/capplets/background-properties/Makefile.am
---- control-center-1.4.0.1.org/capplets/background-properties/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/background-properties/Makefile.am Sun Apr 1 18:52:37 2001
-@@ -28,4 +28,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
-+ $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
-diff -urN control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am control-center-1.4.0.1/capplets/desktop-links/Makefile.am
---- control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/desktop-links/Makefile.am Sun Apr 1 18:52:37 2001
-@@ -6,7 +6,7 @@
- Sessiondir = $(ccenterdir)/Session
- Documentsdir = $(ccenterdir)/Documents
-
--paneldir = $(datadir)/gnome/apps/Settings
-+paneldir = $(datadir)/applnk/Settings/GNOME
- Multimediadirp = $(paneldir)/Multimedia
- Desktopdirp = $(paneldir)/Desktop
- UIOptionsdirp = $(paneldir)/UIOptions
-diff -urN control-center-1.4.0.1.org/capplets/file-types/Makefile.am control-center-1.4.0.1/capplets/file-types/Makefile.am
---- control-center-1.4.0.1.org/capplets/file-types/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/file-types/Makefile.am Sun Apr 1 18:54:13 2001
-@@ -42,7 +42,7 @@
- sys_in_files = file-types-capplet.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
--settingsdir = $(datadir)/gnome/apps/Settings
-+settingsdir = $(datadir)/applnk/Settings
- settings_DATA = $(sys_DATA)
-
- @XML_I18N_MERGE_DESKTOP_RULE@
---- control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:52:37 2001
-@@ -22,4 +22,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-+ $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
-diff -urN control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am control-center-1.4.0.1/capplets/mouse-properties/Makefile.am
---- control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/mouse-properties/Makefile.am Sun Apr 1 18:52:39 2001
-@@ -23,4 +23,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-+ $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
---- control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/sound-properties/Makefile.am Sun Apr 1 18:52:39 2001
-@@ -24,4 +24,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
-+ $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
-diff -urN control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am control-center-1.4.0.1/capplets/theme-switcher/Makefile.am
---- control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/theme-switcher/Makefile.am Sun Apr 1 18:52:39 2001
-@@ -34,4 +34,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
-+ $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
-diff -urN control-center-1.4.0.1.org/capplets/url-properties/Makefile.am control-center-1.4.0.1/capplets/url-properties/Makefile.am
---- control-center-1.4.0.1.org/capplets/url-properties/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/url-properties/Makefile.am Sun Apr 1 18:52:39 2001
-@@ -24,4 +24,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
-+ $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
-diff -urN control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am control-center-1.4.0.1/capplets/wm-properties/Makefile.am
---- control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am Sun Apr 1 18:49:14 2001
-+++ control-center-1.4.0.1/capplets/wm-properties/Makefile.am Sun Apr 1 18:55:37 2001
-@@ -26,7 +26,7 @@
- sys_in_files = wm-properties.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
--Setdir = $(datadir)/gnome/apps/Settings/Desktop
-+Setdir = $(datadir)/applnk/Settings/Desktop
-
- Set_DATA = $(sys_DATA)
-
-diff -urN control-center-1.4.0.1.org/control-center/Makefile.am control-center-1.4.0.1/control-center/Makefile.am
---- control-center-1.4.0.1.org/control-center/Makefile.am Sun Apr 1 18:49:15 2001
-+++ control-center-1.4.0.1/control-center/Makefile.am Sun Apr 1 18:56:01 2001
-@@ -47,7 +47,7 @@
-
- EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
-
--sysdir = $(datadir)/gnome/apps/Settings
-+sysdir = $(datadir)/applnk/Settings
- sys_in_files = gnomecc.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
- @XML_I18N_MERGE_DESKTOP_RULE@
-diff -urN control-center-1.4.0.1.org/control-center-applnk.patch control-center-1.4.0.1/control-center-applnk.patch
---- control-center-1.4.0.1.org/control-center-applnk.patch Thu Jan 1 01:00:00 1970
-+++ control-center-1.4.0.1/control-center-applnk.patch Sun Apr 1 18:46:58 2001
-@@ -0,0 +1,128 @@
-+diff -Nru control-center-1.2.3/capplets/background-properties/Makefile.am control-center-1.2.3.new/capplets/background-properties/Makefile.am
-+--- control-center-1.2.3/capplets/background-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/background-properties/Makefile.am Tue Feb 20 02:33:18 2001
-+@@ -26,4 +26,4 @@
-+ sys_DATA = background-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center-1.2.3.new/capplets/desktop-links/Makefile.am
-+--- control-center-1.2.3/capplets/desktop-links/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/desktop-links/Makefile.am Tue Feb 20 02:33:37 2001
-+@@ -6,7 +6,7 @@
-+ Sessiondir = $(ccenterdir)/Session
-+ Documentsdir = $(ccenterdir)/Documents
-+
-+-paneldir = $(datadir)/gnome/apps/Settings
-++paneldir = $(datadir)/applnk/Settings/GNOME
-+ Multimediadirp = $(paneldir)/Multimedia
-+ Desktopdirp = $(paneldir)/Desktop
-+ UIOptionsdirp = $(paneldir)/UIOptions
-+diff -Nru control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am
-+--- control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:33:59 2001
-+@@ -21,4 +21,4 @@
-+ sys_DATA = gnome-edit-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/keyboard-properties/Makefile.am control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am
-+--- control-center-1.2.3/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:34:28 2001
-+@@ -19,4 +19,4 @@
-+ sys_DATA = keyboard-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/mime-type/Makefile.am control-center-1.2.3.new/capplets/mime-type/Makefile.am
-+--- control-center-1.2.3/capplets/mime-type/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/mime-type/Makefile.am Tue Feb 20 02:34:42 2001
-+@@ -23,4 +23,4 @@
-+ sys_DATA = mime-type.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/mime-type.desktop
-++ $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/mime-type.desktop
-+diff -Nru control-center-1.2.3/capplets/mouse-properties/Makefile.am control-center-1.2.3.new/capplets/mouse-properties/Makefile.am
-+--- control-center-1.2.3/capplets/mouse-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/mouse-properties/Makefile.am Tue Feb 20 02:34:57 2001
-+@@ -20,4 +20,4 @@
-+ sys_DATA = mouse-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/screensaver-properties/Makefile.am control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am
-+--- control-center-1.2.3/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:35:13 2001
-+@@ -29,4 +29,4 @@
-+ sys_DATA = screensaver-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/sound-properties/Makefile.am control-center-1.2.3.new/capplets/sound-properties/Makefile.am
-+--- control-center-1.2.3/capplets/sound-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/sound-properties/Makefile.am Tue Feb 20 02:35:41 2001
-+@@ -21,4 +21,4 @@
-+ sys_DATA = sound-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/theme-switcher/Makefile.am control-center-1.2.3.new/capplets/theme-switcher/Makefile.am
-+--- control-center-1.2.3/capplets/theme-switcher/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/theme-switcher/Makefile.am Tue Feb 20 02:35:55 2001
-+@@ -31,4 +31,4 @@
-+ sys_DATA = theme-selector.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
-++ $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
-+diff -Nru control-center-1.2.3/capplets/ui-properties/Makefile.am control-center-1.2.3.new/capplets/ui-properties/Makefile.am
-+--- control-center-1.2.3/capplets/ui-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/ui-properties/Makefile.am Tue Feb 20 02:36:16 2001
-+@@ -27,6 +27,6 @@
-+ mdi.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop
-+- $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop
-+- $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop
-++ $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/application.desktop
-++ $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/dialogs.desktop
-++ $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/mdi.desktop
-+diff -Nru control-center-1.2.3/capplets/url-properties/Makefile.am control-center-1.2.3.new/capplets/url-properties/Makefile.am
-+--- control-center-1.2.3/capplets/url-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/url-properties/Makefile.am Tue Feb 20 02:36:28 2001
-+@@ -21,4 +21,4 @@
-+ sys_DATA = url-properties.desktop
-+
-+ install-data-local:
-+- $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
-++ $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
-+diff -Nru control-center-1.2.3/capplets/wm-properties/Makefile.am control-center-1.2.3.new/capplets/wm-properties/Makefile.am
-+--- control-center-1.2.3/capplets/wm-properties/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/capplets/wm-properties/Makefile.am Tue Feb 20 02:36:46 2001
-+@@ -25,5 +25,5 @@
-+ sysdir = $(datadir)/control-center/Desktop
-+ sys_DATA = wm-properties.desktop
-+
-+-Setdir = $(datadir)/gnome/apps/Settings/Desktop
-++Setdir = $(datadir)/applnk/Settings/GNOME/Desktop
-+ Set_DATA = wm-properties.desktop
-+diff -Nru control-center-1.2.3/control-center/Makefile.am control-center-1.2.3.new/control-center/Makefile.am
-+--- control-center-1.2.3/control-center/Makefile.am Tue Feb 20 02:32:44 2001
-++++ control-center-1.2.3.new/control-center/Makefile.am Tue Feb 20 02:31:47 2001
-+@@ -47,7 +47,7 @@
-+
-+ EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
-+
-+-sysdir = $(datadir)/gnome/apps/Settings
-++sysdir = $(datadir)/applnk/Settings
-+ sys_DATA = gnomecc.desktop
-+
-+ ## Put `exec' in the name because this should be installed by
---- control-center-1.4.0.3/capplets/wm-properties/Makefile.am~ Fri Feb 8 17:48:27 2002
-+++ control-center-1.4.0.3/capplets/wm-properties/Makefile.am Fri Feb 8 17:48:27 2002
-@@ -26,7 +26,7 @@
- sys_in_files = wm-properties.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
--Setdir = $(datadir)/applnk/Settings/Desktop
-+Setdir = $(datadir)/applnk/Settings/GNOME/Desktop
-
- Set_DATA = $(sys_DATA)
-
---- control-center-1.4.0.3/capplets/file-types/Makefile.am~ Fri Feb 8 17:49:51 2002
-+++ control-center-1.4.0.3/capplets/file-types/Makefile.am Fri Feb 8 17:49:51 2002
-@@ -43,7 +43,7 @@
- sys_in_files = file-types-capplet.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
-
--settingsdir = $(datadir)/applnk/Settings
-+settingsdir = $(datadir)/applnk/GNOME/Settings
- settings_DATA = $(sys_DATA)
-
- @XML_I18N_MERGE_DESKTOP_RULE@
---- control-center-1.4.0.3/control-center/Makefile.am~ Fri Feb 8 17:52:16 2002
-+++ control-center-1.4.0.3/control-center/Makefile.am Fri Feb 8 17:52:16 2002
-@@ -47,7 +47,7 @@
-
- EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
-
--sysdir = $(datadir)/applnk/Settings
-+sysdir = $(datadir)/applnk/Settings/GNOME
- sys_in_files = gnomecc.desktop.in
- sys_DATA = $(sys_in_files:.desktop.in=.desktop)
- @XML_I18N_MERGE_DESKTOP_RULE@
---- control-center-1.4.0.5/capplets/default-applications/Makefile.am~ Sun Apr 7 11:12:35 2002
-+++ control-center-1.4.0.5/capplets/default-applications/Makefile.am Sun Apr 7 11:12:35 2002
-@@ -33,4 +33,4 @@
- @XML_I18N_MERGE_DESKTOP_RULE@
-
- install-data-local:
-- $(INSTALL_DATA) $(srcdir)/default-application-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/default-applicaiton-properties.desktop
-+ $(INSTALL_DATA) $(srcdir)/default-application-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/default-applicaiton-properties.desktop
+++ /dev/null
---- control-center-1.0.4/capplets/background-properties/property-background.c.bgcolor1 Mon Mar 22 14:05:34 1999
-+++ control-center-1.0.4/capplets/background-properties/property-background.c Mon Mar 22 14:05:47 1999
-@@ -1108,7 +1108,7 @@
- gint r, g, b;
-
- gdk_color_parse
-- (gnome_config_get_string ("/Background/Default/color1=#005060"),
-+ (gnome_config_get_string ("/Background/Default/color1=#356390"),
- &state->bgColor1);
- r = state->bgColor1.red >> 8;
- g = state->bgColor1.green >> 8;
+++ /dev/null
-diff -urN control-center-2.1.0.orig/configure.in control-center-2.1.0/configure.in
---- control-center-2.1.0.orig/configure.in Sat Sep 28 01:28:10 2002
-+++ control-center-2.1.0/configure.in Sat Sep 28 01:29:16 2002
-@@ -253,6 +253,5 @@
- capplets/windows/Makefile
- schemas/Makefile
- libsounds/Makefile
--dnl due to a bug in intltool we need to expand something from the root last
- control-center.spec
- ])
+++ /dev/null
-diff -Nuard control-center-2.4.0.orig/capplets/default-applications/gnome-default-applications-properties.c control-center-2.4.0/capplets/default-applications/gnome-default-applications-properties.c
---- control-center-2.4.0.orig/capplets/default-applications/gnome-default-applications-properties.c 2003-08-01 21:45:43.000000000 +0200
-+++ control-center-2.4.0/capplets/default-applications/gnome-default-applications-properties.c 2003-09-11 23:20:24.000000000 +0200
-@@ -259,7 +259,7 @@
- if (strcmp (mime_app->command, li_app->command) == 0 &&
- mime_app->requires_terminal == li_app->requires_terminal) {
- gtk_entry_set_text (GTK_ENTRY (WID ("text_select_combo_entry")), _(mime_app->name));
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_radio")), TRUE);
-+ gtk_widget_set_sensitive(WID ("text_select_combo") ,TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE);
- gnome_vfs_mime_application_free (mime_app);
- return;
-@@ -279,8 +279,9 @@
- gnome_vfs_mime_set_default_application ("text/plain", mime_app->id);
- gnome_vfs_application_registry_sync ();
-
-+
-+
- read_editor_custom:
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_select_radio")), TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("text_custom_radio")), TRUE);
- if (mime_app)
- gnome_vfs_mime_application_free (mime_app);
-@@ -388,19 +389,20 @@
- for (i = 0; i < G_N_ELEMENTS (possible_browsers); i++ ) {
- if (possible_browsers[i].in_path == FALSE)
- continue;
--
-- if (browser && strcmp (browser, possible_browsers[i].command) == 0 &&
-- needs_term == possible_browsers[i].needs_term) {
-+
-+ if (browser && (strcmp (browser, possible_browsers[i].command) == 0)
-+ && needs_term == possible_browsers[i].needs_term) {
- gtk_entry_set_text (GTK_ENTRY (WID ("web_select_combo_entry")),
- _(possible_browsers[i].name));
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_radio")), TRUE);
-+
-+ gtk_widget_set_sensitive (WID ("web_select_combo"), TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_select_radio")), TRUE);
- g_free (browser);
- return;
- }
- }
-- gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (WID ("web_select_radio")), TRUE);
-- gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (WID ("web_custom_radio")), TRUE);
-+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("web_custom_radio")), TRUE);
-+
- g_free (browser);
- }
-
-@@ -427,18 +429,19 @@
- if (possible_mailers[i].in_path == FALSE)
- continue;
-
-- if (mailer && strcmp (mailer, possible_mailers[i].command) == 0 &&
-- needs_term == possible_mailers[i].needs_term) {
-+ if (mailer && (strcmp (mailer, possible_mailers[i].command) == 0)
-+ && needs_term == possible_mailers[i].needs_term) {
- gtk_entry_set_text (GTK_ENTRY (WID ("mail_select_combo_entry")),
- _(possible_mailers[i].name));
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("mail_custom_radio")), TRUE);
-+
-+ gtk_widget_set_sensitive (WID ("mail_select_combo"), TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("mail_select_radio")), TRUE);
- g_free (mailer);
- return;
- }
- }
-- gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (WID ("mail_select_radio")), TRUE);
-- gtk_toggle_button_set_inconsistent (GTK_TOGGLE_BUTTON (WID ("mail_custom_radio")), TRUE);
-+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("mail_custom_radio")), TRUE);
-+
- g_free (mailer);
-
-
-@@ -510,17 +513,18 @@
- strcmp (exec_arg?exec_arg:"", possible_terminals[i].exec_arg) == 0) {
- gtk_entry_set_text (GTK_ENTRY (WID ("terminal_select_combo_entry")),
- _(possible_terminals[i].name));
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("terminal_custom_radio")), TRUE);
-+
-+ gtk_widget_set_sensitive (WID ("terminal_select_combo"), TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("terminal_select_radio")), TRUE);
- g_free (exec);
- g_free (exec_arg);
- return;
- }
- }
-- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("terminal_select_radio")), TRUE);
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (WID ("terminal_custom_radio")), TRUE);
- g_free (exec);
- g_free (exec_arg);
-+
- }
-
- static void
+++ /dev/null
---- control-center-1.0.3/capplets/sound-properties/sound-properties.c.esdrelease Sun Mar 14 23:55:16 1999
-+++ control-center-1.0.3/capplets/sound-properties/sound-properties.c Sun Mar 14 23:58:57 1999
-@@ -133,12 +133,13 @@
- if(gnome_sound_connection < 0
- && gnome_config_get_bool("/sound/system/settings/start_esd=false")) {
- int esdpid;
-- static const char *esd_cmdline[] = {"esd", "-nobeeps", NULL};
-+ static const char *esd_cmdline[] = {"esd", "-nobeeps",
-+ "-as", "30", NULL};
- char *tmpargv[3];
- char argbuf[32];
- time_t starttime;
-
-- esdpid = gnome_execute_async(NULL, 2, (char **)esd_cmdline);
-+ esdpid = gnome_execute_async(NULL, 4, (char **)esd_cmdline);
- g_snprintf(argbuf, sizeof(argbuf), "%d", esdpid);
- tmpargv[0] = "kill"; tmpargv[1] = argbuf; tmpargv[2] = NULL;
- gnome_client_set_shutdown_command(client, 2, tmpargv);
+++ /dev/null
-diff -Nru control-center-1.2.1/capplets/background-properties/property-background.c control-center-1.2.1.new/capplets/background-properties/property-background.c
---- control-center-1.2.1/capplets/background-properties/property-background.c Mon Aug 7 20:02:14 2000
-+++ control-center-1.2.1.new/capplets/background-properties/property-background.c Mon Aug 7 20:10:23 2000
-@@ -590,7 +590,10 @@
- else if (origState.wpFileName)
- gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
- origState.wpFileName);
--
-+ else if (g_file_exists(GNOME_ICONDIR"/backgrounds"))
-+ gtk_file_selection_set_filename (GTK_FILE_SELECTION (fileSel),
-+ GNOME_ICONDIR"/backgrounds");
-+
- gtk_signal_connect (GTK_OBJECT (fileSel), "delete_event",
- (GtkSignalFunc) delete_browse,
- &fileSel);
+++ /dev/null
-diff -urN control-center-2.2.0.orig/capplets/common/gnome-theme-test.c control-center-2.2.0/capplets/common/gnome-theme-test.c
---- control-center-2.2.0.orig/capplets/common/gnome-theme-test.c Mon Jan 27 00:00:26 2003
-+++ control-center-2.2.0/capplets/common/gnome-theme-test.c Mon Jan 27 00:01:13 2003
-@@ -10,11 +10,11 @@
- int
- main (int argc, char *argv[])
- {
-- gtk_init (&argc, &argv);
-- gnome_vfs_init ();
- gboolean monitor_not_added = FALSE;
- GList *themes, *list;
--
-+ gtk_init (&argc, &argv);
-+ gnome_vfs_init ();
-+
- gnome_theme_init (&monitor_not_added);
-
- themes = gnome_theme_meta_info_find_all ();
+++ /dev/null
-diff -urN aa/control-center-2.5.2/libgswitchit/gswitchit_config.c control-center-2.5.2/libgswitchit/gswitchit_config.c
---- aa/control-center-2.5.2/libgswitchit/gswitchit_config.c 2004-01-12 20:30:47.000000000 +0100
-+++ control-center-2.5.2/libgswitchit/gswitchit_config.c 2004-01-29 23:46:29.523783336 +0100
-@@ -362,7 +362,6 @@
- gboolean activate,
- const char *psFileName)
- {
-- XkbDescModifierFunc fun = NULL;
- gboolean rv = FALSE;
-
- XklConfigRec data;
-@@ -371,7 +370,7 @@
- _GSwitchItXkbConfigCopyToXklConfig (xkbConfig, &data);
-
- if (activate) {
-- rv = XklConfigActivate (&data, fun, NULL);
-+ rv = XklConfigActivate (&data, NULL);
- } else {
- char *home = getenv ("HOME");
- char xkmFileName[PATH_MAX];
-@@ -379,7 +378,7 @@
- int status;
- g_snprintf (xkmFileName, sizeof (xkmFileName),
- "%s/.gnome_private/xkbpreview.xkm", home);
-- rv = XklConfigWriteXKMFile (xkmFileName, &data, fun, NULL);
-+ rv = XklConfigWriteXKMFile (xkmFileName, &data, NULL);
- if (rv) {
- g_snprintf (cmd, sizeof (cmd),
- "xkbprint -full -color %s %s",
+++ /dev/null
-diff -urN control-center-1.4.0.1.org/macros/xml-i18n-tools.m4 control-center-1.4.0.1/macros/xml-i18n-tools.m4
---- control-center-1.4.0.1.org/macros/xml-i18n-tools.m4 Thu Jan 1 01:00:00 1970
-+++ control-center-1.4.0.1/macros/xml-i18n-tools.m4 Sun Mar 25 13:28:11 2001
-@@ -0,0 +1,113 @@
-+## xml-i18n-tools.m4 - Configure xml-i18n-tools for the target system. -*-Shell-script-*-
-+## Copyright (C) 2001 Eazel, Inc.
-+## Author: Maciej Stachowiak <mjs@eazel.com>
-+##
-+## This program is free software; you can redistribute it and/or modify
-+## it under the terms of the GNU General Public License as published by
-+## the Free Software Foundation; either version 2 of the License, or
-+## (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful, but
-+## WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+## General Public License for more details.
-+##
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+##
-+## As a special exception to the GNU General Public License, if you
-+## distribute this file as part of a program that contains a
-+## configuration script generated by Autoconf, you may include it under
-+## the same distribution terms that you use for the rest of that program.
-+
-+# serial 1 AC_PROG_XML_I18N_TOOLS
-+AC_DEFUN(AC_PROG_XML_I18N_TOOLS,
-+[
-+
-+dnl This is a hack - we use the expansion of AC_SUBST instead of
-+dnl AC_SUBST itself to avoid automake putting
-+dnl XML_I18N_MERGE_OAF_RULE = @XML_I18N_MERGE_OAF_RULE@
-+dnl in all the Makefile.in's
-+XML_I18N_MERGE_OAF_RULE='\%.oaf : \%.oaf.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+ $(top_builddir)/xml-i18n-merge -o $(top_srcdir)/po $< [$]*.oaf'
-+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-+s%@XML_I18N_MERGE_OAF_RULE@%[$]XML_I18N_MERGE_OAF_RULE%g
-+AC_DIVERT_POP()dnl
-+
-+dnl same deal
-+XML_I18N_MERGE_KEYS_RULE='\%.keys : \%.keys.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+ $(top_builddir)/xml-i18n-merge -k $(top_srcdir)/po $< [$]*.keys'
-+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-+s%@XML_I18N_MERGE_KEYS_RULE@%[$]XML_I18N_MERGE_KEYS_RULE%g
-+AC_DIVERT_POP()dnl
-+
-+dnl same deal
-+XML_I18N_MERGE_DESKTOP_RULE='\%.desktop : \%.desktop.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+ $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.desktop'
-+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-+s%@XML_I18N_MERGE_DESKTOP_RULE@%[$]XML_I18N_MERGE_DESKTOP_RULE%g
-+AC_DIVERT_POP()dnl
-+
-+dnl same deal
-+XML_I18N_MERGE_DIRECTORY_RULE='\%.directory : \%.directory.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+ $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.directory'
-+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-+s%@XML_I18N_MERGE_DIRECTORY_RULE@%[$]XML_I18N_MERGE_DIRECTORY_RULE%g
-+AC_DIVERT_POP()dnl
-+
-+dnl same deal
-+XML_I18N_MERGE_SOUNDLIST_RULE='\%.soundlist : \%.soundlist.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+ $(top_builddir)/xml-i18n-merge -d $(top_srcdir)/po $< [$]*.soundlist'
-+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-+s%@XML_I18N_MERGE_SOUNDLIST_RULE@%[$]XML_I18N_MERGE_SOUNDLIST_RULE%g
-+AC_DIVERT_POP()dnl
-+
-+dnl same deal
-+XML_I18N_MERGE_PONG_RULE='\%.pong : \%.pong.in $(top_builddir)/xml-i18n-merge $(top_srcdir)/po/*.po\
-+ $(top_builddir)/xml-i18n-merge -x $(top_srcdir)/po $< [$]*.pong'
-+AC_DIVERT_PUSH(AC_DIVERSION_SED)dnl
-+s%@XML_I18N_MERGE_PONG_RULE@%[$]XML_I18N_MERGE_PONG_RULE%g
-+AC_DIVERT_POP()dnl
-+
-+# Always use our own xml-i18n-tools.
-+XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
-+AC_SUBST(XML_I18N_EXTRACT)dnl
-+
-+XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge'
-+AC_SUBST(XML_I18N_MERGE)dnl
-+
-+XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update'
-+AC_SUBST(XML_I18N_UPDATE)dnl
-+
-+AC_PATH_PROG(XML_I18N_TOOLS_PERL, perl)
-+if test -z "$XML_I18N_TOOLS_PERL"; then
-+ AC_MSG_ERROR([perl not found; required for xml-i18n-tools])
-+fi
-+if test -z "`$XML_I18N_TOOLS_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+ AC_MSG_ERROR([perl 5.x required for xml-i18n-tools])
-+fi
-+
-+dnl manually sed perl in so people don't have to put the xml-i18n-tools scripts in their
-+dnl AC_OUTPUT
-+AC_OUTPUT_COMMANDS([
-+sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-extract.in > xml-i18n-extract;
-+chmod ugo+x xml-i18n-extract;
-+chmod u+w xml-i18n-extract;
-+
-+sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-merge.in > xml-i18n-merge;
-+chmod ugo+x xml-i18n-merge;
-+chmod u+w xml-i18n-merge;
-+
-+sed -e "s:@XML_I18N_TOOLS_PERL@:${XML_I18N_TOOLS_PERL}:;" < ${ac_given_srcdir}/xml-i18n-update.in > xml-i18n-update;
-+chmod ugo+x xml-i18n-update;
-+chmod u+w xml-i18n-update;
-+], XML_I18N_TOOLS_PERL=${XML_I18N_TOOLS_PERL})
-+
-+# Redirect the config.log output again, so that the ltconfig log is not
-+# clobbered by the next message.
-+exec 5>>./config.log
-+])
-+
-+dnl old names
-+AC_DEFUN(AM_PROG_XML_I18N_TOOLS, [indir([AC_PROG_XML_I18N_TOOLS])])dnl
-diff -urN control-center-1.4.0.1.org/sgmldocs.make control-center-1.4.0.1/sgmldocs.make
---- control-center-1.4.0.1.org/sgmldocs.make Sun Apr 1 18:49:13 2001
-+++ control-center-1.4.0.1/sgmldocs.make Sun Apr 1 19:51:31 2001
-@@ -58,7 +58,7 @@
- -cp $(docname)/index.html .
-
- $(docname).sgml: $(sgml_ents)
-- -ourdir=`pwd`; \
-+ ourdir=`pwd`; \
- cd $(srcdir); \
- cp $(sgml_ents) $$ourdir
-
+++ /dev/null
-diff -Nuard control-center-2.1.2.orig/capplets/mouse/Makefile.am control-center-2.1.2/capplets/mouse/Makefile.am
---- control-center-2.1.2.orig/capplets/mouse/Makefile.am Sat Nov 2 19:40:22 2002
-+++ control-center-2.1.2/capplets/mouse/Makefile.am Tue Nov 12 16:16:22 2002
-@@ -44,7 +44,7 @@
- mouse_dblclck_off_data $(srcdir)/double-click-off.png
-
- BUILT_SOURCES = inlinepixbufs.h
--CLEANFILES = inlinepixbufs.h
-+#CLEANFILES = inlinepixbufs.h
-
- inlinepixbufs.h: $(IMAGES)
- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h
+++ /dev/null
-diff -urN control-center-1.4.0.3/Makefile.am control-center.new/Makefile.am
---- control-center-1.4.0.3/Makefile.am Thu Feb 7 17:48:54 2002
-+++ control-center.new/Makefile.am Thu Feb 7 18:42:34 2002
-@@ -1,5 +1,5 @@
-
--always_built_SUBDIRS = control-center capplets idl doc omf-install man
-+always_built_SUBDIRS = control-center capplets idl doc omf-install
-
- SUBDIRS = intl po macros \
- $(always_built_SUBDIRS)
+++ /dev/null
---- control-center-1.0.2/capplets/sound-properties/sound-properties.c.nosound Wed Mar 10 18:05:17 1999
-+++ control-center-1.0.2/capplets/sound-properties/sound-properties.c Wed Mar 10 18:06:35 1999
-@@ -131,7 +131,7 @@
- #ifdef HAVE_ESD
- if(token) {
- if(gnome_sound_connection < 0
-- && gnome_config_get_bool("/sound/system/settings/start_esd=true")) {
-+ && gnome_config_get_bool("/sound/system/settings/start_esd=false")) {
- int esdpid;
- static const char *esd_cmdline[] = {"esd", "-nobeeps", NULL};
- char *tmpargv[3];
-@@ -244,7 +244,7 @@
- FALSE, FALSE, 0);
-
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(retval->enable_esd_startup),
-- gnome_config_get_bool("/sound/system/settings/start_esd=true"));
-+ gnome_config_get_bool("/sound/system/settings/start_esd=false"));
-
- retval->enable_sound_events =
- gtk_check_button_new_with_label(_("Sounds for events"));
-@@ -636,7 +636,7 @@
- ui_do_revert(GtkWidget *w, SoundProps *props)
- {
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(props->enable_esd_startup),
-- gnome_config_get_bool("/sound/system/settings/start_esd=true"));
-+ gnome_config_get_bool("/sound/system/settings/start_esd=false"));
-
- gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(props->enable_sound_events),
- gnome_config_get_bool("/sound/system/settings/event_sounds=true"));
+++ /dev/null
-diff -Nuard control-center-1.4.0.5.orig/doc/C/control-center-C.omf control-center-1.4.0.5/doc/C/control-center-C.omf
---- control-center-1.4.0.5.orig/doc/C/control-center-C.omf Fri Oct 26 11:00:10 2001
-+++ control-center-1.4.0.5/doc/C/control-center-C.omf Wed Oct 2 14:12:33 2002
-@@ -1,15 +1,23 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
-- GNOME Control Center Manual
-+ GNOME Control Center Manual
- </title>
-- <subject>
-- <category>System|Configuration|Configuration Tools</category>
-- <category>GNOME|Settings</category>
-- </subject>
-+ <date>
-+ 2002-10-02
-+ </date>
-+ <version identifier="1.4.0.5" date="2002-10-02"/>
-+ <subject category="System|Configuration|Configuration Tools"/>
-+ <subject category="GNOME|Settings"/>
-+ <description/>
-+ <type/>
- <format mime="text/sgml"/>
- <identifier url="control-center.sgml"/>
- <language code="C"/>
-+ <relation seriesid="0f71f7fe-d5fd-11d6-86b7-d475b9c461fe"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
-diff -Nuard control-center-1.4.0.5.orig/doc/eu/control-center-eu.omf control-center-1.4.0.5/doc/eu/control-center-eu.omf
---- control-center-1.4.0.5.orig/doc/eu/control-center-eu.omf Mon Feb 25 20:12:17 2002
-+++ control-center-1.4.0.5/doc/eu/control-center-eu.omf Wed Oct 2 14:14:02 2002
-@@ -1,15 +1,23 @@
--<?xml version="1.0" standalone="no"?>
-+<?xml version="1.0" encoding="UTF-8"?>
-+<!DOCTYPE omf PUBLIC "-//OMF//DTD Scrollkeeper OMF Variant V1.0//EN" "http://scrollkeeper.sourceforge.net/dtds/scrollkeeper-omf-1.0/scrollkeeper-omf.dtd">
- <omf>
- <resource>
-+ <creator/>
- <title>
-- GNOMEren Kontrol Zentroaren eskuliburua
-+ GNOMEren Kontrol Zentroaren eskuliburua
- </title>
-- <subject>
-- <category>Sistema|Konfigurazioa|Konfigurazio-tresnak</category>
-- <category>GNOME|ezarpenak</category>
-- </subject>
-+ <date>
-+ 2002-10-02
-+ </date>
-+ <version identifier="1.4.0.5" date="2002-10-02"/>
-+ <subject category="Sistema|Konfigurazioa|Konfigurazio-tresnak"/>
-+ <subject category="GNOME|ezarpenak"/>
-+ <description/>
-+ <type/>
- <format mime="text/sgml"/>
- <identifier url="control-center.sgml"/>
- <language code="eu"/>
-+ <relation seriesid="0f71f7fe-d5fd-11d6-86b7-d475b9c461fe"/>
-+ <rights type="GNU GPL" license.version="2" license="http://www.gnu.org/licenses/gpl.html"/>
- </resource>
- </omf>
+++ /dev/null
---- control-center-1.4.0.1/capplets/file-types/Makefile.am~ Sat Nov 24 19:31:50 2001
-+++ control-center-1.4.0.1/capplets/file-types/Makefile.am Sat Nov 24 19:59:05 2001
-@@ -10,6 +10,7 @@
- -I$(srcdir)/../../control-center \
- $(GNOME_INCLUDEDIR) \
- $(GTK_CFLAGS) \
-+ $(PIXBUF_CFLAGS) \
- -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -I$(includedir) \
- $(VFS_CFLAGS) $(WERROR) \
+++ /dev/null
---- control-center-1.4.0.3/control-center.orig/splash.c Thu Feb 8 20:07:54 2001
-+++ control-center-1.4.0.3/control-center/splash.c Mon Aug 20 23:24:41 2001
-@@ -171,6 +171,16 @@
- info[si_distribution] = g_strdup(buf);
- fclose(f);
- }
-+ } else if (g_file_exists("/etc/pld-release")) {
-+ FILE *f;
-+ gchar buf[80];
-+
-+ f = fopen("/etc/pld-release", "r");
-+ if (f) {
-+ fgets(buf, 79, f);
-+ info[si_distribution] = g_strdup(buf);
-+ fclose(f);
-+ }
- }
- else {
- /* This is about the only case where we'll put Unknown instead
+++ /dev/null
---- control-center-1.4.0.1/capplets/background-properties/property-background.c.setroothint Thu Aug 23 18:03:27 2001
-+++ control-center-1.4.0.1/capplets/background-properties/property-background.c Thu Aug 23 18:08:02 2001
-@@ -164,6 +164,12 @@
-
- tmp.pixel = xpixel_from_color (&state->bgColor1);
-
-+ XChangeProperty (GDK_DISPLAY(), GDK_ROOT_WINDOW(),
-+ gdk_atom_intern("_XROOTCOLOR_PIXEL", FALSE),
-+ gdk_atom_intern("PIXEL", FALSE),
-+ 32, PropModeReplace,
-+ (guchar *) &tmp.pixel, 1);
-+
- gdk_window_set_background (GDK_ROOT_PARENT(), &tmp);
- gdk_window_clear (GDK_ROOT_PARENT());
-
+++ /dev/null
-diff -urN aaa/control-center-2.1.0/capplets/theme-switcher/Makefile.am control-center-2.1.0/capplets/theme-switcher/Makefile.am
---- aaa/control-center-2.1.0/capplets/theme-switcher/Makefile.am Mon Aug 19 21:04:48 2002
-+++ control-center-2.1.0/capplets/theme-switcher/Makefile.am Tue Oct 1 21:09:46 2002
-@@ -2,7 +2,7 @@
-
- gnome_theme_properties_LDADD = \
- $(GNOMECC_CAPPLETS_LIBS) \
-- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings
-+ $(top_builddir)/libwindow-settings/.libs/libgnome-window-settings.so
-
- gnome_theme_properties_SOURCES = \
- theme-switcher.c
-
+++ /dev/null
---- control-center-1.4.0.1/capplets/ui-properties/Makefile.am.uipropertiesmenu Wed Aug 29 15:52:06 2001
-+++ control-center-1.4.0.1/capplets/ui-properties/Makefile.am Wed Aug 29 15:53:22 2001
-@@ -31,3 +31,6 @@
-
- install-data-local:
- $(INSTALL_DATA) $(srcdir)/ui-properties.directory $(DESTDIR)$(sysdir)/.directory
-+ $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions
-+ $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions
-+ $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions
-\ No newline at end of file
+++ /dev/null
---- control-center-1.4.0.1/capplets/wm-properties/wm-list.c~ Wed Aug 4 03:27:15 1999
-+++ control-center-1.4.0.1/capplets/wm-properties/wm-list.c Fri Apr 27 13:12:41 2001
-@@ -228,7 +228,7 @@
- gchar *tempdir;
- gchar *name;
-
-- tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
-+ tempdir = gnome_unconditional_datadir_file ("wm-properties/");
- wm_list_read_dir (tempdir, FALSE);
- g_free (tempdir);
-
+++ /dev/null
-#
-# No modifications of this Makefile should be necessary.
-#
-# This file contains the build instructions for installing OMF files. It is
-# generally called from the makefiles for particular formats of documentation.
-#
-# Note that you must configure your package with --localstatedir=/var/lib
-# so that the scrollkeeper-update command below will update the database
-# in the standard scrollkeeper directory.
-#
-# If it is impossible to configure with --localstatedir=/var/lib, then
-# modify the definition of scrollkeeper_localstate_dir so that
-# it points to the correct location. Note that you must still use
-# $(localstatedir) in this or when people build RPMs it will update
-# the real database on their system instead of the one under RPM_BUILD_ROOT.
-#
-# Note: This make file is not incorporated into xmldocs.make because, in
-# general, there will be other documents install besides XML documents
-# and the makefiles for these formats should also include this file.
-#
-# About this file:
-# This file was taken from scrollkeeper_example2, a package illustrating
-# how to install documentation and OMF files for use with ScrollKeeper
-# 0.3.x and 0.4.x. For more information, see:
-# http://scrollkeeper.sourceforge.net/
-# Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-omf: omf_timestamp
-
-omf_timestamp: $(omffile)
- -for file in $(omffile); do \
- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- done
- touch omf_timestamp
-
-install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- for file in $(omffile); do \
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
-uninstall-local-omf:
- -for file in $(srcdir)/*.omf; do \
- basefile=`basename $$file`; \
- rm -f $(omf_dest_dir)/$$basefile; \
- done
- -rmdir $(omf_dest_dir)
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+++ /dev/null
-#
-# No modifications of this Makefile should be necessary.
-#
-# To use this template:
-# 1) Define: figdir, docname, lang, omffile, and entities in
-# your Makefile.am file for each document directory,
-# although figdir, omffile, and entities may be empty
-# 2) Make sure the Makefile in (1) also includes
-# "include $(top_srcdir)/xmldocs.make" and
-# "dist-hook: app-dist-hook".
-# 3) Optionally define 'entities' to hold xml entities which
-# you would also like installed
-# 4) Figures must go under $(figdir)/ and be in PNG format
-# 5) You should only have one document per directory
-# 6) Note that the figure directory, $(figdir)/, should not have its
-# own Makefile since this Makefile installs those figures.
-#
-# example Makefile.am:
-# figdir = figures
-# docname = scrollkeeper-manual
-# lang = C
-# omffile=scrollkeeper-manual-C.omf
-# entities = fdl.xml
-# include $(top_srcdir)/xmldocs.make
-# dist-hook: app-dist-hook
-#
-# About this file:
-# This file was taken from scrollkeeper_example2, a package illustrating
-# how to install documentation and OMF files for use with ScrollKeeper
-# 0.3.x and 0.4.x. For more information, see:
-# http://scrollkeeper.sourceforge.net/
-# Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-
-# ************* Begin of section some packagers may need to modify **************
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
-# ************** You should not have to edit below this line *******************
-xml_files = $(entities)
-
-EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
-
-include $(top_srcdir)/omf.make
-
-all: omf
-
-$(docname).xml: $(entities)
- -ourdir=`pwd`; \
- cd $(srcdir); \
- cp $(entities) $$ourdir
-
-app-dist-hook:
- if test "$(figdir)"; then \
- $(mkinstalldirs) $(distdir)/$(figdir); \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
- done \
- fi
-
-install-data-local: omf
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- for file in $(xml_files); do \
- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
- done
- if test "$(figdir)"; then \
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
- done \
- fi
-
-install-data-hook: install-data-hook-omf
-
-uninstall-local: uninstall-local-doc uninstall-local-omf
-
-uninstall-local-doc:
- -if test "$(figdir)"; then \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(docdir)/$(figdir)/$$basefile; \
- done; \
- rmdir $(DESTDIR)$(docdir)/$(figdir); \
- fi
- -for file in $(xml_files); do \
- rm -f $(DESTDIR)$(docdir)/$$file; \
- done
- -rmdir $(DESTDIR)$(docdir)
-
projects / packages / control-center.git / commitdiff