]>
Commit | Line | Data |
---|---|---|
6eaa7fd5 JB |
1 | diff -Nur nautilus-1.0.6.orig/Makefile.am nautilus-1.0.6/Makefile.am |
2 | --- nautilus-1.0.6.orig/Makefile.am Tue Nov 13 11:26:25 2001 | |
3 | +++ nautilus-1.0.6/Makefile.am Tue Nov 13 11:29:06 2001 | |
4 | @@ -1,6 +1,7 @@ | |
5 | include $(top_srcdir)/Makefile.shared | |
6 | ||
7 | -@XML_I18N_MERGE_DESKTOP_RULE@ | |
8 | +@XML_I18N_MERGE_DESKTOP_RULE1@ | |
9 | +@XML_I18N_MERGE_DESKTOP_RULE2@ | |
10 | ||
11 | DESKTOP_IN_FILES=nautilus.desktop.in nautilus-help.desktop.in | |
12 | DESKTOP_FILES=$(DESKTOP_IN_FILES:.desktop.in=.desktop) | |
13 | diff -Nur nautilus-1.0.6.orig/components/adapter/Makefile.am nautilus-1.0.6/components/adapter/Makefile.am | |
14 | --- nautilus-1.0.6.orig/components/adapter/Makefile.am Sat Sep 1 00:19:05 2001 | |
15 | +++ nautilus-1.0.6/components/adapter/Makefile.am Tue Nov 13 11:32:04 2001 | |
16 | @@ -14,7 +14,8 @@ | |
17 | ||
18 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
19 | ||
20 | -@XML_I18N_MERGE_OAF_RULE@ | |
21 | +@XML_I18N_MERGE_OAF_RULE1@ | |
22 | +@XML_I18N_MERGE_OAF_RULE2@ | |
23 | ||
24 | bin_PROGRAMS = \ | |
25 | nautilus-adapter \ | |
26 | diff -Nur nautilus-1.0.6.orig/components/hardware/Makefile.am nautilus-1.0.6/components/hardware/Makefile.am | |
27 | --- nautilus-1.0.6.orig/components/hardware/Makefile.am Fri May 4 05:12:42 2001 | |
28 | +++ nautilus-1.0.6/components/hardware/Makefile.am Tue Nov 13 11:32:17 2001 | |
29 | @@ -17,7 +17,8 @@ | |
30 | ||
31 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
32 | ||
33 | -@XML_I18N_MERGE_OAF_RULE@ | |
34 | +@XML_I18N_MERGE_OAF_RULE1@ | |
35 | +@XML_I18N_MERGE_OAF_RULE2@ | |
36 | ||
37 | bin_PROGRAMS = \ | |
38 | nautilus-hardware-view | |
39 | diff -Nur nautilus-1.0.6.orig/components/help/Makefile.am nautilus-1.0.6/components/help/Makefile.am | |
40 | --- nautilus-1.0.6.orig/components/help/Makefile.am Thu Nov 8 02:52:08 2001 | |
41 | +++ nautilus-1.0.6/components/help/Makefile.am Tue Nov 13 11:32:41 2001 | |
42 | @@ -62,7 +62,8 @@ | |
43 | $(NULL) | |
44 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
45 | ||
46 | -@XML_I18N_MERGE_OAF_RULE@ | |
47 | +@XML_I18N_MERGE_OAF_RULE1@ | |
48 | +@XML_I18N_MERGE_OAF_RULE2@ | |
49 | ||
50 | ||
51 | EXTRA_DIST=pages.map $(oaf_in_files) $(oaf_DATA) $(modulesconf_DATA) $(hyperbola_DATA) $(ui_DATA) | |
52 | diff -Nur nautilus-1.0.6.orig/components/history/Makefile.am nautilus-1.0.6/components/history/Makefile.am | |
53 | --- nautilus-1.0.6.orig/components/history/Makefile.am Fri May 4 05:14:26 2001 | |
54 | +++ nautilus-1.0.6/components/history/Makefile.am Tue Nov 13 11:32:55 2001 | |
55 | @@ -24,7 +24,8 @@ | |
56 | ||
57 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
58 | ||
59 | -@XML_I18N_MERGE_OAF_RULE@ | |
60 | +@XML_I18N_MERGE_OAF_RULE1@ | |
61 | +@XML_I18N_MERGE_OAF_RULE2@ | |
62 | ||
63 | EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) | |
64 | ||
65 | diff -Nur nautilus-1.0.6.orig/components/image-viewer/Makefile.am nautilus-1.0.6/components/image-viewer/Makefile.am | |
66 | --- nautilus-1.0.6.orig/components/image-viewer/Makefile.am Sat Sep 1 00:19:05 2001 | |
67 | +++ nautilus-1.0.6/components/image-viewer/Makefile.am Tue Nov 13 11:33:20 2001 | |
68 | @@ -26,6 +26,7 @@ | |
69 | ||
70 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
71 | ||
72 | -@XML_I18N_MERGE_OAF_RULE@ | |
73 | +@XML_I18N_MERGE_OAF_RULE1@ | |
74 | +@XML_I18N_MERGE_OAF_RULE2@ | |
75 | ||
76 | EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) | |
77 | diff -Nur nautilus-1.0.6.orig/components/loser/content/Makefile.am nautilus-1.0.6/components/loser/content/Makefile.am | |
78 | --- nautilus-1.0.6.orig/components/loser/content/Makefile.am Sat Sep 1 00:19:06 2001 | |
79 | +++ nautilus-1.0.6/components/loser/content/Makefile.am Tue Nov 13 11:33:43 2001 | |
80 | @@ -31,6 +31,7 @@ | |
81 | $(NULL) | |
82 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
83 | ||
84 | -@XML_I18N_MERGE_OAF_RULE@ | |
85 | +@XML_I18N_MERGE_OAF_RULE1@ | |
86 | +@XML_I18N_MERGE_OAF_RULE2@ | |
87 | ||
88 | EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA) | |
89 | diff -Nur nautilus-1.0.6.orig/components/loser/sidebar/Makefile.am nautilus-1.0.6/components/loser/sidebar/Makefile.am | |
90 | --- nautilus-1.0.6.orig/components/loser/sidebar/Makefile.am Sat Sep 1 00:19:06 2001 | |
91 | +++ nautilus-1.0.6/components/loser/sidebar/Makefile.am Tue Nov 13 11:33:57 2001 | |
92 | @@ -31,6 +31,7 @@ | |
93 | $(NULL) | |
94 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
95 | ||
96 | -@XML_I18N_MERGE_OAF_RULE@ | |
97 | +@XML_I18N_MERGE_OAF_RULE1@ | |
98 | +@XML_I18N_MERGE_OAF_RULE2@ | |
99 | ||
100 | EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(ui_DATA) | |
101 | diff -Nur nautilus-1.0.6.orig/components/mozilla/Makefile.am nautilus-1.0.6/components/mozilla/Makefile.am | |
102 | --- nautilus-1.0.6.orig/components/mozilla/Makefile.am Tue Oct 9 23:09:16 2001 | |
103 | +++ nautilus-1.0.6/components/mozilla/Makefile.am Tue Nov 13 11:36:32 2001 | |
104 | @@ -55,7 +55,8 @@ | |
105 | ||
106 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
107 | ||
108 | -@XML_I18N_MERGE_OAF_RULE@ | |
109 | +@XML_I18N_MERGE_OAF_RULE1@ | |
110 | +@XML_I18N_MERGE_OAF_RULE2@ | |
111 | ||
112 | uidir = $(datadir)/gnome/ui | |
113 | ui_DATA = \ | |
114 | diff -Nur nautilus-1.0.6.orig/components/music/Makefile.am nautilus-1.0.6/components/music/Makefile.am | |
115 | --- nautilus-1.0.6.orig/components/music/Makefile.am Wed Aug 15 20:55:16 2001 | |
116 | +++ nautilus-1.0.6/components/music/Makefile.am Tue Nov 13 11:34:11 2001 | |
117 | @@ -70,7 +70,8 @@ | |
118 | ||
119 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
120 | ||
121 | -@XML_I18N_MERGE_OAF_RULE@ | |
122 | +@XML_I18N_MERGE_OAF_RULE1@ | |
123 | +@XML_I18N_MERGE_OAF_RULE2@ | |
124 | ||
125 | EXTRA_DIST=$(oaf_DATA) $(oaf_in_files) $(platform_source) \ | |
126 | configure.c \ | |
127 | diff -Nur nautilus-1.0.6.orig/components/news/Makefile.am nautilus-1.0.6/components/news/Makefile.am | |
128 | --- nautilus-1.0.6.orig/components/news/Makefile.am Sun Aug 26 21:01:10 2001 | |
129 | +++ nautilus-1.0.6/components/news/Makefile.am Tue Nov 13 11:34:29 2001 | |
130 | @@ -32,7 +32,8 @@ | |
131 | $(NULL) | |
132 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
133 | ||
134 | -@XML_I18N_MERGE_OAF_RULE@ | |
135 | +@XML_I18N_MERGE_OAF_RULE1@ | |
136 | +@XML_I18N_MERGE_OAF_RULE2@ | |
137 | ||
138 | EXTRA_DIST= \ | |
139 | $(nautilus_DATA) \ | |
140 | diff -Nur nautilus-1.0.6.orig/components/notes/Makefile.am nautilus-1.0.6/components/notes/Makefile.am | |
141 | --- nautilus-1.0.6.orig/components/notes/Makefile.am Fri May 4 05:14:30 2001 | |
142 | +++ nautilus-1.0.6/components/notes/Makefile.am Tue Nov 13 11:34:39 2001 | |
143 | @@ -23,7 +23,8 @@ | |
144 | $(NULL) | |
145 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
146 | ||
147 | -@XML_I18N_MERGE_OAF_RULE@ | |
148 | +@XML_I18N_MERGE_OAF_RULE1@ | |
149 | +@XML_I18N_MERGE_OAF_RULE2@ | |
150 | ||
151 | EXTRA_DIST= \ | |
152 | $(oaf_DATA)\ | |
153 | diff -Nur nautilus-1.0.6.orig/components/sample/Makefile.am nautilus-1.0.6/components/sample/Makefile.am | |
154 | --- nautilus-1.0.6.orig/components/sample/Makefile.am Sat Sep 1 00:19:07 2001 | |
155 | +++ nautilus-1.0.6/components/sample/Makefile.am Tue Nov 13 11:34:53 2001 | |
156 | @@ -38,6 +38,7 @@ | |
157 | $(NULL) | |
158 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
159 | ||
160 | -@XML_I18N_MERGE_OAF_RULE@ | |
161 | +@XML_I18N_MERGE_OAF_RULE1@ | |
162 | +@XML_I18N_MERGE_OAF_RULE2@ | |
163 | ||
164 | EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) | |
165 | diff -Nur nautilus-1.0.6.orig/components/text/Makefile.am nautilus-1.0.6/components/text/Makefile.am | |
166 | --- nautilus-1.0.6.orig/components/text/Makefile.am Fri May 4 05:14:31 2001 | |
167 | +++ nautilus-1.0.6/components/text/Makefile.am Tue Nov 13 11:35:07 2001 | |
168 | @@ -33,7 +33,8 @@ | |
169 | $(NULL) | |
170 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
171 | ||
172 | -@XML_I18N_MERGE_OAF_RULE@ | |
173 | +@XML_I18N_MERGE_OAF_RULE1@ | |
174 | +@XML_I18N_MERGE_OAF_RULE2@ | |
175 | ||
176 | EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) $(ui_DATA) | |
177 | ||
178 | diff -Nur nautilus-1.0.6.orig/components/throbber/Makefile.am nautilus-1.0.6/components/throbber/Makefile.am | |
179 | --- nautilus-1.0.6.orig/components/throbber/Makefile.am Wed Jun 27 01:51:51 2001 | |
180 | +++ nautilus-1.0.6/components/throbber/Makefile.am Tue Nov 13 11:35:20 2001 | |
181 | @@ -28,7 +28,8 @@ | |
182 | $(NULL) | |
183 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
184 | ||
185 | -@XML_I18N_MERGE_OAF_RULE@ | |
186 | +@XML_I18N_MERGE_OAF_RULE1@ | |
187 | +@XML_I18N_MERGE_OAF_RULE2@ | |
188 | ||
189 | EXTRA_DIST = \ | |
190 | $(oaf_in_files) \ | |
191 | diff -Nur nautilus-1.0.6.orig/components/tree/Makefile.am nautilus-1.0.6/components/tree/Makefile.am | |
192 | --- nautilus-1.0.6.orig/components/tree/Makefile.am Tue Nov 13 11:26:25 2001 | |
193 | +++ nautilus-1.0.6/components/tree/Makefile.am Tue Nov 13 11:36:20 2001 | |
194 | @@ -38,7 +38,8 @@ | |
195 | oaf_in_files = Nautilus_View_tree.oaf.in | |
196 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
197 | ||
198 | -@XML_I18N_MERGE_OAF_RULE@ | |
199 | +@XML_I18N_MERGE_OAF_RULE1@ | |
200 | +@XML_I18N_MERGE_OAF_RULE2@ | |
201 | ||
202 | EXTRA_DIST = $(oaf_in_files) $(oaf_DATA) | |
203 | ||
204 | diff -Nur nautilus-1.0.6.orig/data/Makefile.am nautilus-1.0.6/data/Makefile.am | |
205 | --- nautilus-1.0.6.orig/data/Makefile.am Tue Nov 13 11:26:25 2001 | |
206 | +++ nautilus-1.0.6/data/Makefile.am Tue Nov 13 11:29:28 2001 | |
207 | @@ -1,7 +1,9 @@ | |
208 | NULL= | |
209 | ||
210 | -@XML_I18N_MERGE_DESKTOP_RULE@ | |
211 | -@XML_I18N_MERGE_DIRECTORY_RULE@ | |
212 | +@XML_I18N_MERGE_DESKTOP_RULE1@ | |
213 | +@XML_I18N_MERGE_DESKTOP_RULE2@ | |
214 | +@XML_I18N_MERGE_DIRECTORY_RULE1@ | |
215 | +@XML_I18N_MERGE_DIRECTORY_RULE2@ | |
216 | ||
217 | DESKTOP_IN_FILES= favorites.desktop.in \ | |
218 | programs.desktop.in \ | |
219 | diff -Nur nautilus-1.0.6.orig/src/Makefile.am nautilus-1.0.6/src/Makefile.am | |
220 | --- nautilus-1.0.6.orig/src/Makefile.am Tue Oct 9 23:10:20 2001 | |
221 | +++ nautilus-1.0.6/src/Makefile.am Tue Nov 13 11:29:45 2001 | |
222 | @@ -125,7 +125,8 @@ | |
223 | oaf_in_files = Nautilus_shell.oaf.in | |
224 | oaf_DATA = $(oaf_in_files:.oaf.in=.oaf) | |
225 | ||
226 | -@XML_I18N_MERGE_OAF_RULE@ | |
227 | +@XML_I18N_MERGE_OAF_RULE1@ | |
228 | +@XML_I18N_MERGE_OAF_RULE2@ | |
229 | ||
230 | uidir = $(datadir)/gnome/ui | |
231 | ui_DATA = \ |