[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.1.5-1-6-g3a903c4

[Jonny Lamb]

The following commit has been merged in the debian branch:
commit ad52a1340c9ca710be404a18ccc8d012fa622755
Author: Jonny Lamb <jonny at debian.org>
Date:   Mon Aug 22 11:20:50 2011 +0100

    debian/patches/0001-Fix-call-event.h-detection.patch: Removed now that it's upstream.

diff --git a/debian/changelog b/debian/changelog
index be03deb..837fddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 empathy (3.1.5.1-1) UNRELEASED; urgency=low
 
   * New upstream release.
+  * debian/patches/0001-Fix-call-event.h-detection.patch: Removed now that
+    it's upstream.
 
- -- Jonny Lamb <jonny at debian.org>  Mon, 22 Aug 2011 11:12:43 +0100
+ -- Jonny Lamb <jonny at debian.org>  Mon, 22 Aug 2011 11:20:22 +0100
 
 empathy (3.1.5-1) experimental; urgency=low
 
diff --git a/debian/patches/0001-Fix-call-event.h-detection.patch b/debian/patches/0001-Fix-call-event.h-detection.patch
deleted file mode 100644
index 687a0f1..0000000
--- a/debian/patches/0001-Fix-call-event.h-detection.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 2bc1a19aa4f11448eed3bacc38642b5da8d8b0f5 Mon Sep 17 00:00:00 2001
-From: Laurent Bigonville <bigon at bigon.be>
-Date: Fri, 19 Aug 2011 14:55:25 +0200
-Subject: [PATCH] Fix call-event.h detection
-
-Correctly set the LDFLAGS from EMPATHY_LDFLAGS so AC_CHECK_HEADER can
-find call-event.h
----
- configure.ac |    3 +++
- 1 files changed, 3 insertions(+), 0 deletions(-)
-
---- a/configure.ac
-+++ b/configure.ac
-@@ -226,14 +226,17 @@
- if test "x$enable_call_logs" != "xno" ; then
-    SAVE_CFLAGS=$CFLAGS
-    SAVE_CPPFLAGS=$CPPFLAGS
-+   SAVE_LDFLAGS=$LDFLAGS
-    CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
-    CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
-+   LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
- 
-    AC_CHECK_HEADER(telepathy-logger/call-event.h,
-       have_call_logs="yes", have_call_logs="no")
- 
-    CFLAGS=$SAVE_CFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-+   LDFLAGS=$SAVE_LDFLAGS
- 
-    if test "x$have_call_logs" = "xyes"; then
-       AC_DEFINE(HAVE_CALL_LOGS, 1, [Define if you have call log support])
---- a/configure
-+++ b/configure
-@@ -15093,11 +15101,13 @@
- if test "x$enable_call_logs" != "xno" ; then
-    SAVE_CFLAGS=$CFLAGS
-    SAVE_CPPFLAGS=$CPPFLAGS
-+   SAVE_LDFLAGS=$LDFLAGS
-    CFLAGS="$CFLAGS $EMPATHY_CFLAGS"
-    CPPFLAGS="$CPPFLAGS $EMPATHY_CFLAGS"
-+   LDFLAGS="$LDFLAGS $EMPATHY_LDFLAGS"
- 
-    ac_fn_c_check_header_mongrel "$LINENO" "telepathy-logger/call-event.h" "ac_cv_header_telepathy_logger_call_event_h" "$ac_includes_default"
--if test "x$ac_cv_header_telepathy_logger_call_event_h" = x""yes; then :
-+if test "x$ac_cv_header_telepathy_logger_call_event_h" = xyes; then :
-   have_call_logs="yes"
- else
-   have_call_logs="no"
-@@ -15107,6 +15117,7 @@
- 
-    CFLAGS=$SAVE_CFLAGS
-    CPPFLAGS=$SAVE_CPPFLAGS
-+   LDFLAGS=$SAVE_LDFLAGS
- 
-    if test "x$have_call_logs" = "xyes"; then
- 
diff --git a/debian/patches/series b/debian/patches/series
index 76217d0..2497acb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-0001-Fix-call-event.h-detection.patch
 99_ltmain_as-needed.patch

-- 
Empathy packaging