Merge lp:~charlesk/libdbusmenu/lp-978687 into lp:libdbusmenu/0.6

[Charles Kerr]

This branch applies Evan Nemerson's patch to make the Vala bindings use pkg-config names, rather than GIR names, so that valac can automatically pick up the relevant libraries and flags.

[Conor Curran (cjcurran)]

Looks to be the sensible way forward. Once this ships, we will need to change the name of the vapi that is referenced in the makefile.am for i-sound so as the vala dbus hookup continues to work.

review: Approve

[Ted Gould (ted)]

Makes sense, but we should probably do that early in the 12.10 cycle instead of 12.04 at this point as packages would have to change and adjust to it.

=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2012-04-04 02:33:03 +0000
+++ libdbusmenu-glib/Makefile.am	2012-04-11 22:48:22 +0000
@@ -216,10 +216,10 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = Dbusmenu-0.4.vapi
+vapi_DATA = dbusmenu-glib-0.4.vapi
 
-Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
-	$(VALA_API_GEN) --library=Dbusmenu-0.4 $<
+dbusmenu-glib-0.4.vapi: Dbusmenu-0.4.gir
+	$(VALA_API_GEN) --library=dbusmenu-glib-0.4 $<
 
 CLEANFILES += $(vapi_DATA)
 

=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2012-03-28 04:40:23 +0000
+++ libdbusmenu-gtk/Makefile.am	2012-04-11 22:48:22 +0000
@@ -160,14 +160,14 @@
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
+vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi
 
-DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
-	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
+dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+	$(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
 		--pkg gdk-pixbuf-2.0 \
 		--pkg $(GTKVALA) \
 		--pkg atk \
-		--pkg Dbusmenu-0.4 \
+		--pkg dbusmenu-glib-0.4 \
 		--vapidir=$(top_builddir)/libdbusmenu-glib \
 		$<