Merge lp:~jm-leddy/ubuntu/oneiric/gvfs/fix-899858 into lp:ubuntu/oneiric/gvfs
- Oneiric (11.10)
- fix-899858
- Merge into oneiric
Proposed by
James M. Leddy
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | James M. Leddy | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~jm-leddy/ubuntu/oneiric/gvfs/fix-899858 | ||||
Merge into: | lp:ubuntu/oneiric/gvfs | ||||
Diff against target: |
660 lines (+14/-586) 5 files modified
.pc/05_shared_libdaemon.patch/daemon/Makefile.am (+0/-529) daemon/Makefile.am (+4/-12) debian/changelog (+10/-0) debian/gvfs.install (+0/-1) debian/patches/05_shared_libdaemon.patch (+0/-44) |
||||
To merge this branch: | bzr merge lp:~jm-leddy/ubuntu/oneiric/gvfs/fix-899858 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mathieu Trudel-Lapierre | Approve | ||
Ubuntu branches | Pending | ||
Review via email: mp+102293@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) wrote : | # |
So, there was also the version number wrong (ubuntu1.1 is better to use for a SRU than ubuntu2).
Revision history for this message
James M. Leddy (jm-leddy) wrote : | # |
Thanks for the information Mathieu. I'll keep that in mind next time.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === removed directory '.pc/05_shared_libdaemon.patch/daemon' |
2 | === removed file '.pc/05_shared_libdaemon.patch/daemon/Makefile.am' |
3 | --- .pc/05_shared_libdaemon.patch/daemon/Makefile.am 2011-09-06 09:24:10 +0000 |
4 | +++ .pc/05_shared_libdaemon.patch/daemon/Makefile.am 1970-01-01 00:00:00 +0000 |
5 | @@ -1,529 +0,0 @@ |
6 | -SUBDIRS = trashlib |
7 | - |
8 | -NULL = |
9 | - |
10 | -mountdir = $(datadir)/gvfs/mounts |
11 | - |
12 | -INCLUDES = \ |
13 | - $(SAMBA_CFLAGS) \ |
14 | - -I$(top_srcdir) \ |
15 | - -I$(top_srcdir)/common \ |
16 | - -I$(top_builddir) \ |
17 | - $(GLIB_CFLAGS) $(DBUS_CFLAGS) \ |
18 | - $(OBEXFTP_CFLAGS) $(EXPAT_CFLAGS) \ |
19 | - $(KEYRING_CFLAGS) \ |
20 | - -DDBUS_API_SUBJECT_TO_CHANGE \ |
21 | - -DG_UDEV_API_IS_SUBJECT_TO_CHANGE \ |
22 | - -DLIBEXEC_DIR=\"$(libexecdir)/\" \ |
23 | - -DMOUNTABLE_DIR=\"$(mountdir)/\" \ |
24 | - -DGVFS_LOCALEDIR=\""$(localedir)"\" \ |
25 | - -DG_DISABLE_DEPRECATED |
26 | - |
27 | -noinst_LTLIBRARIES=libdaemon.la |
28 | - |
29 | -libraries = \ |
30 | - libdaemon.la \ |
31 | - $(top_builddir)/common/libgvfscommon.la \ |
32 | - $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS) |
33 | - |
34 | -gvfs_gschemas = |
35 | -gvfs_gschemas_convert = |
36 | - |
37 | -# D-BUS service file |
38 | -%.service: %.service.in ../config.log |
39 | - $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ |
40 | - |
41 | -servicedir = $(DBUS_SERVICE_DIR) |
42 | -service_in_files = gvfs-daemon.service.in |
43 | -service_DATA = gvfs-daemon.service |
44 | - |
45 | -%.mount: %.mount.in ../config.log |
46 | - $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ |
47 | - |
48 | -libexec_PROGRAMS=gvfsd gvfsd-sftp gvfsd-trash gvfsd-computer gvfsd-burn gvfsd-localtest gvfsd-ftp gvfsd-network |
49 | - |
50 | -mount_in_files = sftp.mount.in trash.mount.in computer.mount.in burn.mount.in localtest.mount.in network.mount.in |
51 | -mount_DATA = sftp.mount trash.mount computer.mount burn.mount localtest.mount network.mount |
52 | - |
53 | -mount_in_files += http.mount.in dav.mount.in dav+sd.mount.in ftp.mount.in |
54 | -if HAVE_HTTP |
55 | -mount_DATA += http.mount dav.mount ftp.mount |
56 | -if HAVE_AVAHI |
57 | -mount_DATA += dav+sd.mount |
58 | -endif |
59 | -libexec_PROGRAMS += gvfsd-http gvfsd-dav |
60 | -endif |
61 | - |
62 | -mount_in_files += smb.mount.in smb-browse.mount.in |
63 | -if HAVE_SAMBA |
64 | -mount_DATA += smb.mount smb-browse.mount |
65 | -libexec_PROGRAMS += gvfsd-smb-browse gvfsd-smb |
66 | -gvfs_gschemas += org.gnome.system.smb.gschema.xml |
67 | -gvfs_gschemas_convert += gvfs-smb.convert |
68 | -endif |
69 | - |
70 | -mount_in_files += cdda.mount.in |
71 | -if USE_CDDA |
72 | -mount_DATA += cdda.mount |
73 | -libexec_PROGRAMS += gvfsd-cdda |
74 | -endif |
75 | - |
76 | -mount_in_files += gphoto2.mount.in |
77 | -if USE_GPHOTO2 |
78 | -mount_DATA += gphoto2.mount |
79 | -libexec_PROGRAMS += gvfsd-gphoto2 |
80 | -endif |
81 | - |
82 | -mount_in_files += obexftp.mount.in |
83 | -if USE_OBEXFTP |
84 | -mount_DATA += obexftp.mount |
85 | -libexec_PROGRAMS += gvfsd-obexftp |
86 | -BUILT_SOURCES = obexftp-marshal.c obexftp-marshal.h |
87 | - |
88 | -obexftp-marshal.h: obexftp-marshal.list |
89 | - $(AM_V_GEN) glib-genmarshal $< --prefix=obexftp_marshal --header > $@ |
90 | - |
91 | -obexftp-marshal.c: obexftp-marshal.list |
92 | - $(AM_V_GEN) echo "#include \"obexftp-marshal.h\"" > $@ && glib-genmarshal $< --prefix=obexftp_marshal --body >> $@ |
93 | - |
94 | -endif |
95 | - |
96 | -mount_in_files += dns-sd.mount.in |
97 | -if HAVE_AVAHI |
98 | -mount_DATA += dns-sd.mount |
99 | -libexec_PROGRAMS += gvfsd-dnssd |
100 | -gvfs_gschemas += org.gnome.system.dns_sd.gschema.xml |
101 | -gvfs_gschemas_convert += gvfs-dns-sd.convert |
102 | -endif |
103 | - |
104 | -mount_in_files += archive.mount.in |
105 | -if HAVE_ARCHIVE |
106 | -mount_DATA += archive.mount |
107 | -libexec_PROGRAMS += gvfsd-archive |
108 | -endif |
109 | - |
110 | -mount_in_files += afc.mount.in |
111 | -if USE_AFC |
112 | -mount_DATA += afc.mount |
113 | -libexec_PROGRAMS += gvfsd-afc |
114 | -endif |
115 | - |
116 | -mount_in_files += afp-browse.mount.in afp.mount.in |
117 | -if USE_AFP |
118 | -mount_DATA += afp-browse.mount afp.mount |
119 | -libexec_PROGRAMS += gvfsd-afp-browse gvfsd-afp |
120 | -endif |
121 | - |
122 | -EXTRA_DIST = \ |
123 | - gvfs-daemon.service.in \ |
124 | - $(mount_in_files) \ |
125 | - obexftp-marshal.list \ |
126 | - $(gvfs_gschemas) \ |
127 | - $(gvfs_gschemas_convert_DATA) \ |
128 | - $(gsettings_ENUM_FILES) \ |
129 | - $(NULL) |
130 | - |
131 | -DISTCLEANFILES = gvfs-daemon.service $(mount_DATA) |
132 | - |
133 | -CLEANFILES = \ |
134 | - $(gsettings__enum_file) \ |
135 | - *.gschema.valid |
136 | - |
137 | -noinst_PROGRAMS = \ |
138 | - gvfsd-test \ |
139 | - $(NULL) |
140 | - |
141 | -libdaemon_la_SOURCES = \ |
142 | - gvfsdaemon.c gvfsdaemon.h \ |
143 | - gvfsbackend.c gvfsbackend.h \ |
144 | - gvfschannel.c gvfschannel.h \ |
145 | - gvfsreadchannel.c gvfsreadchannel.h \ |
146 | - gvfswritechannel.c gvfswritechannel.h \ |
147 | - gvfsmonitor.c gvfsmonitor.h \ |
148 | - gvfsdaemonutils.c gvfsdaemonutils.h \ |
149 | - gvfsjob.c gvfsjob.h \ |
150 | - gvfsjobsource.c gvfsjobsource.h \ |
151 | - gvfsjobdbus.c gvfsjobdbus.h \ |
152 | - gvfsjobmount.c gvfsjobmount.h \ |
153 | - gvfsjobunmount.c gvfsjobunmount.h \ |
154 | - gvfsjobmountmountable.c gvfsjobmountmountable.h \ |
155 | - gvfsjobunmountmountable.c gvfsjobunmountmountable.h \ |
156 | - gvfsjobstartmountable.c gvfsjobstartmountable.h \ |
157 | - gvfsjobstopmountable.c gvfsjobstopmountable.h \ |
158 | - gvfsjobpollmountable.c gvfsjobpollmountable.h \ |
159 | - gvfsjobopenforread.c gvfsjobopenforread.h \ |
160 | - gvfsjobopeniconforread.c gvfsjobopeniconforread.h \ |
161 | - gvfsjobread.c gvfsjobread.h \ |
162 | - gvfsjobseekread.c gvfsjobseekread.h \ |
163 | - gvfsjobcloseread.c gvfsjobcloseread.h \ |
164 | - gvfsjobopenforwrite.c gvfsjobopenforwrite.h \ |
165 | - gvfsjobwrite.c gvfsjobwrite.h \ |
166 | - gvfsjobseekwrite.c gvfsjobseekwrite.h \ |
167 | - gvfsjobclosewrite.c gvfsjobclosewrite.h \ |
168 | - gvfsjobqueryinfo.c gvfsjobqueryinfo.h \ |
169 | - gvfsjobqueryinforead.c gvfsjobqueryinforead.h \ |
170 | - gvfsjobqueryinfowrite.c gvfsjobqueryinfowrite.h \ |
171 | - gvfsjobqueryfsinfo.c gvfsjobqueryfsinfo.h \ |
172 | - gvfsjobenumerate.c gvfsjobenumerate.h \ |
173 | - gvfsjobsetdisplayname.c gvfsjobsetdisplayname.h \ |
174 | - gvfsjobtrash.c gvfsjobtrash.h \ |
175 | - gvfsjobdelete.c gvfsjobdelete.h \ |
176 | - gvfsjobcopy.c gvfsjobcopy.h \ |
177 | - gvfsjobmove.c gvfsjobmove.h \ |
178 | - gvfsjobpush.c gvfsjobpush.h \ |
179 | - gvfsjobpull.c gvfsjobpull.h \ |
180 | - gvfsjobmakedirectory.c gvfsjobmakedirectory.h \ |
181 | - gvfsjobmakesymlink.c gvfsjobmakesymlink.h \ |
182 | - gvfsjobsetattribute.c gvfsjobsetattribute.h \ |
183 | - gvfsjobqueryattributes.c gvfsjobqueryattributes.h \ |
184 | - gvfsjobcreatemonitor.c gvfsjobcreatemonitor.h \ |
185 | - dbus-gmain.h dbus-gmain.c \ |
186 | - gvfskeyring.h gvfskeyring.c \ |
187 | - $(NULL) |
188 | - |
189 | -gvfsd_SOURCES = \ |
190 | - mount.c mount.h \ |
191 | - main.c |
192 | - |
193 | -gvfsd_LDADD = $(libraries) |
194 | - |
195 | -gvfsd_test_SOURCES = \ |
196 | - gvfsbackendtest.c gvfsbackendtest.h \ |
197 | - daemon-main.c daemon-main.h \ |
198 | - daemon-main-generic.c |
199 | - |
200 | -gvfsd_test_CPPFLAGS = \ |
201 | - -DBACKEND_HEADER=gvfsbackendtest.h \ |
202 | - -DDEFAULT_BACKEND_TYPE=test \ |
203 | - -DBACKEND_TYPES='"test", G_VFS_TYPE_BACKEND_TEST,' |
204 | - |
205 | -gvfsd_test_LDADD = $(libraries) |
206 | - |
207 | -gvfsd_localtest_SOURCES = \ |
208 | - gvfsbackendlocaltest.c gvfsbackendlocaltest.h \ |
209 | - daemon-main.c daemon-main.h \ |
210 | - daemon-main-generic.c |
211 | - |
212 | -gvfsd_localtest_CPPFLAGS = \ |
213 | - -DBACKEND_HEADER=gvfsbackendlocaltest.h \ |
214 | - -DDEFAULT_BACKEND_TYPE=localtest \ |
215 | - -DBACKEND_TYPES='"localtest", G_VFS_TYPE_BACKEND_LOCALTEST,' |
216 | - |
217 | -gvfsd_localtest_LDADD = $(libraries) |
218 | - |
219 | -gvfsd_smb_SOURCES = \ |
220 | - gvfsbackendsmb.c gvfsbackendsmb.h libsmb-compat.h \ |
221 | - daemon-main.c daemon-main.h \ |
222 | - daemon-main-generic.c |
223 | - |
224 | -gvfsd_smb_CPPFLAGS = \ |
225 | - -DBACKEND_HEADER=gvfsbackendsmb.h \ |
226 | - -DDEFAULT_BACKEND_TYPE=smb-share \ |
227 | - -DMAX_JOB_THREADS=1 \ |
228 | - -DBACKEND_TYPES='"smb-share", G_VFS_TYPE_BACKEND_SMB,' |
229 | - |
230 | -gvfsd_smb_LDADD = $(SAMBA_LIBS) $(libraries) |
231 | - |
232 | -gvfsd_smb_browse_SOURCES = \ |
233 | - gvfsbackendsmbbrowse.c gvfsbackendsmbbrowse.h \ |
234 | - daemon-main.c daemon-main.h \ |
235 | - daemon-main-generic.c |
236 | - |
237 | -gvfsd_smb_browse_CPPFLAGS = \ |
238 | - -DBACKEND_HEADER=gvfsbackendsmbbrowse.h \ |
239 | - -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.smb_browse \ |
240 | - -DMAX_JOB_THREADS=1 \ |
241 | - -DBACKEND_TYPES='"smb-network", G_VFS_TYPE_BACKEND_SMB_BROWSE,"smb-server", G_VFS_TYPE_BACKEND_SMB_BROWSE,' |
242 | - |
243 | -gvfsd_smb_browse_LDADD = $(SAMBA_LIBS) $(libraries) |
244 | - |
245 | -gvfsd_obexftp_SOURCES = \ |
246 | - gvfsbackendobexftp.c gvfsbackendobexftp.h \ |
247 | - obexftp-marshal.c obexftp-marshal.h \ |
248 | - gvfsbackendobexftp-fl-parser.c gvfsbackendobexftp-fl-parser.h \ |
249 | - gvfsbackendobexftp-cap-parser.c gvfsbackendobexftp-cap-parser.h \ |
250 | - daemon-main.c daemon-main.h \ |
251 | - daemon-main-generic.c |
252 | - |
253 | -gvfsd_obexftp_CPPFLAGS = \ |
254 | - -DBACKEND_HEADER=gvfsbackendobexftp.h \ |
255 | - -DDEFAULT_BACKEND_TYPE=obex \ |
256 | - -DMAX_JOB_THREADS=1 \ |
257 | - -DBACKEND_TYPES='"obex", G_VFS_TYPE_BACKEND_OBEXFTP,' |
258 | -if USE_HAL |
259 | -gvfsd_obexftp_CPPFLAGS += $(HAL_CFLAGS) |
260 | -endif |
261 | - |
262 | -gvfsd_obexftp_LDADD = $(OBEXFTP_LIBS) $(EXPAT_LIBS) $(libraries) |
263 | -if USE_HAL |
264 | -gvfsd_obexftp_LDADD += $(HAL_LIBS) |
265 | -endif |
266 | - |
267 | -gvfsd_ftp_SOURCES = \ |
268 | - gvfsftpconnection.c gvfsftpconnection.h \ |
269 | - gvfsftpdircache.c gvfsftpdircache.h \ |
270 | - gvfsftpfile.c gvfsftpfile.h \ |
271 | - gvfsftptask.c gvfsftptask.h \ |
272 | - gvfsbackendftp.c gvfsbackendftp.h \ |
273 | - ParseFTPList.c ParseFTPList.h \ |
274 | - daemon-main.c daemon-main.h \ |
275 | - daemon-main-generic.c |
276 | - |
277 | -gvfsd_ftp_CPPFLAGS = \ |
278 | - -DBACKEND_HEADER=gvfsbackendftp.h \ |
279 | - -DDEFAULT_BACKEND_TYPE=ftp \ |
280 | - -DMAX_JOB_THREADS=10 \ |
281 | - -DBACKEND_TYPES='"ftp", G_VFS_TYPE_BACKEND_FTP,' |
282 | - |
283 | -gvfsd_ftp_LDADD = $(libraries) |
284 | - |
285 | -gvfsd_sftp_SOURCES = \ |
286 | - sftp.h \ |
287 | - gvfsbackendsftp.c gvfsbackendsftp.h \ |
288 | - pty_open.c pty_open.h \ |
289 | - daemon-main.c daemon-main.h \ |
290 | - daemon-main-generic.c |
291 | - |
292 | -gvfsd_sftp_CPPFLAGS = \ |
293 | - -DBACKEND_HEADER=gvfsbackendsftp.h \ |
294 | - -DDEFAULT_BACKEND_TYPE=sftp \ |
295 | - -DMAX_JOB_THREADS=1 \ |
296 | - -DSSH_PROGRAM=\"$(SSH_PROGRAM)\" \ |
297 | - -DBACKEND_TYPES='"sftp", G_VFS_TYPE_BACKEND_SFTP,' |
298 | - |
299 | -gvfsd_sftp_LDADD = $(libraries) |
300 | - |
301 | -gvfsd_trash_SOURCES = \ |
302 | - gvfsbackendtrash.c gvfsbackendtrash.h \ |
303 | - daemon-main.c daemon-main.h \ |
304 | - daemon-main-generic.c |
305 | - |
306 | -gvfsd_trash_CPPFLAGS = \ |
307 | - -DBACKEND_HEADER=gvfsbackendtrash.h \ |
308 | - -DDEFAULT_BACKEND_TYPE=trash \ |
309 | - -DMAX_JOB_THREADS=10 \ |
310 | - -DBACKEND_TYPES='"trash", G_VFS_TYPE_BACKEND_TRASH,' \ |
311 | - -Itrashlib |
312 | - |
313 | -gvfsd_trash_LDADD = trashlib/libtrash.a $(libraries) |
314 | - |
315 | -gvfsd_computer_SOURCES = \ |
316 | - gvfsbackendcomputer.c gvfsbackendcomputer.h \ |
317 | - daemon-main.c daemon-main.h \ |
318 | - daemon-main-generic.c |
319 | - |
320 | -gvfsd_computer_CPPFLAGS = \ |
321 | - -DBACKEND_HEADER=gvfsbackendcomputer.h \ |
322 | - -DDEFAULT_BACKEND_TYPE=computer \ |
323 | - -DMAX_JOB_THREADS=1 \ |
324 | - -DBACKEND_TYPES='"computer", G_VFS_TYPE_BACKEND_COMPUTER,' |
325 | - |
326 | -gvfsd_computer_LDADD = $(libraries) |
327 | - |
328 | -gvfsd_network_SOURCES = \ |
329 | - gvfsbackendnetwork.c gvfsbackendnetwork.h \ |
330 | - daemon-main.c daemon-main.h \ |
331 | - daemon-main-generic.c |
332 | - |
333 | -gvfsd_network_CPPFLAGS = \ |
334 | - -DBACKEND_HEADER=gvfsbackendnetwork.h \ |
335 | - -DDEFAULT_BACKEND_TYPE=network \ |
336 | - -DMAX_JOB_THREADS=1 \ |
337 | - -DBACKEND_TYPES='"network", G_VFS_TYPE_BACKEND_NETWORK,' |
338 | - |
339 | -gvfsd_network_LDADD = $(libraries) |
340 | - |
341 | -gvfsd_dnssd_SOURCES = \ |
342 | - gvfsbackenddnssd.c gvfsbackenddnssd.h \ |
343 | - daemon-main.c daemon-main.h \ |
344 | - daemon-main-generic.c |
345 | - |
346 | -gvfsd_dnssd_CPPFLAGS = \ |
347 | - -DBACKEND_HEADER=gvfsbackenddnssd.h \ |
348 | - -DDEFAULT_BACKEND_TYPE=dns-sd \ |
349 | - -DMAX_JOB_THREADS=1 \ |
350 | - $(AVAHI_CFLAGS) \ |
351 | - -DBACKEND_TYPES='"dns-sd", G_VFS_TYPE_BACKEND_DNS_SD,' |
352 | - |
353 | -gvfsd_dnssd_LDADD = $(libraries) $(AVAHI_LIBS) $(top_builddir)/common/libgvfscommon-dnssd.la |
354 | - |
355 | - |
356 | -gvfsd_archive_SOURCES = \ |
357 | - gvfsbackendarchive.c gvfsbackendarchive.h \ |
358 | - daemon-main.c daemon-main.h \ |
359 | - daemon-main-generic.c |
360 | - |
361 | -gvfsd_archive_CPPFLAGS = \ |
362 | - -DBACKEND_HEADER=gvfsbackendarchive.h \ |
363 | - -DDEFAULT_BACKEND_TYPE=archive \ |
364 | - -DMAX_JOB_THREADS=1 \ |
365 | - $(ARCHIVE_CFLAGS) \ |
366 | - -DBACKEND_TYPES='"archive", G_VFS_TYPE_BACKEND_ARCHIVE,' |
367 | - |
368 | -gvfsd_archive_LDADD = $(libraries) $(ARCHIVE_LIBS) |
369 | - |
370 | -gvfsd_burn_SOURCES = \ |
371 | - gvfsbackendburn.c gvfsbackendburn.h \ |
372 | - daemon-main.c daemon-main.h \ |
373 | - daemon-main-generic.c |
374 | - |
375 | -gvfsd_burn_CPPFLAGS = \ |
376 | - -DBACKEND_HEADER=gvfsbackendburn.h \ |
377 | - -DDEFAULT_BACKEND_TYPE=burn \ |
378 | - -DMAX_JOB_THREADS=1 \ |
379 | - -DBACKEND_TYPES='"burn", G_VFS_TYPE_BACKEND_BURN,' |
380 | - |
381 | -gvfsd_burn_LDADD = $(libraries) |
382 | - |
383 | -gvfsd_cdda_SOURCES = \ |
384 | - gvfsbackendcdda.c gvfsbackendcdda.h \ |
385 | - daemon-main.c daemon-main.h \ |
386 | - daemon-main-generic.c |
387 | - |
388 | -gvfsd_cdda_CPPFLAGS = \ |
389 | - -DBACKEND_HEADER=gvfsbackendcdda.h \ |
390 | - -DDEFAULT_BACKEND_TYPE=cdda \ |
391 | - -DMAX_JOB_THREADS=1 \ |
392 | - -DBACKEND_TYPES='"cdda", G_VFS_TYPE_BACKEND_CDDA,' \ |
393 | - $(CDDA_CFLAGS) |
394 | -if USE_GUDEV |
395 | -gvfsd_cdda_CPPFLAGS += $(GUDEV_CFLAGS) |
396 | -else |
397 | -gvfsd_cdda_CPPFLAGS += $(HAL_CFLAGS) |
398 | -endif |
399 | - |
400 | -if USE_GUDEV |
401 | -gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(GUDEV_LIBS) |
402 | -else |
403 | -gvfsd_cdda_LDADD = $(libraries) $(CDDA_LIBS) $(HAL_LIBS) |
404 | -endif |
405 | - |
406 | -gvfsd_gphoto2_SOURCES = \ |
407 | - gvfsbackendgphoto2.c gvfsbackendgphoto2.h \ |
408 | - daemon-main.c daemon-main.h \ |
409 | - daemon-main-generic.c |
410 | - |
411 | -gvfsd_gphoto2_CPPFLAGS = \ |
412 | - -DBACKEND_HEADER=gvfsbackendgphoto2.h \ |
413 | - -DDEFAULT_BACKEND_TYPE=gphoto2 \ |
414 | - -DMAX_JOB_THREADS=1 \ |
415 | - $(GPHOTO2_CFLAGS) \ |
416 | - -DBACKEND_TYPES='"gphoto2", G_VFS_TYPE_BACKEND_GPHOTO2,' |
417 | -if USE_GUDEV |
418 | -gvfsd_gphoto2_CPPFLAGS += $(GUDEV_CFLAGS) |
419 | -else |
420 | -gvfsd_gphoto2_CPPFLAGS += $(HAL_CFLAGS) |
421 | -endif |
422 | - |
423 | -if USE_GUDEV |
424 | -gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(GUDEV_LIBS) |
425 | -else |
426 | -gvfsd_gphoto2_LDADD = $(libraries) $(GPHOTO2_LIBS) $(HAL_LIBS) |
427 | -endif |
428 | - |
429 | -gvfsd_http_SOURCES = \ |
430 | - soup-input-stream.c soup-input-stream.h \ |
431 | - gvfsbackendhttp.c gvfsbackendhttp.h \ |
432 | - daemon-main.c daemon-main.h \ |
433 | - daemon-main-generic.c |
434 | - |
435 | -gvfsd_http_CPPFLAGS = \ |
436 | - -DBACKEND_HEADER=gvfsbackendhttp.h \ |
437 | - -DMOUNTABLE_DBUS_NAME=org.gtk.vfs.mountpoint.http \ |
438 | - -DDEFAULT_BACKEND_TYPE=http \ |
439 | - -DMAX_JOB_THREADS=1 \ |
440 | - $(HTTP_CFLAGS) \ |
441 | - -DBACKEND_TYPES='"http", G_VFS_TYPE_BACKEND_HTTP,' |
442 | - |
443 | -gvfsd_http_LDADD = $(libraries) $(HTTP_LIBS) |
444 | - |
445 | -gvfsd_dav_SOURCES = \ |
446 | - soup-input-stream.c soup-input-stream.h \ |
447 | - soup-output-stream.c soup-output-stream.h \ |
448 | - gvfsbackendhttp.c gvfsbackendhttp.h \ |
449 | - gvfsbackenddav.c gvfsbackenddav.h \ |
450 | - daemon-main.c daemon-main.h \ |
451 | - daemon-main-generic.c |
452 | - |
453 | -gvfsd_dav_CPPFLAGS = \ |
454 | - -DBACKEND_HEADER=gvfsbackenddav.h \ |
455 | - -DDEFAULT_BACKEND_TYPE=dav \ |
456 | - -DMAX_JOB_THREADS=1 \ |
457 | - $(HTTP_CFLAGS) |
458 | - |
459 | -if HAVE_AVAHI |
460 | -gvfsd_dav_CPPFLAGS += -DBACKEND_TYPES='"dav", G_VFS_TYPE_BACKEND_DAV, "dav+sd", G_VFS_TYPE_BACKEND_DAV, "davs+sd", G_VFS_TYPE_BACKEND_DAV,' |
461 | -else |
462 | -gvfsd_dav_CPPFLAGS += -DBACKEND_TYPES='"dav", G_VFS_TYPE_BACKEND_DAV,' |
463 | -endif |
464 | - |
465 | -gvfsd_dav_LDADD = $(libraries) $(HTTP_LIBS) |
466 | -if HAVE_AVAHI |
467 | -gvfsd_dav_LDADD += $(top_builddir)/common/libgvfscommon-dnssd.la |
468 | -endif |
469 | - |
470 | -gvfsd_afc_SOURCES = \ |
471 | - gvfsbackendafc.c gvfsbackendafc.h \ |
472 | - daemon-main.c daemon-main.h \ |
473 | - daemon-main-generic.c |
474 | - |
475 | -gvfsd_afc_CPPFLAGS = \ |
476 | - -DBACKEND_HEADER=gvfsbackendafc.h \ |
477 | - -DDEFAULT_BACKEND_TYPE=afc \ |
478 | - -DMAX_JOB_THREADS=1 \ |
479 | - $(AFC_CFLAGS) \ |
480 | - -DBACKEND_TYPES='"afc", G_VFS_TYPE_BACKEND_AFC,' |
481 | - |
482 | -gvfsd_afc_LDADD = \ |
483 | - $(libraries) \ |
484 | - $(AFC_LIBS) |
485 | - |
486 | -gvfsd_afp_browse_SOURCES = \ |
487 | - gvfsbackendafpbrowse.c gvfsbackendafpbrowse.h \ |
488 | - daemon-main.c daemon-main.h \ |
489 | - daemon-main-generic.c \ |
490 | - gvfsafpconnection.h \ |
491 | - gvfsafpconnection.c \ |
492 | - gvfsafpserver.h \ |
493 | - gvfsafpserver.c |
494 | - |
495 | -gvfsd_afp_browse_CPPFLAGS = \ |
496 | - -DBACKEND_HEADER=gvfsbackendafpbrowse.h \ |
497 | - -DMAX_JOB_THREADS=1 \ |
498 | - -DBACKEND_TYPES='"afp-server", G_VFS_TYPE_BACKEND_AFP_BROWSE,' \ |
499 | - $(LIBGCRYPT_CFLAGS) |
500 | - |
501 | -gvfsd_afp_browse_LDADD = \ |
502 | - $(libraries) \ |
503 | - $(LIBGCRYPT_LIBS) |
504 | - |
505 | -gvfsd_afp_SOURCES = \ |
506 | - gvfsbackendafp.c gvfsbackendafp.h \ |
507 | - daemon-main.c daemon-main.h \ |
508 | - daemon-main-generic.c \ |
509 | - gvfsafpconnection.h \ |
510 | - gvfsafpconnection.c \ |
511 | - gvfsafpserver.h \ |
512 | - gvfsafpserver.c |
513 | - |
514 | -gvfsd_afp_CPPFLAGS = \ |
515 | - -DBACKEND_HEADER=gvfsbackendafp.h \ |
516 | - -DMAX_JOB_THREADS=1 \ |
517 | - -DBACKEND_TYPES='"afp-volume", G_VFS_TYPE_BACKEND_AFP,' \ |
518 | - $(LIBGCRYPT_CFLAGS) |
519 | - |
520 | -gvfsd_afp_LDADD = \ |
521 | - $(libraries) \ |
522 | - $(LIBGCRYPT_LIBS) |
523 | - |
524 | - |
525 | -# GSettings stuff |
526 | -gsettings_ENUM_NAMESPACE = org.gnome.system.gvfs |
527 | -gsettings_ENUM_FILES = $(top_srcdir)/daemon/gvfs-enums.h |
528 | - |
529 | -gsettings_SCHEMAS = $(gvfs_gschemas) |
530 | - |
531 | -@GSETTINGS_RULES@ |
532 | - |
533 | -gvfs_gschemas_convertdir = $(datadir)/GConf/gsettings |
534 | -gvfs_gschemas_convert_DATA = $(gvfs_gschemas_convert) |
535 | |
536 | === modified file 'daemon/Makefile.am' |
537 | --- daemon/Makefile.am 2011-09-06 09:24:10 +0000 |
538 | +++ daemon/Makefile.am 2012-04-17 13:24:19 +0000 |
539 | @@ -19,14 +19,12 @@ |
540 | -DGVFS_LOCALEDIR=\""$(localedir)"\" \ |
541 | -DG_DISABLE_DEPRECATED |
542 | |
543 | -privlibdir = $(libdir)/gvfs |
544 | - |
545 | -privlib_LTLIBRARIES=libgvfsdaemon.la |
546 | +noinst_LTLIBRARIES=libdaemon.la |
547 | |
548 | libraries = \ |
549 | - libgvfsdaemon.la \ |
550 | + libdaemon.la \ |
551 | $(top_builddir)/common/libgvfscommon.la \ |
552 | - $(GLIB_LIBS) $(DBUS_LIBS) |
553 | + $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS) |
554 | |
555 | gvfs_gschemas = |
556 | gvfs_gschemas_convert = |
557 | @@ -135,7 +133,7 @@ |
558 | gvfsd-test \ |
559 | $(NULL) |
560 | |
561 | -libgvfsdaemon_la_SOURCES = \ |
562 | +libdaemon_la_SOURCES = \ |
563 | gvfsdaemon.c gvfsdaemon.h \ |
564 | gvfsbackend.c gvfsbackend.h \ |
565 | gvfschannel.c gvfschannel.h \ |
566 | @@ -183,12 +181,6 @@ |
567 | gvfskeyring.h gvfskeyring.c \ |
568 | $(NULL) |
569 | |
570 | -libgvfsdaemon_la_LDFLAGS = -avoid-version |
571 | - |
572 | -libgvfsdaemon_la_LIBADD = \ |
573 | - $(top_builddir)/common/libgvfscommon.la \ |
574 | - $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS) |
575 | - |
576 | gvfsd_SOURCES = \ |
577 | mount.c mount.h \ |
578 | main.c |
579 | |
580 | === modified file 'debian/changelog' |
581 | --- debian/changelog 2011-09-27 07:04:01 +0000 |
582 | +++ debian/changelog 2012-04-17 13:24:19 +0000 |
583 | @@ -1,3 +1,13 @@ |
584 | +gvfs (1.10.0-0ubuntu2) oneiric-updates; urgency=low |
585 | + |
586 | + [ Sebastien Bacher ] |
587 | + * 05_shared_lib: don't turn libgvfsdaemon into a static library, |
588 | + gvfs redefine some dbus-glib functions and having a library |
589 | + leads to load the wrong symbols, should fix the obex mount not |
590 | + working, thanks Eric Miao (lp: #899858) |
591 | + |
592 | + -- James M Leddy <james.leddy@ubuntu.com> Mon, 16 Apr 2012 17:23:08 -0400 |
593 | + |
594 | gvfs (1.10.0-0ubuntu1) oneiric; urgency=low |
595 | |
596 | [ Adam Glasgall ] |
597 | |
598 | === modified file 'debian/gvfs.install' |
599 | --- debian/gvfs.install 2011-04-13 17:17:02 +0000 |
600 | +++ debian/gvfs.install 2012-04-17 13:24:19 +0000 |
601 | @@ -5,7 +5,6 @@ |
602 | debian/tmp/usr/lib/gvfs/gvfsd-localtest |
603 | debian/tmp/usr/lib/gvfs/gvfsd-metadata |
604 | debian/tmp/usr/lib/gvfs/gvfsd-trash |
605 | -debian/tmp/usr/lib/gvfs/libgvfsdaemon.so |
606 | debian/tmp/usr/lib/gvfs/libgvfscommon.so |
607 | debian/tmp/usr/share/dbus-1/services/gvfs-daemon.service |
608 | debian/tmp/usr/share/dbus-1/services/gvfs-metadata.service |
609 | |
610 | === modified file 'debian/patches/05_shared_libdaemon.patch' |
611 | --- debian/patches/05_shared_libdaemon.patch 2011-07-08 07:05:54 +0000 |
612 | +++ debian/patches/05_shared_libdaemon.patch 2012-04-17 13:24:19 +0000 |
613 | @@ -1,47 +1,3 @@ |
614 | -Index: gvfs-1.9.1/daemon/Makefile.am |
615 | -=================================================================== |
616 | ---- gvfs-1.9.1.orig/daemon/Makefile.am 2011-06-13 17:31:01.000000000 +0200 |
617 | -+++ gvfs-1.9.1/daemon/Makefile.am 2011-07-08 07:12:15.498273284 +0200 |
618 | -@@ -19,12 +19,14 @@ |
619 | - -DGVFS_LOCALEDIR=\""$(localedir)"\" \ |
620 | - -DG_DISABLE_DEPRECATED |
621 | - |
622 | --noinst_LTLIBRARIES=libdaemon.la |
623 | -+privlibdir = $(libdir)/gvfs |
624 | -+ |
625 | -+privlib_LTLIBRARIES=libgvfsdaemon.la |
626 | - |
627 | - libraries = \ |
628 | -- libdaemon.la \ |
629 | -+ libgvfsdaemon.la \ |
630 | - $(top_builddir)/common/libgvfscommon.la \ |
631 | -- $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS) |
632 | -+ $(GLIB_LIBS) $(DBUS_LIBS) |
633 | - |
634 | - gvfs_gschemas = |
635 | - gvfs_gschemas_convert = |
636 | -@@ -127,7 +129,7 @@ |
637 | - gvfsd-test \ |
638 | - $(NULL) |
639 | - |
640 | --libdaemon_la_SOURCES = \ |
641 | -+libgvfsdaemon_la_SOURCES = \ |
642 | - gvfsdaemon.c gvfsdaemon.h \ |
643 | - gvfsbackend.c gvfsbackend.h \ |
644 | - gvfschannel.c gvfschannel.h \ |
645 | -@@ -175,6 +177,12 @@ |
646 | - gvfskeyring.h gvfskeyring.c \ |
647 | - $(NULL) |
648 | - |
649 | -+libgvfsdaemon_la_LDFLAGS = -avoid-version |
650 | -+ |
651 | -+libgvfsdaemon_la_LIBADD = \ |
652 | -+ $(top_builddir)/common/libgvfscommon.la \ |
653 | -+ $(GLIB_LIBS) $(DBUS_LIBS) $(KEYRING_LIBS) |
654 | -+ |
655 | - gvfsd_SOURCES = \ |
656 | - mount.c mount.h \ |
657 | - main.c |
658 | Index: gvfs-1.9.1/common/Makefile.am |
659 | =================================================================== |
660 | --- gvfs-1.9.1.orig/common/Makefile.am 2011-06-13 17:31:01.000000000 +0200 |
AFAICS, this looks good. The only thing I noticed wrong was that for an upload for SRU to Oneiric, the changelog entry should target oneiric-proposed, not oneiric-updates. I made the change myself while preparing the merge for an upload.
There was also some confusion with .pc/gvfs/ daemon/ Makefile. am, which shouldn't have been removed in the branch.
Needless to say, this will require careful testing on oneiric to verify that there are no regressions introduced with that change.