[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian-experimental, updated. debian/3.3.90.2-1-8-gb5f23ba

[Laurent Bigonville]

The following commit has been merged in the debian-experimental branch:
commit bfb8c29b71c39b311c303dcb093d1777b8cd339c
Author: Laurent Bigonville <bigon at bigon.be>
Date:   Fri Mar 30 22:08:31 2012 +0200

    Drop debian/patches/use_champlain-0.12.patch: Applied upstream

diff --git a/debian/changelog b/debian/changelog
index e4b1cc5..4d9de51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 empathy (3.4.0-1) UNRELEASED; urgency=low
 
   * New upstream release
+  * Drop debian/patches/use_champlain-0.12.patch: Applied upstream
 
- -- Laurent Bigonville <bigon at debian.org>  Fri, 30 Mar 2012 22:07:33 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Fri, 30 Mar 2012 22:08:14 +0200
 
 empathy (3.3.90.2-1) experimental; urgency=low
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9bfe997..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-use_champlain-0.12.patch
diff --git a/debian/patches/use_champlain-0.12.patch b/debian/patches/use_champlain-0.12.patch
deleted file mode 100644
index d433359..0000000
--- a/debian/patches/use_champlain-0.12.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-diff --git a/configure.ac b/configure.ac
-index 3a0c72d..4287601 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -293,9 +293,6 @@ fi
- # -----------------------------------------------------------
- IT_PROG_INTLTOOL([0.40.0])
- 
--AM_GNU_GETTEXT_VERSION([0.17])
--AM_GNU_GETTEXT([external])
--
- GETTEXT_PACKAGE=empathy
- AC_SUBST(GETTEXT_PACKAGE)
- AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[Gettext package name])
-@@ -432,8 +429,8 @@ if test "x$enable_map" != "xno"; then
-    PKG_CHECK_MODULES(LIBCHAMPLAIN,
-     [
-        clutter-gtk-1.0
--       champlain-gtk-0.14
--       champlain-0.14 >= $CHAMPLAIN_REQUIRED
-+       champlain-gtk-0.12
-+       champlain-0.12 >= $CHAMPLAIN_REQUIRED
-     ], have_libchamplain="yes", have_libchamplain="no")
- 
-    if test "x$have_libchamplain" = "xyes"; then

-- 
Empathy packaging