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
=== modified file 'libsyncdaemon/Makefile.am'
--- libsyncdaemon/Makefile.am 2011-02-02 20:54:17 +0000
+++ libsyncdaemon/Makefile.am 2011-02-04 19:43:25 +0000
@@ -95,14 +95,14 @@
95introspection_files = \95introspection_files = \
96 $(syncdaemoninclude_HEADERS) \96 $(syncdaemoninclude_HEADERS) \
97 $(shell ls syncdaemon*.[ch])97 $(shell ls syncdaemon*.[ch])
98SyncDaemon-1.0.gir: libsyncdaemon-1.0.la Makefile98Syncdaemon-1.0.gir: libsyncdaemon-1.0.la Makefile
99SyncDaemon_1_0_gir_NAMESPACE = SyncDaemon99Syncdaemon_1_0_gir_NAMESPACE = Syncdaemon
100SyncDaemon_1_0_gir_INCLUDES = GObject-2.0100Syncdaemon_1_0_gir_INCLUDES = GObject-2.0
101SyncDaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)101Syncdaemon_1_0_gir_CFLAGS = -I$(top_srcdir) -I$(top_builddir)
102SyncDaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la102Syncdaemon_1_0_gir_LIBS = libsyncdaemon-1.0.la
103SyncDaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))103Syncdaemon_1_0_gir_FILES = $(addprefix $(srcdir)/, $(introspection_files))
104SyncDaemon_1_0_gir_EXPORT_PACKAGES = libsyncdaemon-1.0104Syncdaemon_1_0_gir_EXPORT_PACKAGES = libsyncdaemon-1.0
105INTROSPECTION_GIRS += SyncDaemon-1.0.gir105INTROSPECTION_GIRS += Syncdaemon-1.0.gir
106106
107girdir = $(datadir)/$(INTROSPECTION_GIRDIR_NAME)107girdir = $(datadir)/$(INTROSPECTION_GIRDIR_NAME)
108gir_DATA = $(INTROSPECTION_GIRS)108gir_DATA = $(INTROSPECTION_GIRS)
@@ -116,7 +116,7 @@
116vapidir = $(datadir)/vala/vapi116vapidir = $(datadir)/vala/vapi
117vapi_DATA = libsyncdaemon-1.0.vapi libsyncdaemon-1.0.deps117vapi_DATA = libsyncdaemon-1.0.vapi libsyncdaemon-1.0.deps
118118
119libsyncdaemon-1.0.vapi: SyncDaemon-1.0.gir Makefile119libsyncdaemon-1.0.vapi: Syncdaemon-1.0.gir Makefile
120 $(VAPIGEN) --pkg gobject-2.0 --library libsyncdaemon-1.0 $<120 $(VAPIGEN) --pkg gobject-2.0 --library libsyncdaemon-1.0 $<
121121
122libsyncdaemon-1.0.deps: libsyncdaemon-vala.deps Makefile122libsyncdaemon-1.0.deps: libsyncdaemon-vala.deps Makefile
@@ -125,7 +125,7 @@
125noinst_PROGRAMS += test-libsyncdaemon-vapi125noinst_PROGRAMS += test-libsyncdaemon-vapi
126126
127test_libsyncdaemon_vapi_SOURCES = \127test_libsyncdaemon_vapi_SOURCES = \
128 libsyncdaemon-1.0.vapi \128 libsyncdaemon-1.0.vapi \
129 test-libsyncdaemon-vapi.vala129 test-libsyncdaemon-vapi.vala
130130
131test_libsyncdaemon_vapi_VALAFLAGS = \131test_libsyncdaemon_vapi_VALAFLAGS = \

Subscribers

People subscribed via source and target branches