Ubuntu One Client

Merge lp:~dobey/ubuntuone-client/support-older-vala into lp:ubuntuone-client

  1. support-older-vala
  2. Merge into trunk
Proposed by dobey
Status: Merged
Approved by: dobey
Approved revision: 843
Merged at revision: 842
Proposed branch: lp:~dobey/ubuntuone-client/support-older-vala
Merge into: lp:ubuntuone-client
Diff against target: 44 lines (+10/-10)
1 file modified
libsyncdaemon/Makefile.am (+10/-10)
To merge this branch: bzr merge lp:~dobey/ubuntuone-client/support-older-vala
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
Roman Yepishev (community) fieldtest Approve
Review via email: mp+48617@code.launchpad.net

Commit message

Switch the .gir bits to Syncdaemon instead of SyncDaemon to be correct

To post a comment you must log in.
Revision history for this message
dobey (dobey) wrote :

This should build successfully on Lucid, Maverick, or Natty. To test, make sure libsyncdaemon-1.0-dev is not already installed if you are on Natty, as the nightlies package already contains the libsyncdaemon-1.0.vapi, so the build may still succeed even if the local .vapi has not been generated, as valac will look at the installed one.

Revision history for this message
Roman Yepishev (rye) wrote :

No matter how hard we tried, vapidir gets somehow ignored - http://paste.ubuntu.com/562588/ - ran on Lucid

review: Needs Fixing (fieldtest)
Revision history for this message
Roman Yepishev (rye) wrote :

On maverick and lucid the generated vapi test prints CRITICAL message about assertion self != NULL failure. On natty it generates a correct code so approving.

review: Approve (fieldtest)
Revision history for this message
Roberto Alsina (ralsina) wrote :

 +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'libsyncdaemon/Makefile.am'
2--- libsyncdaemon/Makefile.am 2011-02-02 20:54:17 +0000
3+++ libsyncdaemon/Makefile.am 2011-02-04 19:43:25 +0000
4@@ -95,14 +95,14 @@
5 introspection_files = \
6 $(syncdaemoninclude_HEADERS) \
7 $(shell ls syncdaemon*.[ch])
8-SyncDaemon-1.0.gir: libsyncdaemon-1.0.la Makefile
9-SyncDaemon_1_0_gir_NAMESPACE = SyncDaemon
10-SyncDaemon_1_0_gir_INCLUDES = GObject-2.0
11-SyncDaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
12-SyncDaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la
13-SyncDaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
14-SyncDaemon_1_0_gir_EXPORT_PACKAGES = libsyncdaemon-1.0
15-INTROSPECTION_GIRS += SyncDaemon-1.0.gir
16+Syncdaemon-1.0.gir: libsyncdaemon-1.0.la Makefile
17+Syncdaemon_1_0_gir_NAMESPACE = Syncdaemon
18+Syncdaemon_1_0_gir_INCLUDES = GObject-2.0
19+Syncdaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
20+Syncdaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la
21+Syncdaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
22+Syncdaemon_1_0_gir_EXPORT_PACKAGES = libsyncdaemon-1.0
23+INTROSPECTION_GIRS += Syncdaemon-1.0.gir
24
25 girdir = $(datadir)/$(INTROSPECTION_GIRDIR_NAME)
26 gir_DATA = $(INTROSPECTION_GIRS)
27@@ -116,7 +116,7 @@
28 vapidir = $(datadir)/vala/vapi
29 vapi_DATA = libsyncdaemon-1.0.vapi libsyncdaemon-1.0.deps
30
31-libsyncdaemon-1.0.vapi: SyncDaemon-1.0.gir Makefile
32+libsyncdaemon-1.0.vapi: Syncdaemon-1.0.gir Makefile
33 $(VAPIGEN) --pkg gobject-2.0 --library libsyncdaemon-1.0 $<
34
35 libsyncdaemon-1.0.deps: libsyncdaemon-vala.deps Makefile
36@@ -125,7 +125,7 @@
37 noinst_PROGRAMS += test-libsyncdaemon-vapi
38
39 test_libsyncdaemon_vapi_SOURCES = \
40- libsyncdaemon-1.0.vapi \
41+ libsyncdaemon-1.0.vapi \
42 test-libsyncdaemon-vapi.vala
43
44 test_libsyncdaemon_vapi_VALAFLAGS = \

Subscribers

People subscribed via source and target branches