]> git.pld-linux.org Git - packages/control-center.git/blame - control-center-pixmaps-dirs.patch
projects / packages / control-center.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
This commit was manufactured by cvs2git to create branch 'DEVEL'.
[packages/control-center.git] / control-center-pixmaps-dirs.patch
CommitLineData
956d6a8a 1diff -Nuard control-center-2.4.0.orig/capplets/accessibility/at-properties/Makefile.am control-center-2.4.0/capplets/accessibility/at-properties/Makefile.am
2--- control-center-2.4.0.orig/capplets/accessibility/at-properties/Makefile.am 2003-06-25 19:37:32.000000000 +0200
3+++ control-center-2.4.0/capplets/accessibility/at-properties/Makefile.am 2003-11-09 01:23:35.000000000 +0100
4@@ -9,16 +9,12 @@
5
6 @INTLTOOL_DESKTOP_RULE@
7
8-iconsdir = $(GNOMECC_ICONS_DIR)
9-icons_DATA = at-enable-capplet.png
10-
11 desktopdir = $(GNOMECC_DESKTOP_DIR)
12 Desktop_in_files = at-properties.desktop.in
13 desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
14
15 pixmapdir = $(GNOMECC_PIXMAPS_DIR)
16 pixmap_DATA = \
17- at-enable-capplet.png \
18 at-startup.png \
19 at-support.png
20
21@@ -33,4 +29,4 @@
22 -DGLADEDIR=\""$(gladedir)"\" \
23 -DPIXMAPDIR=\""$(pixmapdir)"\"
24 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
25-EXTRA_DIST = $(icons_DATA) $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
26+EXTRA_DIST = $(glade_DATA) $(pixmap_DATA) $(Desktop_in_files)
27diff -Nuard control-center-2.4.0.orig/capplets/accessibility/keyboard/Makefile.am control-center-2.4.0/capplets/accessibility/keyboard/Makefile.am
28--- control-center-2.4.0.orig/capplets/accessibility/keyboard/Makefile.am 2002-06-18 20:55:04.000000000 +0200
29+++ control-center-2.4.0/capplets/accessibility/keyboard/Makefile.am 2003-11-09 00:42:04.000000000 +0100
30@@ -26,8 +26,8 @@
31 Gladedir = $(GNOMECC_GLADE_DIR)
32 Glade_DATA = gnome-accessibility-keyboard-properties.glade
33
34-iconsdir = $(GNOMECC_ICONS_DIR)
35-icons_DATA = accessibility-keyboard-capplet.png
36+#iconsdir = $(GNOMECC_ICONS_DIR)
37+#icons_DATA = accessibility-keyboard-capplet.png
38
39 desktop_iconsdir = $(datadir)/pixmaps
40 desktop_icons_DATA = accessibility-keyboard-capplet.png
41@@ -38,5 +38,5 @@
42
43 INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
44 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
45-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
46+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
47
48diff -Nuard control-center-2.4.0.orig/capplets/background/Makefile.am control-center-2.4.0/capplets/background/Makefile.am
49--- control-center-2.4.0.orig/capplets/background/Makefile.am 2002-04-02 02:27:40.000000000 +0200
50+++ control-center-2.4.0/capplets/background/Makefile.am 2003-11-09 00:41:28.000000000 +0100
51@@ -8,8 +8,8 @@
52 Gladedir = $(GNOMECC_GLADE_DIR)
53 Glade_DATA = background-properties.glade
54
55-iconsdir = $(GNOMECC_ICONS_DIR)
56-icons_DATA = background-capplet.png
57+#iconsdir = $(GNOMECC_ICONS_DIR)
58+#icons_DATA = background-capplet.png
59
60 desktop_iconsdir = $(datadir)/pixmaps
61 desktop_icons_DATA = background-capplet.png
62@@ -20,5 +20,5 @@
63
64 INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS) -I$(top_srcdir)/libbackground
65 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
66-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
67+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
68
69diff -Nuard control-center-2.4.0.orig/capplets/default-applications/Makefile.am control-center-2.4.0/capplets/default-applications/Makefile.am
70--- control-center-2.4.0.orig/capplets/default-applications/Makefile.am 2002-04-10 08:07:58.000000000 +0200
71+++ control-center-2.4.0/capplets/default-applications/Makefile.am 2003-11-09 00:24:30.000000000 +0100
72@@ -6,8 +6,8 @@
73
74 @INTLTOOL_DESKTOP_RULE@
75
76-iconsdir = $(GNOMECC_ICONS_DIR)
77-icons_DATA = default-applications-capplet.png
78+#iconsdir = $(GNOMECC_ICONS_DIR)
79+#icons_DATA = default-applications-capplet.png
80
81 desktop_iconsdir = $(datadir)/pixmaps
82 desktop_icons_DATA = default-applications-capplet.png
83@@ -21,4 +21,4 @@
84
85 INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
86 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
87-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
88+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) gnome-default-applications-properties-structs.c
89diff -Nuard control-center-2.4.0.orig/capplets/desktop-links/Makefile.am control-center-2.4.0/capplets/desktop-links/Makefile.am
90--- control-center-2.4.0.orig/capplets/desktop-links/Makefile.am 2002-12-06 11:53:21.000000000 +0100
91+++ control-center-2.4.0/capplets/desktop-links/Makefile.am 2003-11-09 01:29:07.000000000 +0100
92@@ -3,14 +3,13 @@
93
94 ## Pixmaps
95
96-pixmaps_pre = $(capplets:=-capplet.png)
97-pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
98-pixmapsdir = $(GNOMECC_ICONS_DIR)
99-
100 ##
101 ## Desktop files
102 ##
103
104+desktop_iconsdir = $(datadir)/pixmaps
105+desktop_icons_DATA = accessibility-directory.png
106+
107 desktop_files = $(capplets:=.desktop)
108 desktop_in_files = $(desktop_files:.desktop=.desktop.in)
109 desktop_in_in_files = $(desktop_files:.desktop=.desktop.in.in)
110@@ -19,10 +18,10 @@
111 desktopfiles_DATA = $(desktop_files)
112
113 CLEANFILES = $(desktop_files) $(desktop_in_files)
114-EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files) $(pixmaps_DATA)
115+EXTRA_DIST = $(desktop_in_in_files) $(groups_in_in_files)
116
117 %.desktop.in: $(srcdir)/%.desktop.in.in
118- sed s#Icon=#Icon=$(GNOMECC_ICONS_DIR)/# < $< > $@
119+ sed s#Icon=#Icon=# < $< > $@
120
121 @INTLTOOL_DESKTOP_RULE@
122
123@@ -46,6 +45,6 @@
124 Gnomecc_DATA = $(groups_files)
125
126 %.directory.in: $(srcdir)/%.directory.in.in
127- sed s#Icon=#Icon=$(pixmapsdir)/# < $< > $@
128+ sed s#Icon=#Icon=# < $< > $@
129
130 @INTLTOOL_DIRECTORY_RULE@
131diff -Nuard control-center-2.4.0.orig/capplets/display/Makefile.am control-center-2.4.0/capplets/display/Makefile.am
132--- control-center-2.4.0.orig/capplets/display/Makefile.am 2003-04-23 17:01:16.000000000 +0200
133+++ control-center-2.4.0/capplets/display/Makefile.am 2003-11-09 00:28:11.000000000 +0100
134@@ -7,8 +7,8 @@
135
136 @INTLTOOL_DESKTOP_RULE@
137
138-iconsdir = $(GNOMECC_ICONS_DIR)
139-icons_DATA = display-capplet.png
140+#iconsdir = $(GNOMECC_ICONS_DIR)
141+#icons_DATA = display-capplet.png
142
143 desktop_iconsdir = $(datadir)/pixmaps
144 desktop_icons_DATA = display-capplet.png
145@@ -23,4 +23,4 @@
146 -DPIXMAPDIR=\""$(pixmapdir)"\"
147
148 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
149-EXTRA_DIST = $(Desktop_in_files) $(icons_DATA)
150+EXTRA_DIST = $(Desktop_in_files)
151diff -Nuard control-center-2.4.0.orig/capplets/font/Makefile.am control-center-2.4.0/capplets/font/Makefile.am
152--- control-center-2.4.0.orig/capplets/font/Makefile.am 2002-07-24 19:36:30.000000000 +0200
153+++ control-center-2.4.0/capplets/font/Makefile.am 2003-11-09 00:29:04.000000000 +0100
154@@ -7,8 +7,8 @@
155
156 @INTLTOOL_DESKTOP_RULE@
157
158-iconsdir = $(GNOMECC_ICONS_DIR)
159-icons_DATA = font-capplet.png
160+#iconsdir = $(GNOMECC_ICONS_DIR)
161+#icons_DATA = font-capplet.png
162
163 pixmapdir = $(GNOMECC_PIXMAPS_DIR)
164 pixmap_DATA = \
165@@ -32,4 +32,4 @@
166 -DGLADEDIR=\""$(gladedir)"\" \
167 -DPIXMAPDIR=\""$(pixmapdir)"\"
168 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
169-EXTRA_DIST = $(Desktop_in_files) $(icons_DATA) $(glade_DATA) $(pixmap_DATA)
170+EXTRA_DIST = $(Desktop_in_files) $(glade_DATA) $(pixmap_DATA)
171diff -Nuard control-center-2.4.0.orig/capplets/keybindings/Makefile.am control-center-2.4.0/capplets/keybindings/Makefile.am
172--- control-center-2.4.0.orig/capplets/keybindings/Makefile.am 2002-08-13 20:14:39.000000000 +0200
173+++ control-center-2.4.0/capplets/keybindings/Makefile.am 2003-11-09 00:43:28.000000000 +0100
174@@ -14,8 +14,8 @@
175 Gladedir = $(GNOMECC_GLADE_DIR)
176 Glade_DATA = gnome-keybinding-properties.glade
177
178-pixmapsdir = $(datadir)/pixmaps
179-pixmaps_DATA = keyboard-shortcut.png
180+desktop_iconsdir = $(datadir)/pixmaps
181+desktop_icons_DATA = keyboard-shortcut.png
182
183 desktopdir = $(GNOMECC_DESKTOP_DIR)
184 Desktop_in_files = keybinding.desktop.in
185@@ -23,5 +23,5 @@
186
187 INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
188 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
189-EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmaps_DATA)
190+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
191
192diff -Nuard control-center-2.4.0.orig/capplets/keyboard/Makefile.am control-center-2.4.0/capplets/keyboard/Makefile.am
193--- control-center-2.4.0.orig/capplets/keyboard/Makefile.am 2002-04-10 08:08:02.000000000 +0200
194+++ control-center-2.4.0/capplets/keyboard/Makefile.am 2003-11-09 00:45:04.000000000 +0100
195@@ -11,14 +11,13 @@
196 Glade_DATA = gnome-keyboard-properties.glade
197
198 iconsdir = $(GNOMECC_PIXMAPS_DIR)
199-icons_DATA = keyboard-capplet.png \
200- keyboard-repeat.png \
201+icons_DATA = keyboard-repeat.png \
202 keyboard-cursor.png \
203 keyboard-volume.png \
204 keyboard-bell.png
205
206-pixmapsdir = $(datadir)/pixmaps
207-pixmaps_DATA = keyboard-capplet.png
208+desktop_iconsdir = $(datadir)/pixmaps
209+desktop_icons_DATA = keyboard-capplet.png
210
211 desktopdir = $(GNOMECC_DESKTOP_DIR)
212 Desktop_in_files = keyboard.desktop.in
213diff -Nuard control-center-2.4.0.orig/capplets/mouse/Makefile.am control-center-2.4.0/capplets/mouse/Makefile.am
214--- control-center-2.4.0.orig/capplets/mouse/Makefile.am 2003-01-08 08:04:42.000000000 +0100
215+++ control-center-2.4.0/capplets/mouse/Makefile.am 2003-11-09 00:45:23.000000000 +0100
216@@ -27,9 +27,6 @@
217 Gladedir = $(GNOMECC_GLADE_DIR)
218 Glade_DATA = gnome-mouse-properties.glade
219
220-iconsdir = $(GNOMECC_ICONS_DIR)
221-icons_DATA = mouse-capplet.png
222-
223 desktop_iconsdir = $(datadir)/pixmaps
224 desktop_icons_DATA = mouse-capplet.png
225
226@@ -39,4 +36,4 @@
227
228 INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
229 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
230-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
231+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files) $(pixmap_DATA) $(cursorfont_DATA)
232diff -Nuard control-center-2.4.0.orig/capplets/ui-properties/Makefile.am control-center-2.4.0/capplets/ui-properties/Makefile.am
233--- control-center-2.4.0.orig/capplets/ui-properties/Makefile.am 2002-04-10 08:08:05.000000000 +0200
234+++ control-center-2.4.0/capplets/ui-properties/Makefile.am 2003-11-09 00:46:57.000000000 +0100
235@@ -6,9 +6,6 @@
236
237 @INTLTOOL_DESKTOP_RULE@
238
239-iconsdir = $(GNOMECC_ICONS_DIR)
240-icons_DATA = behavior-capplet.png
241-
242 desktop_iconsdir = $(datadir)/pixmaps
243 desktop_icons_DATA = behavior-capplet.png
244
245@@ -19,4 +16,4 @@
246 Glade_DATA = gnome-ui-properties.glade
247 INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
248 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
249-EXTRA_DIST = $(Glade_DATA) $(icons_DATA) $(Desktop_in_files)
250+EXTRA_DIST = $(Glade_DATA) $(Desktop_in_files)
251diff -Nuard control-center-2.4.0.orig/capplets/windows/Makefile.am control-center-2.4.0/capplets/windows/Makefile.am
252--- control-center-2.4.0.orig/capplets/windows/Makefile.am 2002-10-29 07:19:51.000000000 +0100
253+++ control-center-2.4.0/capplets/windows/Makefile.am 2003-11-09 00:38:50.000000000 +0100
254@@ -14,9 +14,6 @@
255 gladedir = $(GNOMECC_GLADE_DIR)
256 glade_DATA = gnome-window-properties.glade
257
258-iconsdir = $(GNOMECC_ICONS_DIR)
259-icons_DATA = window-capplet.png
260-
261 desktop_iconsdir = $(datadir)/pixmaps
262 desktop_icons_DATA = window-capplet.png
263
264@@ -31,5 +28,5 @@
265 -DPIXMAPDIR=\""$(pixmapdir)"\"
266
267 CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
268-EXTRA_DIST = $(glade_DATA) $(icons_DATA) $(Desktop_in_files) $(pixmap_DATA)
269+EXTRA_DIST = $(glade_DATA) $(Desktop_in_files) $(pixmap_DATA)
270
271diff -Nuard control-center-2.4.0.orig/control-center/Makefile.am control-center-2.4.0/control-center/Makefile.am
272--- control-center-2.4.0.orig/control-center/Makefile.am 2003-05-07 20:55:08.000000000 +0200
273+++ control-center-2.4.0/control-center/Makefile.am 2003-11-08 23:49:14.000000000 +0100
274@@ -15,7 +15,6 @@
275
276 INCLUDES = \
277 -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
278- -DSETTINGS_DIR=\""$(GNOMECC_DESKTOP_DIR)"\" \
279 -DGNOMECC_ICONS_DIR=\""$(GNOMECC_ICONS_DIR)"\" \
280 -DPIXMAP_DIR=\""$(datadir)/pixmaps"\" \
281 -DART_DIR=\""$(splashdir)"\" \
Unnamed repository; edit this file 'description' to name the repository.
This page took 0.085238 seconds and 4 git commands to generate.