Generate a vapi, added valac build depends and reordered the build depends to be alphabetical.

Approved by PS Jenkins bot, Charles Kerr.

5 files changed, 53 insertions, 10 deletions

diff --git a/autogen.sh b/autogen.sh
index ab2f513..1abf3a7 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,5 +1,11 @@
-#!/bin/sh -e
+#!/bin/sh
 
-gtkdocize
-autoreconf -i -f
-intltoolize
+PKG_NAME="indicator-messages"
+
+which gnome-autogen.sh || {
+	echo "You need gnome-common from GNOME SVN"
+	exit 1
+}
+
+USE_GNOME2_MACROS=1 \
+. gnome-autogen.sh
diff --git a/configure.ac b/configure.ac
index b020d30..b699b4f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -122,6 +122,22 @@ else
 fi
 AC_SUBST(DBUSSERVICEDIR)
 
+###########################
+# Vala API Generation
+###########################
+
+AC_ARG_ENABLE([vala],
+        AC_HELP_STRING([--disable-vala], [Disable vala]),
+        [enable_vala=$enableval], [enable_vala=yes])
+
+AS_IF([test "x$enable_vala" != "xno"],[
+        AM_COND_IF([HAVE_INTROSPECTION],,[
+                AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
+        ])
+AC_PATH_PROG([VALA_API_GEN], [vapigen])
+])
+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"])
+
 ##############################
 # Custom Junk
 ##############################
@@ -197,5 +213,6 @@ Messaging Indicator Configuration:
 	gtest:         $enable_tests
 	gcov:          $use_gcov
 	introspecion:  $enable_introspection
+	Vala bindings: $enable_vala
 	documentation: $enable_gtk_doc
 ])
diff --git a/debian/control b/debian/control
index 546b5c9..f16f831 100644
--- a/debian/control
+++ b/debian/control
@@ -7,17 +7,18 @@ Uploaders: Evgeni Golov <evgeni@debian.org>
 Build-Depends: debhelper (>= 9),
                dh-autoreconf,
                dh-translations,
-               libgtk-3-dev (>= 3.5.12),
-               libdbus-glib-1-dev,
+               gobject-introspection (>= 0.9.12-4~),
+               gtk-doc-tools,
                intltool,
-               libindicator3-dev,
+               libdbus-glib-1-dev,
                libdbusmenu-glib-dev (>= 0.5.90),
                libdbusmenu-gtk3-dev (>= 0.5.90),
-               libtelepathy-glib-dev (>= 0.9.0),
-               gobject-introspection (>= 0.9.12-4~),
                libgirepository1.0-dev (>= 0.9.12),
-               gtk-doc-tools,
                libgtest-dev,
+               libgtk-3-dev (>= 3.5.18),
+               libindicator3-dev,
+               libtelepathy-glib-dev (>= 0.9.0),
+               valac,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/indicator-messages
 # If you aren't a member of ~indicator-applet-developers but need to upload
diff --git a/debian/libmessaging-menu-dev.install b/debian/libmessaging-menu-dev.install
index 75ef089..53e0312 100644
--- a/debian/libmessaging-menu-dev.install
+++ b/debian/libmessaging-menu-dev.install
@@ -2,4 +2,5 @@ usr/lib/libmessaging-menu.so
 usr/lib/pkgconfig
 usr/include /usr/
 usr/share/gir-1.0/
+usr/share/vala/
 usr/share/gtk-doc
diff --git a/libmessaging-menu/Makefile.am b/libmessaging-menu/Makefile.am
index d18538b..1042d9f 100644
--- a/libmessaging-menu/Makefile.am
+++ b/libmessaging-menu/Makefile.am
@@ -56,4 +56,22 @@ typelibdir = $(libdir)/girepository-1.0
 typelib_DATA = $(INTROSPECTION_GIRS:.gir=.typelib)
 
 CLEANFILES = $(gir_DATA) $(typelib_DATA)
+
+
+#########################
+# VAPI Files
+#########################
+
+if HAVE_VALA
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA = MessagingMenu-1.0.vapi
+
+MessagingMenu-1.0.vapi: MessagingMenu-1.0.gir
+	$(VALA_API_GEN) --pkg gio-2.0 --library=MessagingMenu-1.0 $<
+
+CLEANFILES += $(vapi_DATA)
+
+endif
+
 endif