Merged GI fixes from lp:~ken-vandine/dbusmenu/lp713099 (LP: #713099)

5 files changed, 24 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index 122d0f4..85fcb72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdbusmenu (0.3.96-0ubuntu4~test1) UNRELEASED; urgency=low
+
+  * Merged GI fixes from lp:~ken-vandine/dbusmenu/lp713099 (LP: #713099)
+
+ -- Ken VanDine <ken.vandine@canonical.com>  Wed, 09 Feb 2011 12:51:53 -0500
+
 libdbusmenu (0.3.96-0ubuntu3) natty; urgency=low
 
   * libdbusmenu-gtk/parser.c
diff --git a/debian/gir1.2-dbusmenu-glib-0.4.install b/debian/gir1.2-dbusmenu-glib-0.4.install
index bca065f..20751be 100644
--- a/debian/gir1.2-dbusmenu-glib-0.4.install
+++ b/debian/gir1.2-dbusmenu-glib-0.4.install
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-1.0/Dbusmenu-Glib-0.4.typelib
+debian/tmp/usr/lib/girepository-1.0/Dbusmenu-0.4.typelib
diff --git a/debian/libdbusmenu-glib-dev.install b/debian/libdbusmenu-glib-dev.install
index 35c7805..f8e0345 100644
--- a/debian/libdbusmenu-glib-dev.install
+++ b/debian/libdbusmenu-glib-dev.install
@@ -2,5 +2,5 @@ debian/tmp/usr/include/libdbusmenu-0.4/libdbusmenu-glib/*
 debian/tmp/usr/lib/pkgconfig/dbusmenu-glib-0.4.pc
 debian/tmp/usr/lib/libdbusmenu-glib.a
 debian/tmp/usr/lib/libdbusmenu-glib.so
-debian/tmp/usr/share/gir-1.0/Dbusmenu-Glib-0.4.gir
-debian/tmp/usr/share/vala/vapi/Dbusmenu-Glib-0.4.vapi
+debian/tmp/usr/share/gir-1.0/Dbusmenu-0.4.gir
+debian/tmp/usr/share/vala/vapi/Dbusmenu-0.4.vapi
diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index a139f7c..e6877b6 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -138,18 +138,18 @@ if HAVE_INTROSPECTION
 
 introspection_sources = $(libdbusmenu_glibinclude_HEADERS)
 
-Dbusmenu_Glib-0.4.gir: libdbusmenu-glib.la
-Dbusmenu_Glib_0_4_gir_INCLUDES = \
+Dbusmenu-0.4.gir: libdbusmenu-glib.la
+Dbusmenu_0_4_gir_INCLUDES = \
 	GObject-2.0
-Dbusmenu_Glib_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
-Dbusmenu_Glib_0_4_gir_LIBS = libdbusmenu-glib.la
-Dbusmenu_Glib_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
-Dbusmenu_Glib_0_4_gir_NAMESPACE = Dbusmenu
-Dbusmenu_Glib_0_4_gir_VERSION = Glib-0.4
-Dbusmenu_Glib_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
-Dbusmenu_Glib_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
+Dbusmenu_0_4_gir_CFLAGS = $(DBUSMENUGLIB_CFLAGS) -I$(top_srcdir)
+Dbusmenu_0_4_gir_LIBS = libdbusmenu-glib.la
+Dbusmenu_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
+Dbusmenu_0_4_gir_NAMESPACE = Dbusmenu
+Dbusmenu_0_4_gir_VERSION = 0.4
+Dbusmenu_0_4_gir_EXPORT_PACKAGES = dbusmenu-glib-0.4
+Dbusmenu_0_4_gir_SCANNER_FLAGS = $(INTROSPECTION_SCANNER_ARGS)
 
-INTROSPECTION_GIRS += Dbusmenu-Glib-0.4.gir
+INTROSPECTION_GIRS += Dbusmenu-0.4.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)
@@ -168,10 +168,10 @@ endif
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = Dbusmenu-Glib-0.4.vapi
+vapi_DATA = Dbusmenu-0.4.vapi
 
-Dbusmenu-Glib-0.4.vapi: Dbusmenu-Glib-0.4.gir
-	$(VALA_API_GEN) --library=Dbusmenu-Glib-0.4 $<
+Dbusmenu-0.4.vapi: Dbusmenu-0.4.gir
+	$(VALA_API_GEN) --library=Dbusmenu-0.4 $<
 
 CLEANFILES += $(vapi_DATA)
 
diff --git a/libdbusmenu-gtk/Makefile.am b/libdbusmenu-gtk/Makefile.am
index f3556e9..f66f1f5 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -98,7 +98,7 @@ DbusmenuGtk$(VER)-0.4.gir: libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_4_gir_INCLUDES = \
 	GObject-2.0 \
 	$(GTKGIR) \
-	Dbusmenu-Glib-0.4 
+	Dbusmenu-0.4 
 DbusmenuGtk_0_4_gir_CFLAGS = $(DBUSMENUGTK_CFLAGS) -I$(top_srcdir)
 DbusmenuGtk_0_4_gir_LIBS = libdbusmenu-gtk$(VER).la
 DbusmenuGtk_0_4_gir_FILES = $(addprefix $(srcdir)/, $(introspection_sources))
@@ -141,7 +141,7 @@ DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
 		--pkg gdk-pixbuf-2.0 \
 		--pkg $(GTKVALA) \
 		--pkg atk \
-		--pkg Dbusmenu-Glib-0.4 \
+		--pkg Dbusmenu-0.4 \
 		--vapidir=$(top_builddir)/libdbusmenu-glib \
 		$<