1 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
2 --- control-center-1.4.0.1.org/capplets/background-properties/Makefile.am Sun Apr 1 18:49:14 2001
3 +++ control-center-1.4.0.1/capplets/background-properties/Makefile.am Sun Apr 1 18:52:37 2001
5 @XML_I18N_MERGE_DESKTOP_RULE@
8 - $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
9 + $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
10 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
11 --- control-center-1.4.0.1.org/capplets/desktop-links/Makefile.am Sun Apr 1 18:49:14 2001
12 +++ control-center-1.4.0.1/capplets/desktop-links/Makefile.am Sun Apr 1 18:52:37 2001
14 Sessiondir = $(ccenterdir)/Session
15 Documentsdir = $(ccenterdir)/Documents
17 -paneldir = $(datadir)/gnome/apps/Settings
18 +paneldir = $(datadir)/applnk/Settings/GNOME
19 Multimediadirp = $(paneldir)/Multimedia
20 Desktopdirp = $(paneldir)/Desktop
21 UIOptionsdirp = $(paneldir)/UIOptions
22 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
23 --- control-center-1.4.0.1.org/capplets/file-types/Makefile.am Sun Apr 1 18:49:14 2001
24 +++ control-center-1.4.0.1/capplets/file-types/Makefile.am Sun Apr 1 18:54:13 2001
26 sys_in_files = file-types-capplet.desktop.in
27 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
29 -settingsdir = $(datadir)/gnome/apps/Settings
30 +settingsdir = $(datadir)/applnk/Settings
31 settings_DATA = $(sys_DATA)
33 @XML_I18N_MERGE_DESKTOP_RULE@
34 diff -urN control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am
35 --- control-center-1.4.0.1.org/capplets/gnome-edit-properties/Makefile.am Sun Apr 1 18:49:14 2001
36 +++ control-center-1.4.0.1/capplets/gnome-edit-properties/Makefile.am Sun Apr 1 18:52:37 2001
38 @XML_I18N_MERGE_DESKTOP_RULE@
41 - $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
42 + $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
43 diff -urN control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am
44 --- control-center-1.4.0.1.org/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:49:14 2001
45 +++ control-center-1.4.0.1/capplets/keyboard-properties/Makefile.am Sun Apr 1 18:52:37 2001
47 @XML_I18N_MERGE_DESKTOP_RULE@
50 - $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
51 + $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
52 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
53 --- control-center-1.4.0.1.org/capplets/mouse-properties/Makefile.am Sun Apr 1 18:49:14 2001
54 +++ control-center-1.4.0.1/capplets/mouse-properties/Makefile.am Sun Apr 1 18:52:39 2001
56 @XML_I18N_MERGE_DESKTOP_RULE@
59 - $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
60 + $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
61 diff -urN control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am
62 --- control-center-1.4.0.1.org/capplets/screensaver-properties/Makefile.am Sun Apr 1 18:49:13 2001
63 +++ control-center-1.4.0.1/capplets/screensaver-properties/Makefile.am Sun Apr 1 18:52:39 2001
65 @XML_I18N_MERGE_DESKTOP_RULE@
68 - $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
69 + $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
70 diff -urN control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am control-center-1.4.0.1/capplets/sound-properties/Makefile.am
71 --- control-center-1.4.0.1.org/capplets/sound-properties/Makefile.am Sun Apr 1 18:49:14 2001
72 +++ control-center-1.4.0.1/capplets/sound-properties/Makefile.am Sun Apr 1 18:52:39 2001
74 @XML_I18N_MERGE_DESKTOP_RULE@
77 - $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
78 + $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
79 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
80 --- control-center-1.4.0.1.org/capplets/theme-switcher/Makefile.am Sun Apr 1 18:49:14 2001
81 +++ control-center-1.4.0.1/capplets/theme-switcher/Makefile.am Sun Apr 1 18:52:39 2001
83 @XML_I18N_MERGE_DESKTOP_RULE@
86 - $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
87 + $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
88 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
89 --- control-center-1.4.0.1.org/capplets/url-properties/Makefile.am Sun Apr 1 18:49:14 2001
90 +++ control-center-1.4.0.1/capplets/url-properties/Makefile.am Sun Apr 1 18:52:39 2001
92 @XML_I18N_MERGE_DESKTOP_RULE@
95 - $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
96 + $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
97 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
98 --- control-center-1.4.0.1.org/capplets/wm-properties/Makefile.am Sun Apr 1 18:49:14 2001
99 +++ control-center-1.4.0.1/capplets/wm-properties/Makefile.am Sun Apr 1 18:55:37 2001
101 sys_in_files = wm-properties.desktop.in
102 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
104 -Setdir = $(datadir)/gnome/apps/Settings/Desktop
105 +Setdir = $(datadir)/applnk/Settings/Desktop
107 Set_DATA = $(sys_DATA)
109 diff -urN control-center-1.4.0.1.org/control-center/Makefile.am control-center-1.4.0.1/control-center/Makefile.am
110 --- control-center-1.4.0.1.org/control-center/Makefile.am Sun Apr 1 18:49:15 2001
111 +++ control-center-1.4.0.1/control-center/Makefile.am Sun Apr 1 18:56:01 2001
114 EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
116 -sysdir = $(datadir)/gnome/apps/Settings
117 +sysdir = $(datadir)/applnk/Settings
118 sys_in_files = gnomecc.desktop.in
119 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
120 @XML_I18N_MERGE_DESKTOP_RULE@
121 diff -urN control-center-1.4.0.1.org/control-center-applnk.patch control-center-1.4.0.1/control-center-applnk.patch
122 --- control-center-1.4.0.1.org/control-center-applnk.patch Thu Jan 1 01:00:00 1970
123 +++ control-center-1.4.0.1/control-center-applnk.patch Sun Apr 1 18:46:58 2001
125 +diff -Nru control-center-1.2.3/capplets/background-properties/Makefile.am control-center-1.2.3.new/capplets/background-properties/Makefile.am
126 +--- control-center-1.2.3/capplets/background-properties/Makefile.am Tue Feb 20 02:32:44 2001
127 ++++ control-center-1.2.3.new/capplets/background-properties/Makefile.am Tue Feb 20 02:33:18 2001
129 + sys_DATA = background-properties.desktop
131 + install-data-local:
132 +- $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/background-properties.desktop
133 ++ $(INSTALL_DATA) $(srcdir)/background-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/background-properties.desktop
134 +diff -Nru control-center-1.2.3/capplets/desktop-links/Makefile.am control-center-1.2.3.new/capplets/desktop-links/Makefile.am
135 +--- control-center-1.2.3/capplets/desktop-links/Makefile.am Tue Feb 20 02:32:44 2001
136 ++++ control-center-1.2.3.new/capplets/desktop-links/Makefile.am Tue Feb 20 02:33:37 2001
138 + Sessiondir = $(ccenterdir)/Session
139 + Documentsdir = $(ccenterdir)/Documents
141 +-paneldir = $(datadir)/gnome/apps/Settings
142 ++paneldir = $(datadir)/applnk/Settings/GNOME
143 + Multimediadirp = $(paneldir)/Multimedia
144 + Desktopdirp = $(paneldir)/Desktop
145 + UIOptionsdirp = $(paneldir)/UIOptions
146 +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
147 +--- control-center-1.2.3/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:32:44 2001
148 ++++ control-center-1.2.3.new/capplets/gnome-edit-properties/Makefile.am Tue Feb 20 02:33:59 2001
150 + sys_DATA = gnome-edit-properties.desktop
152 + install-data-local:
153 +- $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/gnome-edit-properties.desktop
154 ++ $(INSTALL_DATA) $(srcdir)/gnome-edit-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/gnome-edit-properties.desktop
155 +diff -Nru control-center-1.2.3/capplets/keyboard-properties/Makefile.am control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am
156 +--- control-center-1.2.3/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:32:44 2001
157 ++++ control-center-1.2.3.new/capplets/keyboard-properties/Makefile.am Tue Feb 20 02:34:28 2001
159 + sys_DATA = keyboard-properties.desktop
161 + install-data-local:
162 +- $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/keyboard-properties.desktop
163 ++ $(INSTALL_DATA) $(srcdir)/keyboard-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/keyboard-properties.desktop
164 +diff -Nru control-center-1.2.3/capplets/mime-type/Makefile.am control-center-1.2.3.new/capplets/mime-type/Makefile.am
165 +--- control-center-1.2.3/capplets/mime-type/Makefile.am Tue Feb 20 02:32:44 2001
166 ++++ control-center-1.2.3.new/capplets/mime-type/Makefile.am Tue Feb 20 02:34:42 2001
168 + sys_DATA = mime-type.desktop
170 + install-data-local:
171 +- $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/mime-type.desktop
172 ++ $(INSTALL_DATA) $(srcdir)/mime-type.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/mime-type.desktop
173 +diff -Nru control-center-1.2.3/capplets/mouse-properties/Makefile.am control-center-1.2.3.new/capplets/mouse-properties/Makefile.am
174 +--- control-center-1.2.3/capplets/mouse-properties/Makefile.am Tue Feb 20 02:32:44 2001
175 ++++ control-center-1.2.3.new/capplets/mouse-properties/Makefile.am Tue Feb 20 02:34:57 2001
177 + sys_DATA = mouse-properties.desktop
179 + install-data-local:
180 +- $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Peripherals/mouse-properties.desktop
181 ++ $(INSTALL_DATA) $(srcdir)/mouse-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Peripherals/mouse-properties.desktop
182 +diff -Nru control-center-1.2.3/capplets/screensaver-properties/Makefile.am control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am
183 +--- control-center-1.2.3/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:32:44 2001
184 ++++ control-center-1.2.3.new/capplets/screensaver-properties/Makefile.am Tue Feb 20 02:35:13 2001
186 + sys_DATA = screensaver-properties.desktop
188 + install-data-local:
189 +- $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/screensaver-properties.desktop
190 ++ $(INSTALL_DATA) $(srcdir)/screensaver-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/screensaver-properties.desktop
191 +diff -Nru control-center-1.2.3/capplets/sound-properties/Makefile.am control-center-1.2.3.new/capplets/sound-properties/Makefile.am
192 +--- control-center-1.2.3/capplets/sound-properties/Makefile.am Tue Feb 20 02:32:44 2001
193 ++++ control-center-1.2.3.new/capplets/sound-properties/Makefile.am Tue Feb 20 02:35:41 2001
195 + sys_DATA = sound-properties.desktop
197 + install-data-local:
198 +- $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Multimedia/sound-properties.desktop
199 ++ $(INSTALL_DATA) $(srcdir)/sound-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Multimedia/sound-properties.desktop
200 +diff -Nru control-center-1.2.3/capplets/theme-switcher/Makefile.am control-center-1.2.3.new/capplets/theme-switcher/Makefile.am
201 +--- control-center-1.2.3/capplets/theme-switcher/Makefile.am Tue Feb 20 02:32:44 2001
202 ++++ control-center-1.2.3.new/capplets/theme-switcher/Makefile.am Tue Feb 20 02:35:55 2001
204 + sys_DATA = theme-selector.desktop
206 + install-data-local:
207 +- $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Desktop/theme-selector.desktop
208 ++ $(INSTALL_DATA) $(srcdir)/theme-selector.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Desktop/theme-selector.desktop
209 +diff -Nru control-center-1.2.3/capplets/ui-properties/Makefile.am control-center-1.2.3.new/capplets/ui-properties/Makefile.am
210 +--- control-center-1.2.3/capplets/ui-properties/Makefile.am Tue Feb 20 02:32:44 2001
211 ++++ control-center-1.2.3.new/capplets/ui-properties/Makefile.am Tue Feb 20 02:36:16 2001
215 + install-data-local:
216 +- $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/application.desktop
217 +- $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/dialogs.desktop
218 +- $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/UIOptions/mdi.desktop
219 ++ $(INSTALL_DATA) $(srcdir)/application.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/application.desktop
220 ++ $(INSTALL_DATA) $(srcdir)/dialogs.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/dialogs.desktop
221 ++ $(INSTALL_DATA) $(srcdir)/mdi.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/UIOptions/mdi.desktop
222 +diff -Nru control-center-1.2.3/capplets/url-properties/Makefile.am control-center-1.2.3.new/capplets/url-properties/Makefile.am
223 +--- control-center-1.2.3/capplets/url-properties/Makefile.am Tue Feb 20 02:32:44 2001
224 ++++ control-center-1.2.3.new/capplets/url-properties/Makefile.am Tue Feb 20 02:36:28 2001
226 + sys_DATA = url-properties.desktop
228 + install-data-local:
229 +- $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/gnome/apps/Settings/Documents/url-properties.desktop
230 ++ $(INSTALL_DATA) $(srcdir)/url-properties.desktop $(DESTDIR)$(datadir)/applnk/Settings/GNOME/Documents/url-properties.desktop
231 +diff -Nru control-center-1.2.3/capplets/wm-properties/Makefile.am control-center-1.2.3.new/capplets/wm-properties/Makefile.am
232 +--- control-center-1.2.3/capplets/wm-properties/Makefile.am Tue Feb 20 02:32:44 2001
233 ++++ control-center-1.2.3.new/capplets/wm-properties/Makefile.am Tue Feb 20 02:36:46 2001
235 + sysdir = $(datadir)/control-center/Desktop
236 + sys_DATA = wm-properties.desktop
238 +-Setdir = $(datadir)/gnome/apps/Settings/Desktop
239 ++Setdir = $(datadir)/applnk/Settings/GNOME/Desktop
240 + Set_DATA = wm-properties.desktop
241 +diff -Nru control-center-1.2.3/control-center/Makefile.am control-center-1.2.3.new/control-center/Makefile.am
242 +--- control-center-1.2.3/control-center/Makefile.am Tue Feb 20 02:32:44 2001
243 ++++ control-center-1.2.3.new/control-center/Makefile.am Tue Feb 20 02:31:47 2001
246 + EXTRA_DIST = gnomecc.desktop cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
248 +-sysdir = $(datadir)/gnome/apps/Settings
249 ++sysdir = $(datadir)/applnk/Settings
250 + sys_DATA = gnomecc.desktop
252 + ## Put `exec' in the name because this should be installed by
253 --- control-center-1.4.0.3/capplets/wm-properties/Makefile.am~ Fri Feb 8 17:48:27 2002
254 +++ control-center-1.4.0.3/capplets/wm-properties/Makefile.am Fri Feb 8 17:48:27 2002
256 sys_in_files = wm-properties.desktop.in
257 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
259 -Setdir = $(datadir)/applnk/Settings/Desktop
260 +Setdir = $(datadir)/applnk/Settings/GNOME/Desktop
262 Set_DATA = $(sys_DATA)
264 --- control-center-1.4.0.3/capplets/file-types/Makefile.am~ Fri Feb 8 17:49:51 2002
265 +++ control-center-1.4.0.3/capplets/file-types/Makefile.am Fri Feb 8 17:49:51 2002
267 sys_in_files = file-types-capplet.desktop.in
268 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
270 -settingsdir = $(datadir)/applnk/Settings
271 +settingsdir = $(datadir)/applnk/GNOME/Settings
272 settings_DATA = $(sys_DATA)
274 @XML_I18N_MERGE_DESKTOP_RULE@
275 --- control-center-1.4.0.3/control-center/Makefile.am~ Fri Feb 8 17:52:16 2002
276 +++ control-center-1.4.0.3/control-center/Makefile.am Fri Feb 8 17:52:16 2002
279 EXTRA_DIST = gnomecc.desktop.in cappletConf.sh.in $(appicon_DATA) $(splash_DATA)
281 -sysdir = $(datadir)/applnk/Settings
282 +sysdir = $(datadir)/applnk/Settings/GNOME
283 sys_in_files = gnomecc.desktop.in
284 sys_DATA = $(sys_in_files:.desktop.in=.desktop)
285 @XML_I18N_MERGE_DESKTOP_RULE@