← Back to branch summary

~ubuntu-branches/debian/squeeze/brasero/squeeze

« back to all changes in this revision

Viewing changes to debian/patches/01_pkglibdir.patch

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2010-05-03 16:02:19 UTC
  • mfrom: (1.2.18 upstream) (9.1.1 sid)
  • Revision ID: james.westby@ubuntu.com-20100503160219-m16zmh337vlv0cmw
Tags: 2.30.1-1
http://bugs.debian.org/554057
* 31_link_libice.patch: new patch. Explicitly link to libice.
  Closes: #554057.
* Drop build-dependency on libbeagle since beagle is going to be 
  removed.
* New upstream release.
* Update build-dependencies.
* Disable introspection support to avoid blocking the totem 
  transition.
* Bump shlibs to 2.30.
* 01_pkglibdir.patch, 90_relibtoolize.patch: updated for the new 
  version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01_pkglibdir.patch
1
 
Index: brasero-2.28.3/libbrasero-burn/Makefile.am
 
1
Index: brasero-2.30.1/libbrasero-burn/Makefile.am
2
2
===================================================================
3
 
--- brasero-2.28.3.orig/libbrasero-burn/Makefile.am     2010-01-13 19:42:47.894714777 +0100
4
 
+++ brasero-2.28.3/libbrasero-burn/Makefile.am  2010-01-13 19:46:00.227214581 +0100
 
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
5
@@ -9,7 +9,7 @@ INCLUDES = \
6
6
        -DBRASERO_PREFIX=\"$(prefix)\"                                  \
7
7
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
11
11
        $(WARN_CFLAGS)                                                  \
12
12
        $(DISABLE_DEPRECATED)                                           \
13
13
        $(BRASERO_GMODULE_CFLAGS)                                       \
14
 
Index: brasero-2.28.3/libbrasero-burn/burn-basics.h
 
14
Index: brasero-2.30.1/libbrasero-burn/burn-basics.h
15
15
===================================================================
16
 
--- brasero-2.28.3.orig/libbrasero-burn/burn-basics.h   2010-01-13 19:46:57.522715546 +0100
17
 
+++ brasero-2.28.3/libbrasero-burn/burn-basics.h        2010-01-13 19:47:12.642716628 +0100
 
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
18
@@ -39,7 +39,7 @@
19
19
 
20
20
 G_BEGIN_DECLS
24
24
 #define BRASERO_PLUGIN_KEY                     "/apps/brasero/config/plugins"
25
25
 
26
26
 #define BRASERO_BURN_TMP_FILE_NAME             "brasero_tmp_XXXXXX"
27
 
Index: brasero-2.28.3/libbrasero-media/Makefile.am
28
 
===================================================================
29
 
--- brasero-2.28.3.orig/libbrasero-media/Makefile.am    2010-01-13 19:42:47.870713262 +0100
30
 
+++ brasero-2.28.3/libbrasero-media/Makefile.am 2010-01-13 19:46:00.227214581 +0100
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.28.3/libbrasero-utils/Makefile.am
41
 
===================================================================
42
 
--- brasero-2.28.3.orig/libbrasero-utils/Makefile.am    2010-01-13 19:42:47.555214164 +0100
43
 
+++ brasero-2.28.3/libbrasero-utils/Makefile.am 2010-01-13 19:46:00.227214581 +0100
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.28.3/plugins/cdrdao/Makefile.am
54
 
===================================================================
55
 
--- brasero-2.28.3.orig/plugins/cdrdao/Makefile.am      2010-01-13 19:42:48.090716724 +0100
56
 
+++ brasero-2.28.3/plugins/cdrdao/Makefile.am   2010-01-13 19:51:38.943214162 +0100
 
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
57
@@ -9,14 +9,14 @@ INCLUDES = \
58
58
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
59
59
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
69
69
-cdrdaodir = $(libdir)/brasero/plugins
70
70
+cdrdaodir = $(pkglibdir)/plugins
71
71
 cdrdao_LTLIBRARIES = libbrasero-cdrdao.la
72
 
 libbrasero_cdrdao_la_SOURCES = burn-cdrdao.c burn-cdrdao.h \
73
 
        burn-cdrdao-common.h 
74
 
@@ -24,7 +24,7 @@ libbrasero_cdrdao_la_LIBADD = $(BRASERO_
75
 
 libbrasero_cdrdao_la_LDFLAGS = -module -avoid-version
76
 
 
77
 
 #toc2cue
78
 
-toc2cuedir = $(libdir)/brasero/plugins
79
 
+toc2cuedir = $(pkglibdir)/plugins
80
 
 toc2cue_LTLIBRARIES = libbrasero-toc2cue.la
81
 
 libbrasero_toc2cue_la_SOURCES = burn-toc2cue.c burn-toc2cue.h \
82
 
        burn-cdrdao-common.h 
83
 
Index: brasero-2.28.3/plugins/cdrkit/Makefile.am
 
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
84
75
===================================================================
85
 
--- brasero-2.28.3.orig/plugins/cdrkit/Makefile.am      2010-01-13 19:42:47.998715151 +0100
86
 
+++ brasero-2.28.3/plugins/cdrkit/Makefile.am   2010-01-13 19:51:38.943214162 +0100
 
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
87
78
@@ -9,14 +9,14 @@ INCLUDES = \
88
79
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
89
80
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
99
90
-wodimdir = $(libdir)/brasero/plugins
100
91
+wodimdir = $(pkglibdir)/plugins
101
92
 wodim_LTLIBRARIES = libbrasero-wodim.la
102
 
 libbrasero_wodim_la_SOURCES = burn-wodim.c burn-wodim.h \
 
93
 libbrasero_wodim_la_SOURCES = burn-wodim.c \
103
94
        burn-cdrkit.h 
104
95
@@ -24,7 +24,7 @@ libbrasero_wodim_la_LIBADD = $(BRASERO_G
105
96
 libbrasero_wodim_la_LDFLAGS = -module -avoid-version
108
99
-genisoimagedir = $(libdir)/brasero/plugins
109
100
+genisoimagedir = $(pkglibdir)/plugins
110
101
 genisoimage_LTLIBRARIES = libbrasero-genisoimage.la
111
 
 libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c burn-genisoimage.h \
 
102
 libbrasero_genisoimage_la_SOURCES = burn-genisoimage.c \
112
103
        burn-cdrkit.h 
113
104
@@ -32,7 +32,7 @@ libbrasero_genisoimage_la_LIBADD = $(BRA
114
105
 libbrasero_genisoimage_la_LDFLAGS = -module -avoid-version
117
108
-readomdir = $(libdir)/brasero/plugins
118
109
+readomdir = $(pkglibdir)/plugins
119
110
 readom_LTLIBRARIES = libbrasero-readom.la
120
 
 libbrasero_readom_la_SOURCES = burn-readom.c burn-readom.h \
 
111
 libbrasero_readom_la_SOURCES = burn-readom.c \
121
112
        burn-cdrkit.h 
122
 
Index: brasero-2.28.3/plugins/cdrtools/Makefile.am
 
113
Index: brasero-2.30.1/plugins/cdrtools/Makefile.am
123
114
===================================================================
124
 
--- brasero-2.28.3.orig/plugins/cdrtools/Makefile.am    2010-01-13 19:42:48.134717218 +0100
125
 
+++ brasero-2.28.3/plugins/cdrtools/Makefile.am 2010-01-13 19:51:38.943214162 +0100
 
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
126
117
@@ -9,14 +9,14 @@ INCLUDES = \
127
118
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
128
119
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
138
129
-cdrecorddir = $(libdir)/brasero/plugins
139
130
+cdrecorddir = $(pkglibdir)/plugins
140
131
 cdrecord_LTLIBRARIES = libbrasero-cdrecord.la
141
 
 libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c burn-cdrecord.h \
 
132
 libbrasero_cdrecord_la_SOURCES = burn-cdrecord.c \
142
133
        burn-cdrtools.h 
143
134
@@ -24,7 +24,7 @@ libbrasero_cdrecord_la_LIBADD = $(BRASER
144
135
 libbrasero_cdrecord_la_LDFLAGS = -module -avoid-version
147
138
-mkisofsdir = $(libdir)/brasero/plugins
148
139
+mkisofsdir = $(pkglibdir)/plugins
149
140
 mkisofs_LTLIBRARIES = libbrasero-mkisofs.la
150
 
 libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c burn-mkisofs.h \
 
141
 libbrasero_mkisofs_la_SOURCES = burn-mkisofs.c \
151
142
        burn-cdrtools.h 
152
143
@@ -32,7 +32,7 @@ libbrasero_mkisofs_la_LIBADD = $(BRASERO
153
144
 libbrasero_mkisofs_la_LDFLAGS = -module -avoid-version
156
147
-readcddir = $(libdir)/brasero/plugins
157
148
+readcddir = $(pkglibdir)/plugins
158
149
 readcd_LTLIBRARIES = libbrasero-readcd.la
159
 
 libbrasero_readcd_la_SOURCES = burn-readcd.c burn-readcd.h \
 
150
 libbrasero_readcd_la_SOURCES = burn-readcd.c \
160
151
        burn-cdrtools.h 
161
 
Index: brasero-2.28.3/plugins/checksum/Makefile.am
 
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
162
===================================================================
163
 
--- brasero-2.28.3.orig/plugins/checksum/Makefile.am    2010-01-13 19:42:48.154718153 +0100
164
 
+++ brasero-2.28.3/plugins/checksum/Makefile.am 2010-01-13 19:51:38.943214162 +0100
165
 
@@ -9,14 +9,14 @@ INCLUDES = \
 
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
166
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
167
167
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
168
168
        -DBRASERO_DATADIR=\"$(datadir)/brasero\"                \
177
177
-checksumdir = $(libdir)/brasero/plugins
178
178
+checksumdir = $(pkglibdir)/plugins
179
179
 checksum_LTLIBRARIES = libbrasero-checksum.la
180
 
 libbrasero_checksum_la_SOURCES = burn-checksum-image.c \
181
 
                                 burn-checksum-image.h
182
 
@@ -24,7 +24,7 @@ libbrasero_checksum_la_SOURCES = burn-ch
 
180
 libbrasero_checksum_la_SOURCES = burn-checksum-image.c 
 
181
 
183
182
 libbrasero_checksum_la_LDFLAGS = -module -avoid-version
184
183
 libbrasero_checksum_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GCONF_LIBS) ../../libbrasero-media/libbrasero-media.la ../../libbrasero-burn/libbrasero-burn.la
185
184
 
187
186
+checksumfiledir = $(pkglibdir)/plugins
188
187
 checksumfile_LTLIBRARIES = libbrasero-checksum-file.la
189
188
 libbrasero_checksum_file_la_SOURCES = burn-checksum-files.c    \
190
 
                                      burn-checksum-files.h\
191
 
Index: brasero-2.28.3/plugins/dvdauthor/Makefile.am
 
189
                                      burn-volume-read.c  \
 
190
Index: brasero-2.30.1/plugins/dvdauthor/Makefile.am
192
191
===================================================================
193
 
--- brasero-2.28.3.orig/plugins/dvdauthor/Makefile.am   2010-01-13 19:42:48.182717799 +0100
194
 
+++ brasero-2.28.3/plugins/dvdauthor/Makefile.am        2010-01-13 19:51:38.943214162 +0100
 
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
195
194
@@ -9,13 +9,13 @@ INCLUDES = \
196
195
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
197
196
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
207
206
+dvdauthordir = $(pkglibdir)/plugins
208
207
 dvdauthor_LTLIBRARIES = libbrasero-dvdauthor.la
209
208
 
210
 
 libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c burn-dvdauthor.h
211
 
Index: brasero-2.28.3/plugins/dvdcss/Makefile.am
 
209
 libbrasero_dvdauthor_la_SOURCES = burn-dvdauthor.c 
 
210
Index: brasero-2.30.1/plugins/dvdcss/Makefile.am
212
211
===================================================================
213
 
--- brasero-2.28.3.orig/plugins/dvdcss/Makefile.am      2010-01-13 19:42:47.978718613 +0100
214
 
+++ brasero-2.28.3/plugins/dvdcss/Makefile.am   2010-01-13 19:51:38.943214162 +0100
 
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
215
214
@@ -1,4 +1,4 @@
216
215
-plugindir = $(libdir)/brasero/plugins
217
216
+plugindir = $(pkglibdir)/plugins
227
226
        $(WARN_CFLAGS)                                                  \
228
227
        $(DISABLE_DEPRECATED)                           \
229
228
        $(BRASERO_GLIB_CFLAGS)
230
 
Index: brasero-2.28.3/plugins/growisofs/Makefile.am
 
229
Index: brasero-2.30.1/plugins/growisofs/Makefile.am
231
230
===================================================================
232
 
--- brasero-2.28.3.orig/plugins/growisofs/Makefile.am   2010-01-13 19:42:48.066715209 +0100
233
 
+++ brasero-2.28.3/plugins/growisofs/Makefile.am        2010-01-13 19:51:38.943214162 +0100
 
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
234
233
@@ -9,14 +9,14 @@ INCLUDES = \
235
234
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
236
235
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
246
245
-growisofsdir = $(libdir)/brasero/plugins
247
246
+growisofsdir = $(pkglibdir)/plugins
248
247
 growisofs_LTLIBRARIES = libbrasero-growisofs.la
249
 
 libbrasero_growisofs_la_SOURCES = burn-growisofs.c burn-growisofs.h \
 
248
 libbrasero_growisofs_la_SOURCES = burn-growisofs.c \
250
249
        burn-growisofs-common.h 
251
250
@@ -24,7 +24,7 @@ libbrasero_growisofs_la_LIBADD = $(BRASE
252
251
 libbrasero_growisofs_la_LDFLAGS = -module -avoid-version
255
254
-dvdrwformatdir = $(libdir)/brasero/plugins
256
255
+dvdrwformatdir = $(pkglibdir)/plugins
257
256
 dvdrwformat_LTLIBRARIES = libbrasero-dvdrwformat.la
258
 
 libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c burn-dvd-rw-format.h
 
257
 libbrasero_dvdrwformat_la_SOURCES = burn-dvd-rw-format.c 
259
258
 libbrasero_dvdrwformat_la_LIBADD = $(BRASERO_GLIB_LIBS) ../../libbrasero-burn/libbrasero-burn.la
260
 
Index: brasero-2.28.3/plugins/libburnia/Makefile.am
 
259
Index: brasero-2.30.1/plugins/libburnia/Makefile.am
261
260
===================================================================
262
 
--- brasero-2.28.3.orig/plugins/libburnia/Makefile.am   2010-01-13 19:42:48.046715250 +0100
263
 
+++ brasero-2.28.3/plugins/libburnia/Makefile.am        2010-01-13 19:51:38.943214162 +0100
 
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
264
263
@@ -9,7 +9,7 @@ INCLUDES = \
265
264
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
266
265
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
278
277
+libburndir = $(pkglibdir)/plugins
279
278
 libburn_LTLIBRARIES = libbrasero-libburn.la
280
279
 libbrasero_libburn_la_SOURCES = burn-libburn.c                 \
281
 
                                burn-libburn.h          \
282
 
@@ -28,7 +28,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
 
280
                                burn-libburn-common.c   \
 
281
@@ -27,7 +27,7 @@ libbrasero_libburn_la_LIBADD = $(BRASERO
283
282
 libbrasero_libburn_la_LDFLAGS = -module -avoid-version
284
283
 
285
284
 #libisofs (apparently libisofs needs one libburn function)
286
285
-libisofsdir = $(libdir)/brasero/plugins
287
286
+libisofsdir = $(pkglibdir)/plugins
288
287
 libisofs_LTLIBRARIES = libbrasero-libisofs.la
289
 
 libbrasero_libisofs_la_SOURCES = burn-libisofs.c burn-libisofs.h       \
 
288
 libbrasero_libisofs_la_SOURCES = burn-libisofs.c                       \
290
289
        burn-libburn-common.c burn-libburn-common.h                     \
291
 
Index: brasero-2.28.3/plugins/local-track/Makefile.am
 
290
Index: brasero-2.30.1/plugins/local-track/Makefile.am
292
291
===================================================================
293
 
--- brasero-2.28.3.orig/plugins/local-track/Makefile.am 2010-01-13 19:42:48.206714422 +0100
294
 
+++ brasero-2.28.3/plugins/local-track/Makefile.am      2010-01-13 19:51:38.947217185 +0100
 
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
295
294
@@ -9,14 +9,14 @@ INCLUDES = \
296
295
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
297
296
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
308
307
+local_trackdir = $(pkglibdir)/plugins
309
308
 local_track_LTLIBRARIES = libbrasero-local-track.la
310
309
 
311
 
 libbrasero_local_track_la_SOURCES = burn-local-image.c burn-local-image.h
 
310
 libbrasero_local_track_la_SOURCES = burn-local-image.c 
312
311
@@ -24,7 +24,7 @@ libbrasero_local_track_la_LIBADD = $(BRA
313
312
 libbrasero_local_track_la_LDFLAGS = -module -avoid-version
314
313
 
317
316
+burn_uridir = $(pkglibdir)/plugins
318
317
 burn_uri_LTLIBRARIES = libbrasero-burn-uri.la
319
318
 
320
 
 libbrasero_burn_uri_la_SOURCES = burn-uri.c burn-uri.h
321
 
Index: brasero-2.28.3/plugins/transcode/Makefile.am
 
319
 libbrasero_burn_uri_la_SOURCES = burn-uri.c 
 
320
Index: brasero-2.30.1/plugins/transcode/Makefile.am
322
321
===================================================================
323
 
--- brasero-2.28.3.orig/plugins/transcode/Makefile.am   2010-01-13 19:42:48.022716178 +0100
324
 
+++ brasero-2.28.3/plugins/transcode/Makefile.am        2010-01-13 19:51:38.947217185 +0100
 
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
325
324
@@ -9,27 +9,27 @@ INCLUDES = \
326
325
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
327
326
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
337
336
+transcodedir = $(pkglibdir)/plugins
338
337
 transcode_LTLIBRARIES = libbrasero-transcode.la
339
338
 
340
 
 libbrasero_transcode_la_SOURCES = burn-transcode.c burn-transcode.h burn-normalize.h
 
339
 libbrasero_transcode_la_SOURCES = burn-transcode.c burn-normalize.h 
341
340
 libbrasero_transcode_la_LIBADD = $(BRASERO_GLIB_LIBS) $(BRASERO_GSTREAMER_LIBS) ../../libbrasero-burn/libbrasero-burn.la
342
341
 libbrasero_transcode_la_LDFLAGS = -module -avoid-version
343
342
 
353
352
+vobdir = $(pkglibdir)/plugins
354
353
 vob_LTLIBRARIES = libbrasero-vob.la
355
354
 
356
 
 libbrasero_vob_la_SOURCES = burn-vob.c burn-vob.h
357
 
Index: brasero-2.28.3/plugins/vcdimager/Makefile.am
 
355
 libbrasero_vob_la_SOURCES = burn-vob.c 
 
356
Index: brasero-2.30.1/plugins/vcdimager/Makefile.am
358
357
===================================================================
359
 
--- brasero-2.28.3.orig/plugins/vcdimager/Makefile.am   2010-01-13 19:42:48.110717171 +0100
360
 
+++ brasero-2.28.3/plugins/vcdimager/Makefile.am        2010-01-13 19:51:38.947217185 +0100
 
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
361
360
@@ -9,13 +9,13 @@ INCLUDES = \
362
361
        -DBRASERO_PREFIX=\"$(prefix)\"                          \
363
362
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                  \
373
372
+vcdimagerdir = $(pkglibdir)/plugins
374
373
 vcdimager_LTLIBRARIES = libbrasero-vcdimager.la
375
374
 
376
 
 libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c burn-vcdimager.h
377
 
Index: brasero-2.28.3/src/Makefile.am
 
375
 libbrasero_vcdimager_la_SOURCES = burn-vcdimager.c 
 
376
Index: brasero-2.30.1/src/Makefile.am
378
377
===================================================================
379
 
--- brasero-2.28.3.orig/src/Makefile.am 2010-01-13 19:42:47.622716041 +0100
380
 
+++ brasero-2.28.3/src/Makefile.am      2010-01-13 19:46:00.231213692 +0100
 
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
381
380
@@ -11,7 +11,7 @@ INCLUDES = \
382
381
        -DBRASERO_PREFIX=\"$(prefix)\"                                  \
383
382
        -DBRASERO_SYSCONFDIR=\"$(sysconfdir)\"                          \
387
386
        $(WARN_CFLAGS)                                                  \
388
387
        $(DISABLE_DEPRECATED)                                           \
389
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