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

[Emilio Pozuelo Monfort]

The following commit has been merged in the debian branch:
commit e83e27f890e779934c4d3af227275044fd424245
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Thu Jan 6 23:37:45 2011 +0000

    Fix the vala bindings build

diff --git a/debian/changelog b/debian/changelog
index 2df7d91..414533a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,15 @@
 telepathy-glib (0.13.10-1) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons ]
   * New upstream release
   * debian/control: Follow the new gir1.2 policy
 
+  [ Emilio Pozuelo Monfort ]
+  * debian/patches/01_fix_vala_bindings_build.patch:
+    - Don't introspect client-channel-factory for now, since
+      the vala gir parser chokes on it. This is fixed on Vala
+      0.11.3, so we can remove this patch when we have that.
+
  -- Sjoerd Simons <sjoerd at debian.org>  Wed, 05 Jan 2011 09:42:45 +0000
 
 telepathy-glib (0.13.9-1) experimental; urgency=low
diff --git a/debian/patches/01_fix_vala_bindings_build.patch b/debian/patches/01_fix_vala_bindings_build.patch
new file mode 100644
index 0000000..39a2333
--- /dev/null
+++ b/debian/patches/01_fix_vala_bindings_build.patch
@@ -0,0 +1,12 @@
+diff --git a/telepathy-glib/introspection.am b/telepathy-glib/introspection.am
+index 782064c..b8b84fc 100644
+--- a/telepathy-glib/introspection.am
++++ b/telepathy-glib/introspection.am
+@@ -14,7 +14,6 @@ INTROSPECTION_FILES = \
+ 	$(srcdir)/account-manager.c $(srcdir)/account-manager.h \
+ 	$(srcdir)/automatic-proxy-factory.c $(srcdir)/automatic-proxy-factory.h \
+ 	$(srcdir)/basic-proxy-factory.c $(srcdir)/basic-proxy-factory.h \
+-	$(srcdir)/client-channel-factory.c $(srcdir)/client-channel-factory.h \
+ 	$(srcdir)/connection.c $(srcdir)/connection.h \
+ 	$(srcdir)/connection-handles.c $(srcdir)/connection-contact-info.c \
+ 	$(srcdir)/protocol.c $(srcdir)/protocol.h \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8c847da
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_vala_bindings_build.patch

-- 
telepathy-glib packaging