-diff -Nru control-center-1.0.51/capplets/background-properties/Makefile.am control-center-1.0.51.new/capplets/background-properties/Makefile.am
---- control-center-1.0.51/capplets/background-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/background-properties/Makefile.am Mon Oct 11 02:55:30 1999
-@@ -20,5 +20,5 @@
- sys_DATA = background-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop
-- ln -sf $(datadir)/control-center/Desktop/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Desktop
-+ ln -sf $(datadir)/control-center/Desktop/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Desktop/background-properties.desktop
-diff -Nru control-center-1.0.51/capplets/bell-properties/Makefile.am control-center-1.0.51.new/capplets/bell-properties/Makefile.am
---- control-center-1.0.51/capplets/bell-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/bell-properties/Makefile.am Mon Oct 11 02:55:57 1999
-@@ -17,5 +17,5 @@
- sys_DATA = bell-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia
-- ln -sf $(datadir)/control-center/Multimedia/bell-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/bell-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Multimedia
-+ ln -sf $(datadir)/control-center/Multimedia/bell-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Multimedia/bell-properties.desktop
-diff -Nru control-center-1.0.51/capplets/desktop-links/Makefile.am control-center-1.0.51.new/capplets/desktop-links/Makefile.am
---- control-center-1.0.51/capplets/desktop-links/Makefile.am Wed Mar 10 01:26:40 1999
-+++ control-center-1.0.51.new/capplets/desktop-links/Makefile.am Mon Oct 11 02:55:27 1999
-@@ -4,7 +4,7 @@
- UIOptionsdir = $(ccenterdir)/UIOptions
- Peripheralsdir = $(ccenterdir)/Peripherals
+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
++paneldir = $(datadir)/applnk/Settings/GNOME
Multimediadirp = $(paneldir)/Multimedia
Desktopdirp = $(paneldir)/Desktop
UIOptionsdirp = $(paneldir)/UIOptions
-diff -Nru control-center-1.0.51/capplets/gnome-edit-properties/Makefile.am control-center-1.0.51.new/capplets/gnome-edit-properties/Makefile.am
---- control-center-1.0.51/capplets/gnome-edit-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/gnome-edit-properties/Makefile.am Mon Oct 11 02:55:48 1999
-@@ -17,5 +17,5 @@
- sys_DATA = gnome-edit-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings
-- ln -sf $(datadir)/control-center/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/gnome-edit-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings
-+ ln -sf $(datadir)/control-center/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/gnome-edit-properties.desktop
-diff -Nru control-center-1.0.51/capplets/keyboard-properties/Makefile.am control-center-1.0.51.new/capplets/keyboard-properties/Makefile.am
---- control-center-1.0.51/capplets/keyboard-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/keyboard-properties/Makefile.am Mon Oct 11 02:55:11 1999
-@@ -16,5 +16,5 @@
- sys_DATA = keyboard-properties.desktop
-
- install-data-local:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals
-- ln -sf $(datadir)/control-center/Peripherals/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Peripherals
-+ ln -sf $(datadir)/control-center/Peripherals/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Peripherals/keyboard-properties.desktop
-diff -Nru control-center-1.0.51/capplets/mime-type/Makefile.am control-center-1.0.51.new/capplets/mime-type/Makefile.am
---- control-center-1.0.51/capplets/mime-type/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/mime-type/Makefile.am Mon Oct 11 02:55:45 1999
-@@ -19,5 +19,5 @@
- sys_DATA = mime-type.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings
-- ln -sf $(datadir)/control-centermime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/mime-type.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings
-+ ln -sf $(datadir)/control-centermime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/mime-type.desktop
-diff -Nru control-center-1.0.51/capplets/mouse-properties/Makefile.am control-center-1.0.51.new/capplets/mouse-properties/Makefile.am
---- control-center-1.0.51/capplets/mouse-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/mouse-properties/Makefile.am Mon Oct 11 02:55:07 1999
-@@ -20,5 +20,5 @@
- sys_DATA = mouse-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals
-- ln -sf $(datadir)/control-center/Peripherals/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Peripherals
-+ ln -sf $(datadir)/control-center/Peripherals/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Peripherals/mouse-properties.desktop
-diff -Nru control-center-1.0.51/capplets/screensaver-properties/Makefile.am control-center-1.0.51.new/capplets/screensaver-properties/Makefile.am
---- control-center-1.0.51/capplets/screensaver-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/screensaver-properties/Makefile.am Mon Oct 11 02:55:42 1999
-@@ -27,5 +27,5 @@
- sys_DATA = screensaver-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop
-- ln -sf $(datadir)/control-center/Desktop/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Desktop
-+ ln -sf $(datadir)/control-center/Desktop/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Desktop/screensaver-properties.desktop
-diff -Nru control-center-1.0.51/capplets/session-properties/Makefile.am control-center-1.0.51.new/capplets/session-properties/Makefile.am
---- control-center-1.0.51/capplets/session-properties/Makefile.am Tue Aug 24 05:27:39 1999
-+++ control-center-1.0.51.new/capplets/session-properties/Makefile.am Mon Oct 11 02:54:59 1999
-@@ -38,7 +38,7 @@
- sys_DATA = session-properties.desktop
- endif
+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@
- if SESSION
- settings_DATA = session-properties.desktop
-diff -Nru control-center-1.0.51/capplets/sound-properties/Makefile.am control-center-1.0.51.new/capplets/sound-properties/Makefile.am
---- control-center-1.0.51/capplets/sound-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/sound-properties/Makefile.am Mon Oct 11 02:55:39 1999
-@@ -18,5 +18,5 @@
- sys_DATA = sound-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia
-- ln -sf $(datadir)/control-center/Multimedia/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Multimedia
-+ ln -sf $(datadir)/control-center/Multimedia/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Multimedia/sound-properties.desktop
-diff -Nru control-center-1.0.51/capplets/theme-switcher/Makefile.am control-center-1.0.51.new/capplets/theme-switcher/Makefile.am
---- control-center-1.0.51/capplets/theme-switcher/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/theme-switcher/Makefile.am Mon Oct 11 02:54:55 1999
-@@ -28,5 +28,5 @@
- sys_DATA = theme-selector.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop
-- ln -sf $(datadir)/control-center/Desktop/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/Desktop
-+ ln -sf $(datadir)/control-center/Desktop/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/Desktop/theme-selector.desktop
-diff -Nru control-center-1.0.51/capplets/ui-properties/Makefile.am control-center-1.0.51.new/capplets/ui-properties/Makefile.am
---- control-center-1.0.51/capplets/ui-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/ui-properties/Makefile.am Mon Oct 11 02:55:37 1999
-@@ -27,7 +27,7 @@
- mdi.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions
-- ln -sf $(datadir)/control-center/UIOptions/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop
-- ln -sf $(datadir)/control-center/UIOptions/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop
-- ln -sf $(datadir)/control-center/UIOptions/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings/UIOptions
-+ ln -sf $(datadir)/control-center/UIOptions/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/UIOptions/application.desktop
-+ ln -sf $(datadir)/control-center/UIOptions/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/UIOptions/dialogs.desktop
-+ ln -sf $(datadir)/control-center/UIOptions/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/UIOptions/mdi.desktop
-diff -Nru control-center-1.0.51/capplets/url-properties/Makefile.am control-center-1.0.51.new/capplets/url-properties/Makefile.am
---- control-center-1.0.51/capplets/url-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/url-properties/Makefile.am Mon Oct 11 02:54:52 1999
-@@ -21,5 +21,5 @@
- sys_DATA = url-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings
-- ln -sf $(datadir)/control-center/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/url-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings
-+ ln -sf $(datadir)/control-center/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/url-properties.desktop
-diff -Nru control-center-1.0.51/capplets/wm-properties/Makefile.am control-center-1.0.51.new/capplets/wm-properties/Makefile.am
---- control-center-1.0.51/capplets/wm-properties/Makefile.am Mon Oct 11 02:53:34 1999
-+++ control-center-1.0.51.new/capplets/wm-properties/Makefile.am Mon Oct 11 02:55:33 1999
-@@ -24,5 +24,5 @@
- sys_DATA = wm-properties.desktop
-
- install-data-hook:
-- $(mkinstalldirs) $(DESTDIR)$(datadir)/gnome/apps/Settings
-- ln -sf $(datadir)/control-center/Desktop/wm-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktopwm-properties.desktop
-+ $(mkinstalldirs) $(DESTDIR)$(datadir)/applnk/Settings
-+ ln -sf $(datadir)/control-center/Desktop/wm-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/Desktopwm-properties.desktop
-diff -Nru control-center-1.0.51/control-center/Makefile.am control-center-1.0.51.new/control-center/Makefile.am
---- control-center-1.0.51/control-center/Makefile.am Wed Sep 29 00:26:00 1999
-+++ control-center-1.0.51.new/control-center/Makefile.am Mon Oct 11 02:56:22 1999
-@@ -40,7 +40,7 @@
-
- EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA)
+ 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_DATA = gnomecc.desktop
+ 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)
- ## Put `exec' in the name because this should be installed by
+--- 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
projects / packages / control-center.git / blobdiff