From 597c8d7e60d266ad995bdc7a87db5ce64de0c646 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 20 Sep 2012 12:00:54 -0500
Subject: revert r417 so that we don't change the vapi name at the last minute
 for 12.10 (LP: #978687)

---
 libdbusmenu-glib/Makefile.am | 6 +++---
 libdbusmenu-gtk/Makefile.am  | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libdbusmenu-glib/Makefile.am b/libdbusmenu-glib/Makefile.am
index 7fe8030..b2e796c 100644
--- a/libdbusmenu-glib/Makefile.am
+++ b/libdbusmenu-glib/Makefile.am
@@ -216,10 +216,10 @@ if HAVE_VALA
 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-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 a255a69..b52098f 100644
--- a/libdbusmenu-gtk/Makefile.am
+++ b/libdbusmenu-gtk/Makefile.am
@@ -160,14 +160,14 @@ if HAVE_VALA
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
-vapi_DATA = dbusmenu-gtk$(VER)-0.4.vapi
+vapi_DATA = DbusmenuGtk$(VER)-0.4.vapi
 
-dbusmenu-gtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
-	$(VALA_API_GEN) --library=dbusmenu-gtk$(VER)-0.4 \
+DbusmenuGtk$(VER)-0.4.vapi: DbusmenuGtk$(VER)-0.4.tmp.gir Makefile.am
+	$(VALA_API_GEN) --library=DbusmenuGtk$(VER)-0.4 \
 		--pkg gdk-pixbuf-2.0 \
 		--pkg $(GTKVALA) \
 		--pkg atk \
-		--pkg dbusmenu-glib-0.4 \
+		--pkg Dbusmenu-0.4 \
 		--vapidir=$(top_builddir)/libdbusmenu-glib \
 		$<
 
-- 
cgit v1.2.3


From 72c78368cd1771181f885be2da5a26ea13fa72ff Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Thu, 20 Sep 2012 12:02:04 -0500
Subject: 12.10.1

---
 NEWS         | 3 +++
 configure.ac | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/NEWS b/NEWS
index d6ecc08..c9cc147 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+12.10.1
+ - Revert the vala bindings' naming for the 12.10 cycle; revisit next time
+
 12.10.0
  - Honor changes to GtkSettings' gtk-menu-images value (LP: #927236)
  - don't display an underscore on menuitimes containing a '&' (LP: #994564)
diff --git a/configure.ac b/configure.ac
index e0c61bd..9a05419 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,11 +1,11 @@
 
-AC_INIT(libdbusmenu, 12.10.0, ted@canonical.com)
+AC_INIT(libdbusmenu, 12.10.1, ted@canonical.com)
 AC_COPYRIGHT([Copyright 2009,2010 Canonical])
 
 AC_PREREQ(2.62)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(libdbusmenu, 12.10.0, [-Wno-portability])
+AM_INIT_AUTOMAKE(libdbusmenu, 12.10.1, [-Wno-portability])
 
 AM_MAINTAINER_MODE
 
-- 
cgit v1.2.3