[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.1.2.1-1-5-gb04a266

[Laurent Bigonville]

The following commit has been merged in the debian branch:
commit b04a266566d253e4c92071e541d6820f01c639bb
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Mon Jul 4 17:13:59 2011 +0200

    Drop debian/patches/0001-add-missing-gio.patch: Applied upstream

diff --git a/debian/changelog b/debian/changelog
index 9d7a551..fab6a82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ empathy (3.1.3-1) UNRELEASED; urgency=low
 
   * New upstream release.
     - Bump libtelepathy-glib-dev and libwebkitgtk-3.0-dev build-dependencies
+  * Drop debian/patches/0001-add-missing-gio.patch: Applied upstream
 
- -- Laurent Bigonville <bigon at debian.org>  Mon, 04 Jul 2011 17:12:22 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Mon, 04 Jul 2011 17:13:42 +0200
 
 empathy (3.1.2.1-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-add-missing-gio.patch b/debian/patches/0001-add-missing-gio.patch
deleted file mode 100644
index 575f321..0000000
--- a/debian/patches/0001-add-missing-gio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/telepathy-yell/configure.ac
-+++ b/telepathy-yell/configure.ac
-@@ -91,7 +91,7 @@
- AM_CONDITIONAL(ENABLE_SHARED_LIBRARY, test "x$ENABLE_SHARED_LIBRARY" != "xno")
- 
- dnl Check for Glib
--PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28, gobject-2.0 >= 2.26])
-+PKG_CHECK_MODULES(GLIB, [glib-2.0 >= 2.28, gobject-2.0 >= 2.26, gio-2.0])
- 
- AC_SUBST(GLIB_CFLAGS)
- AC_SUBST(GLIB_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index ca3f6d3..2497acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-add-missing-gio.patch
 99_ltmain_as-needed.patch

-- 
Empathy packaging