[Pkg-telepathy-commits] [SCM] telepathy-glib packaging branch, debian, updated. debian/0.11.5-1+exp1-2-gb229938

[Simon McVittie]

The following commit has been merged in the debian branch:
commit b229938e2f8d3d80e04c9a647d98ee0864760196
Merge: 3fcd9ed7f8e90584a5cfd6ebdaa4b9e4577afd7d ce68c81bffc9bc4d223858d17be7c6fb52794080
Author: Simon McVittie <smcv at debian.org>
Date:   Mon May 17 15:25:40 2010 +0100

    Merge from experimental: add gir1.0-telepathyglib-0.12 binary package

diff --combined debian/changelog
index d2ac2e6,b8f1532..8315ad6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,18 @@@
 +telepathy-glib (0.11.5-2) UNRELEASED; urgency=low
 +
++  * Merge from experimental
++    - add gir1.0-telepathyglib-0.12 binary package
 +  * Relax gtk-doc-tools dependency from 1.14-2 to 1.14-2~, to be nice to
 +    derived distributions like Ubuntu
 +
 + -- Simon McVittie <smcv at debian.org>  Mon, 17 May 2010 15:21:27 +0100
 +
+ telepathy-glib (0.11.5-1+exp1) experimental; urgency=low
+ 
+   * Re-enable introspection (in experimental, for now)
+ 
+  -- Simon McVittie <smcv at debian.org>  Mon, 10 May 2010 18:11:36 +0100
+ 
  telepathy-glib (0.11.5-1) unstable; urgency=low
  
    * New upstream version with new API/ABI
diff --combined debian/control
index 152c974,302c8b5..b7d9283
--- a/debian/control
+++ b/debian/control
@@@ -10,12 -10,15 +10,15 @@@ Uploaders: Dafydd Harries <daf at debian.o
  Build-Depends: cdbs,
                 dbus,
                 debhelper (>= 5),
+                gir1.0-glib-2.0,
+                gobject-introspection (>= 0.6.10),
+                libgirepository1.0-dev (>= 0.6.10),
                 libglib2.0-dev (>= 2.24),
                 libdbus-glib-1-dev (>= 0.82),
                 libdbus-1-dev (>= 0.95),
                 xsltproc,
                 python,
 -               gtk-doc-tools (>= 1.14-2),
 +               gtk-doc-tools (>= 1.14-2~),
                 pkg-config (>= 0.21)
  Standards-Version: 3.8.4
  Vcs-Git: git://git.debian.org/git/pkg-telepathy/telepathy-glib.git
@@@ -76,3 -79,20 +79,20 @@@ Description: GLib Telepathy library (do
   including instant messaging, voice calls and video calls. It abstracts
   differences between protocols to provide a unified interface for
   applications.
+ 
+ Package: gir1.0-telepathyglib-0.12
+ Architecture: any
+ Section: libs
+ Depends: ${gir:Depends}, ${misc:Depends}
+ Description: GLib Telepathy connection manager library (GObject-Introspection)
+  This package contains introspection data for telepathy-glib, which can be used
+  to generate dynamic bindings for Telepathy components.
+  .
+  These GObject-Introspection bindings are considered to be experimental by the
+  maintainers of telepathy-glib, and might receive incompatible changes until
+  at least telepathy-glib 0.12.0.
+  .
+  Telepathy is a D-Bus framework for unifying real time communication,
+  including instant messaging, voice calls and video calls. It abstracts
+  differences between protocols to provide a unified interface for
+  applications.

-- 
telepathy-glib packaging