This commit was manufactured by cvs2git to create branch 'unlabeled-1.71.2'.

Sprout from master 2002-04-25 16:06:29 UTC arturs <arturs@pld-linux.org> 'fixed a small typo'
Delete:
    control-center-am_conditional.patch
    control-center-applnk.patch
    control-center-bgcolor1.patch
    control-center-esdrelease.patch
    control-center-fsbgpath.patch
    control-center-macros.patch
    control-center-no_mans.patch
    control-center-nosound.patch
    control-center-pixbuf_cflags.patch
    control-center-pldrelease.patch
    control-center-setroothint.patch
    control-center-uipropertiesmenu.patch
    control-center-wm-properties_path.patch

diff --git a/control-center-am_conditional.patch b/control-center-am_conditional.patch
deleted file mode 100644 (file)
index ecd0b09..0000000
--- a/control-center-am_conditional.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
- 

diff --git a/control-center-applnk.patch b/control-center-applnk.patch
deleted file mode 100644 (file)
index b20038f..0000000
--- a/control-center-applnk.patch
+++ /dev/null
@@ -1,273 +0,0 @@
-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

diff --git a/control-center-bgcolor1.patch b/control-center-bgcolor1.patch
deleted file mode 100644 (file)
index 1a98043..0000000
--- a/control-center-bgcolor1.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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;

diff --git a/control-center-esdrelease.patch b/control-center-esdrelease.patch
deleted file mode 100644 (file)
index 771aa38..0000000
--- a/control-center-esdrelease.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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);

diff --git a/control-center-fsbgpath.patch b/control-center-fsbgpath.patch
deleted file mode 100644 (file)
index a2c175f..0000000
--- a/control-center-fsbgpath.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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);

diff --git a/control-center-macros.patch b/control-center-macros.patch
deleted file mode 100644 (file)
index 0708e29..0000000
--- a/control-center-macros.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-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
- 

diff --git a/control-center-no_mans.patch b/control-center-no_mans.patch
deleted file mode 100644 (file)
index b54087a..0000000
--- a/control-center-no_mans.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-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)

diff --git a/control-center-nosound.patch b/control-center-nosound.patch
deleted file mode 100644 (file)
index bd6697f..0000000
--- a/control-center-nosound.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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"));

diff --git a/control-center-pixbuf_cflags.patch b/control-center-pixbuf_cflags.patch
deleted file mode 100644 (file)
index d701c4a..0000000
--- a/control-center-pixbuf_cflags.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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)                         \

diff --git a/control-center-pldrelease.patch b/control-center-pldrelease.patch
deleted file mode 100644 (file)
index babf133..0000000
--- a/control-center-pldrelease.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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

diff --git a/control-center-setroothint.patch b/control-center-setroothint.patch
deleted file mode 100644 (file)
index 4112345..0000000
--- a/control-center-setroothint.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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());
- 

diff --git a/control-center-uipropertiesmenu.patch b/control-center-uipropertiesmenu.patch
deleted file mode 100644 (file)
index 431eb59..0000000
--- a/control-center-uipropertiesmenu.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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

diff --git a/control-center-wm-properties_path.patch b/control-center-wm-properties_path.patch
deleted file mode 100644 (file)
index 1eaba98..0000000
--- a/control-center-wm-properties_path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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);
-