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