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

Emilio Pozuelo Monfort emilio.pozuelo at collabora.co.uk
Thu Feb 17 08:31:39 UTC 2011


The following commit has been merged in the debian branch:
commit 4f6f777e844546a3b8c51cdc82c9f4047cfcdc8e
Author: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
Date:   Fri Jan 7 00:12:15 2011 +0000

    More gir 1.2 fixes

diff --git a/debian/changelog b/debian/changelog
index 878467f..a671e11 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ telepathy-glib (0.13.10-1) UNRELEASED; urgency=low
       0.11.3, so we can remove this patch when we have that.
   * debian/libtelepathy-glib0.symbols:
     - Updated for the new release.
+  * debian/gir1.[02]-telepathyglib-0.12.install,
+    debian/control:
+    - More gir 1.2 fixes.
 
  -- Sjoerd Simons <sjoerd at debian.org>  Wed, 05 Jan 2011 09:42:45 +0000
 
diff --git a/debian/control b/debian/control
index a51b016..951c61a 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: autotools-dev (>= 20100122-1~),
                dbus,
                debhelper (>= 8),
                gir1.2-glib-2.0,
-               gobject-introspection (>= 0.9.6),
+               gobject-introspection (>= 0.10.0-2~),
                libgirepository1.0-dev (>= 0.9.6),
                libglib2.0-dev (>= 2.26),
                libdbus-glib-1-dev (>= 0.82),
@@ -90,6 +90,7 @@ Package: gir1.2-telepathyglib-0.12
 Architecture: any
 Depends: ${gir:Depends}, ${misc:Depends}
 Conflicts: gir1.0-telepathyglib-0.12
+Replaces: gir1.0-telepathyglib-0.12
 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.
diff --git a/debian/gir1.0-telepathyglib-0.12.install b/debian/gir1.2-telepathyglib-0.12.install
similarity index 100%
rename from debian/gir1.0-telepathyglib-0.12.install
rename to debian/gir1.2-telepathyglib-0.12.install

-- 
telepathy-glib packaging



More information about the Pkg-telepathy-commits mailing list