[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.13.12-1

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 5176e10ea4a4c3e15aa26f1f456bafa202c2c275
Author: Simon McVittie <smcv at debian.org>
Date:   Thu Jul 15 10:50:18 2010 +0100

    Enable the experimental Vala bindings and install them in libtelepathy-glib-dev
    
    * Enable the experimental Vala bindings and install them in
      libtelepathy-glib-dev
    * Add telepathy-glib.deps (taken from upstream git) and install it alongside
      the Vala bindings, to have correct interdependencies

diff --git a/debian/changelog b/debian/changelog
index 1b217db..7bdc2da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+telepathy-glib (0.11.10-1+exp1) UNRELEASED; urgency=low
+
+  * Enable the experimental Vala bindings and install them in
+    libtelepathy-glib-dev
+  * Add telepathy-glib.deps (taken from upstream git) and install it alongside
+    the Vala bindings, to have correct interdependencies
+
+ -- Simon McVittie <smcv at debian.org>  Thu, 15 Jul 2010 10:30:41 +0100
+
 telepathy-glib (0.11.10-1) unstable; urgency=low
 
   [ Jonny Lamb ]
diff --git a/debian/control b/debian/control
index 39f8485..51a5e55 100644
--- a/debian/control
+++ b/debian/control
@@ -16,6 +16,8 @@ Build-Depends: cdbs,
                libglib2.0-dev (>= 2.24),
                libdbus-glib-1-dev (>= 0.82),
                libdbus-1-dev (>= 0.95),
+               libvala-dev (>= 0.9.3),
+               valac (>= 0.9.3),
                xsltproc,
                python,
                gtk-doc-tools (>= 1.15),
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6837223..0b71e87 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,5 +1,5 @@
 [DEFAULT]
-debian-branch = debian
+debian-branch = debian-experimental
 upstream-branch = upstream
 pristine-tar = True
 
diff --git a/debian/libtelepathy-glib-dev.install b/debian/libtelepathy-glib-dev.install
index c4f98c1..0882b7f 100644
--- a/debian/libtelepathy-glib-dev.install
+++ b/debian/libtelepathy-glib-dev.install
@@ -3,3 +3,6 @@ debian/tmp/usr/lib/libtelepathy-glib.a
 debian/tmp/usr/include/telepathy-1.0
 debian/tmp/usr/lib/pkgconfig/telepathy-glib.pc
 debian/tmp/usr/share/gir-1.0
+debian/tmp/usr/lib/pkgconfig/telepathy-vala.pc
+debian/tmp/usr/share/telepathy/vapi/telepathy-glib.vapi
+debian/telepathy-glib.deps usr/share/telepathy/vapi
diff --git a/debian/rules b/debian/rules
index a89345e..bfe2a24 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,6 +18,7 @@ DEB_MAKE_CHECK_TARGET := check
 DEB_CONFIGURE_EXTRA_FLAGS := \
 	--disable-Werror \
 	--enable-introspection \
+	--enable-vala-bindings \
 	--enable-gtk-doc \
 	--with-html-dir=\$${prefix}/share/doc/libtelepathy-glib-doc
 
diff --git a/debian/telepathy-glib.deps b/debian/telepathy-glib.deps
new file mode 100644
index 0000000..d4db059
--- /dev/null
+++ b/debian/telepathy-glib.deps
@@ -0,0 +1,2 @@
+gobject-2.0
+gio-2.0

-- 
telepathy-glib packaging