← Back to branch summary

~mterry/brasero/ubuntu-2.32.0

« back to all changes in this revision

Viewing changes to debian/patches/01_pkglibdir.patch

  • Committer: robert.ancell at canonical
  • Date: 2010-08-27 07:24:36 UTC
  • Revision ID: robert.ancell@canonical.com-20100827072436-k3hig1i4tt3hvorg
* New upstream release
  - Bump build-depends on libglib2.0-dev, libgconf2-dev
  - Drop build-depend on libunique
* debian/brasero-common.install:
  - Install gsettings files
* debian/libbrasero-media0.install:
* debian/rules:
* debian/patches/01_pkglibdir.patch:
  - Remove versioned plugin directory - the upstream build system has changed

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_pkglibdir.patch
1
 
Index: brasero-2.30.1/libbrasero-burn/Makefile.am
2
 
===================================================================
3
 
--- brasero-2.30.1.orig/libbrasero-burn/Makefile.am     2010-04-27 01:25:56.000000000 +0200
4
 
+++ brasero-2.30.1/libbrasero-burn/Makefile.am  2010-05-03 15:48:18.492607597 +0200
5
 
@@ -9,7 +9,7 @@ INCLUDES = \
6
 
        -DBRASERO_PREFIX=\"$(prefix)\"                                  \
7
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
8
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                        \
9
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                                  \
10
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                            \
11
 
        $(WARN_CFLAGS)                                                  \
12
 
        $(DISABLE_DEPRECATED)                                           \
13
 
        $(BRASERO_GMODULE_CFLAGS)                                       \
14
 
Index: brasero-2.30.1/libbrasero-burn/burn-basics.h
15
 
===================================================================
16
 
--- brasero-2.30.1.orig/libbrasero-burn/burn-basics.h   2010-04-27 01:25:56.000000000 +0200
17
 
+++ brasero-2.30.1/libbrasero-burn/burn-basics.h        2010-05-03 15:48:18.492607597 +0200
18
 
@@ -39,7 +39,7 @@
19
 
 
20
 
 G_BEGIN_DECLS
21
 
 
22
 
-#define BRASERO_PLUGIN_DIRECTORY               BRASERO_LIBDIR "/brasero/plugins"
23
 
+#define BRASERO_PLUGIN_DIRECTORY               BRASERO_PKGLIBDIR "/plugins"
24
 
 #define BRASERO_PLUGIN_KEY                     "/apps/brasero/config/plugins"
25
 
 
26
 
 #define BRASERO_BURN_TMP_FILE_NAME             "brasero_tmp_XXXXXX"
27
 
Index: brasero-2.30.1/libbrasero-media/Makefile.am
28
 
===================================================================
29
 
--- brasero-2.30.1.orig/libbrasero-media/Makefile.am    2010-04-27 01:25:56.000000000 +0200
30
 
+++ brasero-2.30.1/libbrasero-media/Makefile.am 2010-05-03 15:48:18.492607597 +0200
31
 
@@ -6,7 +6,7 @@ INCLUDES = \
32
 
        -DBRASERO_PREFIX=\"$(prefix)\"                                  \
33
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
34
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                        \
35
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                                  \
36
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                            \
37
 
        $(WARN_CFLAGS)                                                  \
38
 
        $(DISABLE_DEPRECATED)                                           \
39
 
        $(BRASERO_GLIB_CFLAGS)                                          \
40
 
Index: brasero-2.30.1/libbrasero-utils/Makefile.am
41
 
===================================================================
42
 
--- brasero-2.30.1.orig/libbrasero-utils/Makefile.am    2010-04-27 01:25:56.000000000 +0200
43
 
+++ brasero-2.30.1/libbrasero-utils/Makefile.am 2010-05-03 15:48:18.496617953 +0200
44
 
@@ -6,7 +6,7 @@ INCLUDES = \
45
 
        -DBRASERO_PREFIX=\"$(prefix)\"                                  \
46
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
47
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                        \
48
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                                  \
49
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                            \
50
 
        $(WARN_CFLAGS)                                                  \
51
 
        $(DISABLE_DEPRECATED)                                           \
52
 
        $(BRASERO_GLIB_CFLAGS)                                          \
53
 
Index: brasero-2.30.1/plugins/cdrdao/Makefile.am
54
 
===================================================================
55
 
--- brasero-2.30.1.orig/plugins/cdrdao/Makefile.am      2010-04-27 01:25:56.000000000 +0200
56
 
+++ brasero-2.30.1/plugins/cdrdao/Makefile.am   2010-05-03 15:48:18.496617953 +0200
57
 
@@ -9,14 +9,14 @@ INCLUDES = \
58
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
59
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
60
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
61
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
62
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
63
 
        $(WARN_CFLAGS)                                                  \
64
 
        $(DISABLE_DEPRECATED)                           \
65
 
        $(BRASERO_GLIB_CFLAGS)                          \
66
 
        $(BRASERO_GCONF_CFLAGS)
67
 
 
68
 
 #cdrdao
69
 
-cdrdaodir = $(libdir)/brasero/plugins
70
 
+cdrdaodir = $(pkglibdir)/plugins
71
 
 cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
72
 
 libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c 
73
 
 libbrasero_cdrdao_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
74
 
Index: brasero-2.30.1/plugins/cdrkit/Makefile.am
75
 
===================================================================
76
 
--- brasero-2.30.1.orig/plugins/cdrkit/Makefile.am      2010-04-27 01:25:56.000000000 +0200
77
 
+++ brasero-2.30.1/plugins/cdrkit/Makefile.am   2010-05-03 15:48:18.496617953 +0200
78
 
@@ -9,14 +9,14 @@ INCLUDES = \
79
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
80
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
81
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
82
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
83
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
84
 
        $(WARN_CFLAGS)                                                  \
85
 
        $(DISABLE_DEPRECATED)                           \
86
 
        $(BRASERO_GLIB_CFLAGS)                          \
87
 
        $(BRASERO_GCONF_CFLAGS)
88
 
 
89
 
 #wodim
90
 
-wodimdir = $(libdir)/brasero/plugins
91
 
+wodimdir = $(pkglibdir)/plugins
92
 
 wodim_LTLIBRARIES = libbrasero-wodim.la
93
 
 libbrasero_wodim_la_SOURCES = burn-wodim.c \
94
 
        burn-cdrkit.h 
95
 
@@ -24,7 +24,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
96
 
 libbrasero_wodim_la_LDFLAGS = -module -avoid-version
97
 
 
98
 
 #genisoimage
99
 
-genisoimagedir = $(libdir)/brasero/plugins
100
 
+genisoimagedir = $(pkglibdir)/plugins
101
 
 genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
102
 
 libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
103
 
        burn-cdrkit.h 
104
 
@@ -32,7 +32,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
105
 
 libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
106
 
 
107
 
 #readom
108
 
-readomdir = $(libdir)/brasero/plugins
109
 
+readomdir = $(pkglibdir)/plugins
110
 
 readom_LTLIBRARIES = libbrasero-readom.la
111
 
 libbrasero_readom_la_SOURCES = burn-readom.c \
112
 
        burn-cdrkit.h 
113
 
Index: brasero-2.30.1/plugins/cdrtools/Makefile.am
114
 
===================================================================
115
 
--- brasero-2.30.1.orig/plugins/cdrtools/Makefile.am    2010-04-27 01:25:56.000000000 +0200
116
 
+++ brasero-2.30.1/plugins/cdrtools/Makefile.am 2010-05-03 15:52:49.464111514 +0200
117
 
@@ -9,14 +9,14 @@ INCLUDES = \
118
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
119
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
120
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
121
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
122
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
123
 
        $(WARN_CFLAGS)                                                  \
124
 
        $(DISABLE_DEPRECATED)                           \
125
 
        $(BRASERO_GLIB_CFLAGS)                          \
126
 
        $(BRASERO_GCONF_CFLAGS)
127
 
 
128
 
 #cdrecord
129
 
-cdrecorddir = $(libdir)/brasero/plugins
130
 
+cdrecorddir = $(pkglibdir)/plugins
131
 
 cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
132
 
 libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
133
 
        burn-cdrtools.h 
134
 
@@ -24,7 +24,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
135
 
 libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
136
 
 
137
 
 #mkisofs
138
 
-mkisofsdir = $(libdir)/brasero/plugins
139
 
+mkisofsdir = $(pkglibdir)/plugins
140
 
 mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
141
 
 libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
142
 
        burn-cdrtools.h 
143
 
@@ -32,7 +32,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
144
 
 libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
145
 
 
146
 
 #readcd
147
 
-readcddir = $(libdir)/brasero/plugins
148
 
+readcddir = $(pkglibdir)/plugins
149
 
 readcd_LTLIBRARIES = libbrasero-readcd.la
150
 
 libbrasero_readcd_la_SOURCES = burn-readcd.c \
151
 
        burn-cdrtools.h 
152
 
@@ -40,7 +40,7 @@ libbrasero_readcd_la_LIBADD = $(BRASERO_
153
 
 libbrasero_readcd_la_LDFLAGS = -module -avoid-version
154
 
 
155
 
 #cdda2wav
156
 
-cdda2wavdir = $(libdir)/brasero/plugins
157
 
+cdda2wavdir = $(pkglibdir)/plugins
158
 
 cdda2wav_LTLIBRARIES = libbrasero-cdda2wav.la
159
 
 libbrasero_cdda2wav_la_SOURCES = burn-cdda2wav.c burn-cdrtools.h 
160
 
 libbrasero_cdda2wav_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
161
 
Index: brasero-2.30.1/plugins/checksum/Makefile.am
162
 
===================================================================
163
 
--- brasero-2.30.1.orig/plugins/checksum/Makefile.am    2010-04-27 01:25:56.000000000 +0200
164
 
+++ brasero-2.30.1/plugins/checksum/Makefile.am 2010-05-03 15:48:18.496617953 +0200
165
 
@@ -9,21 +9,21 @@ INCLUDES = \
166
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
167
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
168
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
169
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
170
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
171
 
        $(WARN_CFLAGS)                                                  \
172
 
        $(DISABLE_DEPRECATED)                           \
173
 
        $(BRASERO_GLIB_CFLAGS)                          \
174
 
        $(BRASERO_GTK_CFLAGS)                           \
175
 
        $(BRASERO_GCONF_CFLAGS)
176
 
 
177
 
-checksumdir = $(libdir)/brasero/plugins
178
 
+checksumdir = $(pkglibdir)/plugins
179
 
 checksum_LTLIBRARIES = libbrasero-checksum.la
180
 
 libbrasero_checksum_la_SOURCES = burn-checksum-image.c 
181
 
 
182
 
 libbrasero_checksum_la_LDFLAGS = -module -avoid-version
183
 
 libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
184
 
 
185
 
-checksumfiledir = $(libdir)/brasero/plugins
186
 
+checksumfiledir = $(pkglibdir)/plugins
187
 
 checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
188
 
 libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c    \
189
 
                                      burn-volume-read.c  \
190
 
Index: brasero-2.30.1/plugins/dvdauthor/Makefile.am
191
 
===================================================================
192
 
--- brasero-2.30.1.orig/plugins/dvdauthor/Makefile.am   2010-04-27 01:25:56.000000000 +0200
193
 
+++ brasero-2.30.1/plugins/dvdauthor/Makefile.am        2010-05-03 15:48:18.500611199 +0200
194
 
@@ -9,13 +9,13 @@ INCLUDES = \
195
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
196
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
197
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
198
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
199
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
200
 
        $(WARN_CFLAGS)                                                  \
201
 
        $(DISABLE_DEPRECATED)                           \
202
 
        $(BRASERO_GLIB_CFLAGS)                          \
203
 
        $(BRASERO_LIBXML_CFLAGS)
204
 
 
205
 
-dvdauthordir = $(libdir)/brasero/plugins
206
 
+dvdauthordir = $(pkglibdir)/plugins
207
 
 dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
208
 
 
209
 
 libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
210
 
Index: brasero-2.30.1/plugins/dvdcss/Makefile.am
211
 
===================================================================
212
 
--- brasero-2.30.1.orig/plugins/dvdcss/Makefile.am      2010-04-27 01:25:56.000000000 +0200
213
 
+++ brasero-2.30.1/plugins/dvdcss/Makefile.am   2010-05-03 15:48:18.500611199 +0200
214
 
@@ -1,4 +1,4 @@
215
 
-plugindir = $(libdir)/brasero/plugins
216
 
+plugindir = $(pkglibdir)/plugins
217
 
 
218
 
 INCLUDES = \
219
 
        -I$(top_srcdir)                                 \
220
 
@@ -10,7 +10,7 @@ INCLUDES = \
221
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
222
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
223
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
224
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
225
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
226
 
        $(WARN_CFLAGS)                                                  \
227
 
        $(DISABLE_DEPRECATED)                           \
228
 
        $(BRASERO_GLIB_CFLAGS)
229
 
Index: brasero-2.30.1/plugins/growisofs/Makefile.am
230
 
===================================================================
231
 
--- brasero-2.30.1.orig/plugins/growisofs/Makefile.am   2010-04-27 01:25:56.000000000 +0200
232
 
+++ brasero-2.30.1/plugins/growisofs/Makefile.am        2010-05-03 15:48:18.500611199 +0200
233
 
@@ -9,14 +9,14 @@ INCLUDES = \
234
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
235
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
236
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
237
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
238
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
239
 
        $(WARN_CFLAGS)                                                  \
240
 
        $(DISABLE_DEPRECATED)                           \
241
 
        $(BRASERO_GLIB_CFLAGS)                          \
242
 
        $(BRASERO_GCONF_CFLAGS)
243
 
 
244
 
 #growisofs
245
 
-growisofsdir = $(libdir)/brasero/plugins
246
 
+growisofsdir = $(pkglibdir)/plugins
247
 
 growisofs_LTLIBRARIES = libbrasero-growisofs.la
248
 
 libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
249
 
        burn-growisofs-common.h 
250
 
@@ -24,7 +24,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
251
 
 libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
252
 
 
253
 
 #dvdrwformat
254
 
-dvdrwformatdir = $(libdir)/brasero/plugins
255
 
+dvdrwformatdir = $(pkglibdir)/plugins
256
 
 dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
257
 
 libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c 
258
 
 libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
259
 
Index: brasero-2.30.1/plugins/libburnia/Makefile.am
260
 
===================================================================
261
 
--- brasero-2.30.1.orig/plugins/libburnia/Makefile.am   2010-04-27 01:25:56.000000000 +0200
262
 
+++ brasero-2.30.1/plugins/libburnia/Makefile.am        2010-05-03 15:48:18.500611199 +0200
263
 
@@ -9,7 +9,7 @@ INCLUDES = \
264
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
265
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
266
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
267
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
268
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
269
 
        $(WARN_CFLAGS)                                                  \
270
 
        $(DISABLE_DEPRECATED)                           \
271
 
        $(BRASERO_LIBISOFS_CFLAGS)                      \
272
 
@@ -17,7 +17,7 @@ INCLUDES = \
273
 
        $(BRASERO_GLIB_CFLAGS)
274
 
 
275
 
 #libburn
276
 
-libburndir = $(libdir)/brasero/plugins
277
 
+libburndir = $(pkglibdir)/plugins
278
 
 libburn_LTLIBRARIES = libbrasero-libburn.la
279
 
 libbrasero_libburn_la_SOURCES = burn-libburn.c                 \
280
 
                                burn-libburn-common.c   \
281
 
@@ -27,7 +27,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
282
 
 libbrasero_libburn_la_LDFLAGS = -module -avoid-version
283
 
 
284
 
 #libisofs (apparently libisofs needs one libburn function)
285
 
-libisofsdir = $(libdir)/brasero/plugins
286
 
+libisofsdir = $(pkglibdir)/plugins
287
 
 libisofs_LTLIBRARIES = libbrasero-libisofs.la
288
 
 libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
289
 
        burn-libburn-common.c burn-libburn-common.h                     \
290
 
Index: brasero-2.30.1/plugins/local-track/Makefile.am
291
 
===================================================================
292
 
--- brasero-2.30.1.orig/plugins/local-track/Makefile.am 2010-04-27 01:25:56.000000000 +0200
293
 
+++ brasero-2.30.1/plugins/local-track/Makefile.am      2010-05-03 15:48:18.500611199 +0200
294
 
@@ -9,14 +9,14 @@ INCLUDES = \
295
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
296
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
297
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
298
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
299
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
300
 
        $(WARN_CFLAGS)                                                  \
301
 
        $(DISABLE_DEPRECATED)                                   \
302
 
        $(BRASERO_GLIB_CFLAGS)                                  \
303
 
        $(BRASERO_GIO_CFLAGS)
304
 
 
305
 
 #local-track
306
 
-local_trackdir = $(libdir)/brasero/plugins
307
 
+local_trackdir = $(pkglibdir)/plugins
308
 
 local_track_LTLIBRARIES = libbrasero-local-track.la
309
 
 
310
 
 libbrasero_local_track_la_SOURCES = burn-local-image.c 
311
 
@@ -24,7 +24,7 @@ libbrasero_local_track_la_LIBADD = $(BRA
312
 
 libbrasero_local_track_la_LDFLAGS = -module -avoid-version
313
 
 
314
 
 #burn-uri
315
 
-burn_uridir = $(libdir)/brasero/plugins
316
 
+burn_uridir = $(pkglibdir)/plugins
317
 
 burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
318
 
 
319
 
 libbrasero_burn_uri_la_SOURCES = burn-uri.c 
320
 
Index: brasero-2.30.1/plugins/transcode/Makefile.am
321
 
===================================================================
322
 
--- brasero-2.30.1.orig/plugins/transcode/Makefile.am   2010-04-27 01:25:56.000000000 +0200
323
 
+++ brasero-2.30.1/plugins/transcode/Makefile.am        2010-05-03 15:51:09.848109124 +0200
324
 
@@ -9,27 +9,27 @@ INCLUDES = \
325
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
326
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
327
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
328
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
329
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
330
 
        $(WARN_CFLAGS)                                                  \
331
 
        $(DISABLE_DEPRECATED)                           \
332
 
        $(BRASERO_GLIB_CFLAGS)                          \
333
 
        $(BRASERO_GSTREAMER_CFLAGS)
334
 
 
335
 
-transcodedir = $(libdir)/brasero/plugins
336
 
+transcodedir = $(pkglibdir)/plugins
337
 
 transcode_LTLIBRARIES = libbrasero-transcode.la
338
 
 
339
 
 libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
340
 
 libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
341
 
 libbrasero_transcode_la_LDFLAGS = -module -avoid-version
342
 
 
343
 
-normalizedir = $(libdir)/brasero/plugins
344
 
+normalizedir = $(pkglibdir)/plugins
345
 
 normalize_LTLIBRARIES = libbrasero-normalize.la
346
 
 
347
 
 libbrasero_normalize_la_SOURCES = burn-normalize.c burn-normalize.h
348
 
 libbrasero_normalize_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
349
 
 libbrasero_normalize_la_LDFLAGS = -module -avoid-version
350
 
 
351
 
-vobdir = $(libdir)/brasero/plugins
352
 
+vobdir = $(pkglibdir)/plugins
353
 
 vob_LTLIBRARIES = libbrasero-vob.la
354
 
 
355
 
 libbrasero_vob_la_SOURCES = burn-vob.c 
356
 
Index: brasero-2.30.1/plugins/vcdimager/Makefile.am
357
 
===================================================================
358
 
--- brasero-2.30.1.orig/plugins/vcdimager/Makefile.am   2010-04-27 01:25:56.000000000 +0200
359
 
+++ brasero-2.30.1/plugins/vcdimager/Makefile.am        2010-05-03 15:48:18.500611199 +0200
360
 
@@ -9,13 +9,13 @@ INCLUDES = \
361
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
362
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
363
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
364
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
365
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
366
 
        $(WARN_CFLAGS)                                                  \
367
 
        $(DISABLE_DEPRECATED)                                   \
368
 
        $(BRASERO_GLIB_CFLAGS)                                  \
369
 
        $(BRASERO_LIBXML_CFLAGS)
370
 
 
371
 
-vcdimagerdir = $(libdir)/brasero/plugins
372
 
+vcdimagerdir = $(pkglibdir)/plugins
373
 
 vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
374
 
 
375
 
 libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
376
 
Index: brasero-2.30.1/src/Makefile.am
377
 
===================================================================
378
 
--- brasero-2.30.1.orig/src/Makefile.am 2010-04-27 01:25:56.000000000 +0200
379
 
+++ brasero-2.30.1/src/Makefile.am      2010-05-03 15:48:18.504610800 +0200
380
 
@@ -11,7 +11,7 @@ INCLUDES = \
381
 
        -DBRASERO_PREFIX=\"$(prefix)\"                                  \
382
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
383
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                        \
384
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                                  \
385
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                            \
386
 
        $(WARN_CFLAGS)                                                  \
387
 
        $(DISABLE_DEPRECATED)                                           \
388
 
        $(BRASERO_GLIB_CFLAGS)                                          \
389
 
Index: brasero-2.30.1/plugins/audio2cue/Makefile.am
390
 
===================================================================
391
 
--- brasero-2.30.1.orig/plugins/audio2cue/Makefile.am   2010-05-03 15:51:53.568111894 +0200
392
 
+++ brasero-2.30.1/plugins/audio2cue/Makefile.am        2010-05-03 15:52:04.920107947 +0200
393
 
@@ -9,13 +9,13 @@ INCLUDES = \
394
 
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
395
 
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
396
 
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
397
 
-       -DBRASERO_LIBDIR=\"$(libdir)\"                          \
398
 
+       -DBRASERO_PKGLIBDIR=\"$(pkglibdir)\"                    \
399
 
        $(WARN_CFLAGS)                                                  \
400
 
        $(DISABLE_DEPRECATED)                           \
401
 
        $(BRASERO_GLIB_CFLAGS)
402
 
 
403
 
 #audio2cue
404
 
-audio2cuedir = $(libdir)/brasero/plugins
405
 
+audio2cuedir = $(pkglibdir)/plugins
406
 
 audio2cue_LTLIBRARIES = libbrasero-audio2cue.la
407
 
 libbrasero_audio2cue_la_SOURCES = burn-audio2cue.c
408
 
 libbrasero_audio2cue_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la