← Back to branch summary

~macslow/gnome-settings-daemon/ubuntu

« back to all changes in this revision

Viewing changes to debian/patches/06_undo_build_change.patch

  • Committer: seb128
  • Date: 2009-04-22 09:59:01 UTC
  • Revision ID: seb128@seb128-desktop-20090422095901-v3d3fdmwg7ulfn78
Tags: 2.26.1-0ubuntu1
releasing version 2.26.1-0ubuntu1

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/06_undo_build_change.patch
1
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/gnome-settings-daemon/Makefile.am gnome-settings-daemon-2.26.0.new/gnome-settings-daemon/Makefile.am
2
 
--- gnome-settings-daemon-2.26.0/gnome-settings-daemon/Makefile.am      2009-03-16 15:35:39.000000000 +0100
3
 
+++ gnome-settings-daemon-2.26.0.new/gnome-settings-daemon/Makefile.am  2009-03-18 15:34:43.000000000 +0100
4
 
@@ -11,28 +11,27 @@
5
 
        $(NULL)
6
 
 
7
 
 noinst_LTLIBRARIES =                   \
8
 
-       libgsd-plugins.la               \
9
 
+       libgsd-profile.la               \
10
 
        $(NULL)
11
 
 
12
 
-libgsd_plugins_la_SOURCES =            \
13
 
-       gnome-settings-plugin.c         \
14
 
-       gnome-settings-plugin.h         \
15
 
+libgsd_profile_la_SOURCES =            \
16
 
        gnome-settings-profile.c        \
17
 
        gnome-settings-profile.h        \
18
 
        $(NULL)
19
 
 
20
 
-libgsd_plugins_la_CPPFLAGS =           \
21
 
+libgsd_profile_la_CPPFLAGS =           \
22
 
        $(DISABLE_DEPRECATED_CFLAGS)    \
23
 
        $(NULL)
24
 
 
25
 
-libgsd_plugins_la_CFLAGS =             \
26
 
+libgsd_profile_la_CFLAGS =             \
27
 
+       $(SIMPLE_GREETER_CFLAGS)        \
28
 
        $(NULL)
29
 
 
30
 
-libgsd_plugins_la_LIBADD =             \
31
 
+libgsd_profile_la_LIBADD =             \
32
 
        $(NULL)
33
 
 
34
 
-libgsd_plugins_la_LDFLAGS =            \
35
 
-       -export-dynamic                 \
36
 
+libgsd_profile_la_LDFLAGS =    \
37
 
+       -export-dynamic         \
38
 
        $(NULL)
39
 
 
40
 
 gsddir = $(libexecdir)
41
 
@@ -60,6 +59,8 @@
42
 
        main.c                          \
43
 
        gnome-settings-manager.c        \
44
 
        gnome-settings-manager.h        \
45
 
+       gnome-settings-plugin.c         \
46
 
+       gnome-settings-plugin.h         \
47
 
        gnome-settings-plugin-info.c    \
48
 
        gnome-settings-plugin-info.h    \
49
 
        gnome-settings-module.c         \
50
 
@@ -76,7 +77,7 @@
51
 
        $(AM_LDFLAGS)
52
 
 
53
 
 gnome_settings_daemon_LDADD =          \
54
 
-       libgsd-plugins.la               \
55
 
+       libgsd-profile.la               \
56
 
        $(SETTINGS_DAEMON_LIBS)
57
 
 
58
 
 EXTRA_DIST =                           \
59
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/a11y-keyboard/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/a11y-keyboard/Makefile.am
60
 
--- gnome-settings-daemon-2.26.0/plugins/a11y-keyboard/Makefile.am      2009-03-16 15:35:39.000000000 +0100
61
 
+++ gnome-settings-daemon-2.26.0.new/plugins/a11y-keyboard/Makefile.am  2009-03-18 15:34:43.000000000 +0100
62
 
@@ -60,7 +60,6 @@
63
 
        $(NULL)
64
 
 
65
 
 liba11y_keyboard_la_LIBADD  =          \
66
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
67
 
        $(SETTINGS_PLUGIN_LIBS)         \
68
 
        $(XF86MISC_LIBS)                \
69
 
        $(LIBNOTIFY_LIBS)               \
70
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/background/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/background/Makefile.am
71
 
--- gnome-settings-daemon-2.26.0/plugins/background/Makefile.am 2009-03-16 15:35:38.000000000 +0100
72
 
+++ gnome-settings-daemon-2.26.0.new/plugins/background/Makefile.am     2009-03-18 15:34:43.000000000 +0100
73
 
@@ -20,7 +20,7 @@
74
 
        $(AM_CFLAGS)
75
 
 
76
 
 test_background_LDADD =                \
77
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
78
 
+       $(top_builddir)/gnome-settings-daemon/libgsd-profile.la \
79
 
        $(SETTINGS_PLUGIN_LIBS) \
80
 
        $(NULL)
81
 
 
82
 
@@ -50,7 +50,6 @@
83
 
        $(NULL)
84
 
 
85
 
 libbackground_la_LIBADD  =             \
86
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
87
 
        $(SETTINGS_PLUGIN_LIBS)         \
88
 
        $(NULL)
89
 
 
90
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/clipboard/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/clipboard/Makefile.am
91
 
--- gnome-settings-daemon-2.26.0/plugins/clipboard/Makefile.am  2009-03-16 15:35:39.000000000 +0100
92
 
+++ gnome-settings-daemon-2.26.0.new/plugins/clipboard/Makefile.am      2009-03-18 15:34:43.000000000 +0100
93
 
@@ -29,7 +29,6 @@
94
 
        $(NULL)
95
 
 
96
 
 libclipboard_la_LIBADD  =      \
97
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
98
 
        $(SETTINGS_PLUGIN_LIBS) \
99
 
        $(NULL)
100
 
 
101
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/dummy/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/dummy/Makefile.am
102
 
--- gnome-settings-daemon-2.26.0/plugins/dummy/Makefile.am      2009-03-16 15:35:39.000000000 +0100
103
 
+++ gnome-settings-daemon-2.26.0.new/plugins/dummy/Makefile.am  2009-03-18 15:34:43.000000000 +0100
104
 
@@ -20,7 +20,6 @@
105
 
        $(GSD_PLUGIN_LDFLAGS)
106
 
 
107
 
 libdummy_la_LIBADD  =          \
108
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
109
 
        $(SETTINGS_PLUGIN_LIBS)
110
 
 
111
 
 plugin_in_files =              \
112
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/font/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/font/Makefile.am
113
 
--- gnome-settings-daemon-2.26.0/plugins/font/Makefile.am       2009-03-16 15:35:39.000000000 +0100
114
 
+++ gnome-settings-daemon-2.26.0.new/plugins/font/Makefile.am   2009-03-18 15:34:43.000000000 +0100
115
 
@@ -23,7 +23,6 @@
116
 
        $(AM_CFLAGS)
117
 
 
118
 
 libfont_la_LDFLAGS =           \
119
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
120
 
        $(GSD_PLUGIN_LDFLAGS)   \
121
 
        $(NULL)
122
 
 
123
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/housekeeping/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/housekeeping/Makefile.am
124
 
--- gnome-settings-daemon-2.26.0/plugins/housekeeping/Makefile.am       2009-03-16 15:35:38.000000000 +0100
125
 
+++ gnome-settings-daemon-2.26.0.new/plugins/housekeeping/Makefile.am   2009-03-18 15:34:43.000000000 +0100
126
 
@@ -21,11 +21,7 @@
127
 
 
128
 
 libhousekeeping_la_LDFLAGS = $(GSD_PLUGIN_LDFLAGS)
129
 
 
130
 
-libhousekeeping_la_LIBADD =    \
131
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
132
 
-       $(SETTINGS_PLUGIN_LIBS) \
133
 
-       $(GIOUNIX_LIBS)         \
134
 
-       $(LIBNOTIFY_LIBS)
135
 
+libhousekeeping_la_LIBADD = $(SETTINGS_PLUGIN_LIBS) $(GIOUNIX_LIBS) $(LIBNOTIFY_LIBS)
136
 
 
137
 
 plugin_in_files = housekeeping.gnome-settings-plugin.in
138
 
 
139
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/keybindings/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/keybindings/Makefile.am
140
 
--- gnome-settings-daemon-2.26.0/plugins/keybindings/Makefile.am        2009-03-16 15:35:39.000000000 +0100
141
 
+++ gnome-settings-daemon-2.26.0.new/plugins/keybindings/Makefile.am    2009-03-18 15:34:43.000000000 +0100
142
 
@@ -26,7 +26,6 @@
143
 
        $(NULL)
144
 
 
145
 
 libkeybindings_la_LIBADD  =            \
146
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
147
 
        $(top_builddir)/plugins/common/libcommon.la     \
148
 
        $(SETTINGS_PLUGIN_LIBS)         \
149
 
        $(NULL)
150
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/keyboard/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/keyboard/Makefile.am
151
 
--- gnome-settings-daemon-2.26.0/plugins/keyboard/Makefile.am   2009-03-16 15:35:39.000000000 +0100
152
 
+++ gnome-settings-daemon-2.26.0.new/plugins/keyboard/Makefile.am       2009-03-18 15:34:43.000000000 +0100
153
 
@@ -36,7 +36,6 @@
154
 
        $(NULL)
155
 
 
156
 
 libkeyboard_la_LIBADD  =       \
157
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
158
 
        $(SETTINGS_PLUGIN_LIBS) \
159
 
        $(XF86MISC_LIBS)        \
160
 
        $(LIBGNOMEKBD_LIBS)     \
161
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/media-keys/Makefile.am
162
 
--- gnome-settings-daemon-2.26.0/plugins/media-keys/Makefile.am 2009-03-16 15:35:38.000000000 +0100
163
 
+++ gnome-settings-daemon-2.26.0.new/plugins/media-keys/Makefile.am     2009-03-18 15:34:43.000000000 +0100
164
 
@@ -53,7 +53,6 @@
165
 
        $(GSD_PLUGIN_LDFLAGS)
166
 
 
167
 
 libmedia_keys_la_LIBADD  =             \
168
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la         \
169
 
        $(top_builddir)/plugins/common/libcommon.la                     \
170
 
        $(top_builddir)/plugins/media-keys/cut-n-paste/libgvc.la        \
171
 
        $(SETTINGS_PLUGIN_LIBS)                                         \
172
 
@@ -116,7 +115,7 @@
173
 
        $(AM_CFLAGS)
174
 
 
175
 
 test_media_keys_LDADD = \
176
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la         \
177
 
+       $(top_builddir)/gnome-settings-daemon/libgsd-profile.la         \
178
 
        $(top_builddir)/plugins/common/libcommon.la                     \
179
 
        $(SETTINGS_DAEMON_LIBS)                 \
180
 
        $(SETTINGS_PLUGIN_LIBS)                 \
181
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/mouse/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/mouse/Makefile.am
182
 
--- gnome-settings-daemon-2.26.0/plugins/mouse/Makefile.am      2009-03-16 15:35:38.000000000 +0100
183
 
+++ gnome-settings-daemon-2.26.0.new/plugins/mouse/Makefile.am  2009-03-18 15:34:43.000000000 +0100
184
 
@@ -23,7 +23,6 @@
185
 
        $(GSD_PLUGIN_LDFLAGS)
186
 
 
187
 
 libmouse_la_LIBADD  =          \
188
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
189
 
        $(SETTINGS_PLUGIN_LIBS) \
190
 
        $(XINPUT_LIBS)
191
 
 
192
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/screensaver/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/screensaver/Makefile.am
193
 
--- gnome-settings-daemon-2.26.0/plugins/screensaver/Makefile.am        2009-03-16 15:35:38.000000000 +0100
194
 
+++ gnome-settings-daemon-2.26.0.new/plugins/screensaver/Makefile.am    2009-03-18 15:34:43.000000000 +0100
195
 
@@ -25,7 +25,6 @@
196
 
        $(NULL)
197
 
 
198
 
 libscreensaver_la_LIBADD  =            \
199
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
200
 
        $(SETTINGS_PLUGIN_LIBS) \
201
 
        $(NULL)
202
 
 
203
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/sound/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/sound/Makefile.am
204
 
--- gnome-settings-daemon-2.26.0/plugins/sound/Makefile.am      2009-03-16 15:35:38.000000000 +0100
205
 
+++ gnome-settings-daemon-2.26.0.new/plugins/sound/Makefile.am  2009-03-18 15:34:43.000000000 +0100
206
 
@@ -22,7 +22,6 @@
207
 
        $(GSD_PLUGIN_LDFLAGS)
208
 
 
209
 
 libsound_la_LIBADD = \
210
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
211
 
        $(SETTINGS_PLUGIN_LIBS) \
212
 
        $(PULSE_LIBS)
213
 
 
214
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/typing-break/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/typing-break/Makefile.am
215
 
--- gnome-settings-daemon-2.26.0/plugins/typing-break/Makefile.am       2009-03-16 15:35:39.000000000 +0100
216
 
+++ gnome-settings-daemon-2.26.0.new/plugins/typing-break/Makefile.am   2009-03-18 15:34:43.000000000 +0100
217
 
@@ -25,7 +25,6 @@
218
 
        $(NULL)
219
 
 
220
 
 libtyping_break_la_LIBADD  =           \
221
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
222
 
        $(SETTINGS_PLUGIN_LIBS) \
223
 
        $(NULL)
224
 
 
225
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/xrandr/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/xrandr/Makefile.am
226
 
--- gnome-settings-daemon-2.26.0/plugins/xrandr/Makefile.am     2009-03-16 15:35:39.000000000 +0100
227
 
+++ gnome-settings-daemon-2.26.0.new/plugins/xrandr/Makefile.am 2009-03-18 15:34:43.000000000 +0100
228
 
@@ -59,7 +59,6 @@
229
 
        $(GSD_PLUGIN_LDFLAGS)
230
 
 
231
 
 libxrandr_la_LIBADD  =                 \
232
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
233
 
        $(SETTINGS_PLUGIN_LIBS)         \
234
 
        $(LIBNOTIFY_LIBS)               \
235
 
        $(RANDR_LIBS)
236
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/xrdb/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/xrdb/Makefile.am
237
 
--- gnome-settings-daemon-2.26.0/plugins/xrdb/Makefile.am       2009-03-16 15:35:39.000000000 +0100
238
 
+++ gnome-settings-daemon-2.26.0.new/plugins/xrdb/Makefile.am   2009-03-18 15:34:43.000000000 +0100
239
 
@@ -30,7 +30,6 @@
240
 
        $(NULL)
241
 
 
242
 
 libxrdb_la_LIBADD  =           \
243
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
244
 
        $(SETTINGS_PLUGIN_LIBS) \
245
 
        $(NULL)
246
 
 
247
 
diff -Nur -x '*.orig' -x '*~' gnome-settings-daemon-2.26.0/plugins/xsettings/Makefile.am gnome-settings-daemon-2.26.0.new/plugins/xsettings/Makefile.am
248
 
--- gnome-settings-daemon-2.26.0/plugins/xsettings/Makefile.am  2009-03-16 15:35:38.000000000 +0100
249
 
+++ gnome-settings-daemon-2.26.0.new/plugins/xsettings/Makefile.am      2009-03-18 15:34:43.000000000 +0100
250
 
@@ -29,7 +29,6 @@
251
 
        $(NULL)
252
 
 
253
 
 libxsettings_la_LIBADD  =      \
254
 
-       $(top_builddir)/gnome-settings-daemon/libgsd-plugins.la \
255
 
        $(SETTINGS_PLUGIN_LIBS) \
256
 
        $(NULL)
257