- updated from corresponding control-center patches

Changed files:
    gnome-control-center-Makefile.patch -> 1.1
    gnome-control-center-capplet.patch -> 1.1
    gnome-control-center-default_apps.patch -> 1.1
    gnome-control-center-randr.patch -> 1.1
    gnome-control-center-wm_properties-dir.patch -> 1.1

diff --git a/gnome-control-center-Makefile.patch b/gnome-control-center-Makefile.patch
new file mode 100644 (file)
index 0000000..05776d3
--- /dev/null
+++ b/gnome-control-center-Makefile.patch
@@ -0,0 +1,22 @@
+diff -urN control-center-2.10.0.orig/vfs-methods/fontilus/Makefile.am control-center-2.10.0/vfs-methods/fontilus/Makefile.am
+--- control-center-2.10.0.orig/vfs-methods/fontilus/Makefile.am        2005-04-01 11:37:13.000000000 +0200
++++ control-center-2.10.0/vfs-methods/fontilus/Makefile.am     2005-04-01 11:41:14.000000000 +0200
+@@ -50,7 +50,6 @@
+ endif
+ 
+ install-desktop-database: install-desktopDATA
+-      update-desktop-database $(DESTDIR)$(desktopdir)
+ 
+ uninstall-local:
+       rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache
+diff -urN control-center-2.10.0.orig/vfs-methods/themus/Makefile.am control-center-2.10.0/vfs-methods/themus/Makefile.am
+--- control-center-2.10.0.orig/vfs-methods/themus/Makefile.am  2005-04-01 11:37:13.000000000 +0200
++++ control-center-2.10.0/vfs-methods/themus/Makefile.am       2005-04-01 11:41:38.000000000 +0200
+@@ -71,7 +71,6 @@
+ endif
+ 
+ install-desktop-database: install-desktopDATA
+-      update-desktop-database $(DESTDIR)$(desktopdir)
+ 
+ distclean-local:
+       rm -f $(DESTDIR)$(desktopdir)/mimeinfo.cache

diff --git a/gnome-control-center-capplet.patch b/gnome-control-center-capplet.patch
new file mode 100644 (file)
index 0000000..b031f32
--- /dev/null
+++ b/gnome-control-center-capplet.patch
@@ -0,0 +1,144 @@
+diff -aurN control-center-2.13.90.orig/capplets/about-me/gnome-about-me.desktop.in.in control-center-2.13.90/capplets/about-me/gnome-about-me.desktop.in.in
+--- control-center-2.13.90.orig/capplets/about-me/gnome-about-me.desktop.in.in 2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/about-me/gnome-about-me.desktop.in.in      2006-01-30 22:34:18.650754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/accessibility/at-properties/at-properties.desktop.in.in control-center-2.13.90/capplets/accessibility/at-properties/at-properties.desktop.in.in
+--- control-center-2.13.90.orig/capplets/accessibility/at-properties/at-properties.desktop.in.in       2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/accessibility/at-properties/at-properties.desktop.in.in    2006-01-30 22:34:36.710754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;Accessibility;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in control-center-2.13.90/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in
+--- control-center-2.13.90.orig/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in   2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/accessibility/keyboard/accessibility-keyboard.desktop.in.in        2006-01-30 22:35:01.620754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;Accessibility;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;Accessibility;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/appearance/data/gnome-appearance-properties.desktop.in.in control-center-2.13.90/capplets/appearance/data/gnome-appearance-properties.desktop.in.in
+--- control-center-2.13.90.orig/capplets/appearance/data/gnome-appearance-properties.desktop.in.in     2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/appearance/data/gnome-appearance-properties.desktop.in.in  2006-01-30 22:35:18.440754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-control-center
+diff -aurN control-center-2.13.90.orig/capplets/default-applications/default-applications.desktop.in.in control-center-2.13.90/capplets/default-applications/default-applications.desktop.in.in
+--- control-center-2.13.90.orig/capplets/default-applications/default-applications.desktop.in.in       2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/default-applications/default-applications.desktop.in.in    2006-01-30 22:35:43.670754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/display/display-properties.desktop.in.in control-center-2.13.90/capplets/display/display-properties.desktop.in.in
+--- control-center-2.13.90.orig/capplets/display/display-properties.desktop.in.in      2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/display/display-properties.desktop.in.in   2006-01-30 22:43:44.960754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;HardwareSettings;
++Categories=GTK;GNOME;Settings;HardwareSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/keybindings/keybinding.desktop.in.in control-center-2.13.90/capplets/keybindings/keybinding.desktop.in.in
+--- control-center-2.13.90.orig/capplets/keybindings/keybinding.desktop.in.in  2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/keybindings/keybinding.desktop.in.in       2006-01-30 22:45:11.700754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;X-GNOME-PersonalSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-PersonalSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/keyboard/keyboard.desktop.in.in control-center-2.13.90/capplets/keyboard/keyboard.desktop.in.in
+--- control-center-2.13.90.orig/capplets/keyboard/keyboard.desktop.in.in       2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/keyboard/keyboard.desktop.in.in    2006-01-30 22:45:41.620754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;HardwareSettings;
++Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/mouse/gnome-settings-mouse.desktop.in.in control-center-2.13.90/capplets/mouse/gnome-settings-mouse.desktop.in.in
+--- control-center-2.13.90.orig/capplets/mouse/gnome-settings-mouse.desktop.in.in      2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/mouse/gnome-settings-mouse.desktop.in.in   2006-01-30 22:45:55.270754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;HardwareSettings;
++Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/network/gnome-network-preferences.desktop.in.in control-center-2.13.90/capplets/network/gnome-network-preferences.desktop.in.in
+--- control-center-2.13.90.orig/capplets/network/gnome-network-preferences.desktop.in.in       2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/network/gnome-network-preferences.desktop.in.in    2006-01-30 22:46:08.550754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;X-GNOME-NetworkSettings;
++Categories=GTK;GNOME;Settings;X-GNOME-NetworkSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/sound/gnome-settings-sound.desktop.in.in control-center-2.13.90/capplets/sound/gnome-settings-sound.desktop.in.in
+--- control-center-2.13.90.orig/capplets/sound/gnome-settings-sound.desktop.in.in      2006-01-29 21:13:17.000000000 +0100
++++ control-center-2.13.90/capplets/sound/gnome-settings-sound.desktop.in.in   2006-01-30 22:46:22.590754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;HardwareSettings;
++Categories=GTK;GNOME;Settings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center
+diff -aurN control-center-2.13.90.orig/capplets/windows/window-properties.desktop.in.in control-center-2.13.90/capplets/windows/window-properties.desktop.in.in
+--- control-center-2.13.90.orig/capplets/windows/window-properties.desktop.in.in       2006-01-23 12:36:20.000000000 +0100
++++ control-center-2.13.90/capplets/windows/window-properties.desktop.in.in    2006-01-30 22:47:26.940754000 +0100
+@@ -7,7 +7,7 @@
+ Terminal=false
+ Type=Application
+ StartupNotify=true
+-Categories=GNOME;GTK;Settings;DesktopSettings;
++Categories=GTK;GNOME;Settings;DesktopSettings;X-Capplet;
+ OnlyShowIn=GNOME;
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=control-center

diff --git a/gnome-control-center-default_apps.patch b/gnome-control-center-default_apps.patch
new file mode 100644 (file)
index 0000000..e7b781e
--- /dev/null
+++ b/gnome-control-center-default_apps.patch
@@ -0,0 +1,26 @@
+diff -aurN control-center-2.13.90.orig/capplets/default-applications/gnome-default-applications.xml.in control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in
+--- control-center-2.13.90.orig/capplets/default-applications/gnome-default-applications.xml.in        2006-01-28 19:52:24.000000000 +0100
++++ control-center-2.13.90/capplets/default-applications/gnome-default-applications.xml.in     2006-01-30 22:30:19.530754000 +0100
+@@ -64,7 +64,7 @@
+     <web-browser>
+       <_name>Firefox</_name>
+       <executable>firefox</executable>
+-      <command>firefox %s</command>
++      <command>mozilla-firefox %s</command>
+       <icon-name>firefox</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+       <netscape-remote>true</netscape-remote>
+@@ -234,6 +234,13 @@
+       <icon-name>sylpheed</icon-name>
+       <run-in-terminal>false</run-in-terminal>
+     </mail-reader>
++    <mail-reader>
++      <_name>Sylpheed</_name>
++      <executable>sylpheed</executable>
++      <command>sylpheed --compose %s</command>
++      <icon-name>sylpheed</icon-name>
++      <run-in-terminal>false</run-in-terminal>
++    </mail-reader>
+   </mail-readers>
+ 
+   <terminals>

diff --git a/gnome-control-center-randr.patch b/gnome-control-center-randr.patch
new file mode 100644 (file)
index 0000000..5276f6f
--- /dev/null
+++ b/gnome-control-center-randr.patch
@@ -0,0 +1,16 @@
+diff -urN control-center-2.3.5.orig/configure.in control-center-2.3.5/configure.in
+--- control-center-2.3.5.orig/configure.in     Thu Aug 14 23:00:28 2003
++++ control-center-2.3.5/configure.in  Thu Aug 14 23:17:06 2003
+@@ -93,10 +93,10 @@
+ AC_CHECK_LIB(Xrandr, XRRUpdateConfiguration,
+   [AC_CHECK_HEADER(X11/extensions/Xrandr.h,
+      have_randr=yes
+-     RANDR_LIBS="-lXrandr -lXrender"
++     RANDR_LIBS="-lXrandr -lXrender -lXext"
+      AC_DEFINE(HAVE_RANDR, 1, [Define if Xrandr extension is available]),
+         :, [#include <X11/Xlib.h>])], : ,
+-       -lXrandr -lXrender $x_libs)
++       -lXrandr -lXrender -lXext $x_libs)
+ AM_CONDITIONAL(HAVE_RANDR, [test $have_randr = yes])
+       
+ PKG_CHECK_MODULES(DISPLAY_CAPPLET, $COMMON_MODULES)

diff --git a/gnome-control-center-wm_properties-dir.patch b/gnome-control-center-wm_properties-dir.patch
new file mode 100644 (file)
index 0000000..68df55c
--- /dev/null
+++ b/gnome-control-center-wm_properties-dir.patch
@@ -0,0 +1,14 @@
+diff -Nuard control-center-2.4.0.orig/libwindow-settings/gnome-wm-manager.c control-center-2.4.0/libwindow-settings/gnome-wm-manager.c
+--- control-center-2.4.0.orig/libwindow-settings/gnome-wm-manager.c    2002-10-29 07:19:52.000000000 +0100
++++ control-center-2.4.0/libwindow-settings/gnome-wm-manager.c 2003-09-20 19:43:04.000000000 +0200
+@@ -230,6 +230,10 @@
+         tempdir = gnome_unconditional_datadir_file ("gnome/wm-properties/");
+         scan_wm_directory (tempdir, FALSE);
+         g_free (tempdir);
++
++        tempdir = gnome_unconditional_datadir_file ("wm-properties/");
++        scan_wm_directory (tempdir, FALSE);
++        g_free (tempdir);
+         
+       tempdir = gnome_util_home_file("wm-properties/");
+         scan_wm_directory (tempdir, TRUE);