[SCM] ktp-text-ui packaging branch, master, updated. debian/0.6.3-1-24-gd1120c6

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-text-ui.git;a=commitdiff;h=c15ee05

The following commit has been merged in the master branch:
commit c15ee059c4ebcfad891dabe7c563142ca1935466
Author: Diane Trout <diane at ghic.org>
Date:   Mon Apr 7 23:16:11 2014 -0700

    Remove 04_no_require_x11.patch
---
 debian/changelog                       |  1 +
 debian/patches/04_no_require_x11.patch | 22 ----------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efbe426..8839465 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ ktp-text-ui (0.8.0.1-1) UNRELEASED; urgency=low
   * New upstream release
   * Update Standards-Version to 3.9.5. No changes needed.
   * Bump ktp-common-internals and kde-telepath-data dependencies to 0.8.0
+  * Remove 04_no_require_x11.patch
 
  -- Diane Trout <diane at ghic.org>  Thu, 20 Feb 2014 09:13:39 -0800
 
diff --git a/debian/patches/04_no_require_x11.patch b/debian/patches/04_no_require_x11.patch
deleted file mode 100644
index 741121d..0000000
--- a/debian/patches/04_no_require_x11.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit bfb273626f542b1826398e87a8099f8cf89a10a4
-Author: Rohan Garg <rohan at kde.org>
-Date:   Tue Oct 29 14:10:57 2013 +0100
-
-    Drop X11/Xproto.h, this seems to have been inherited from Kopete
-    
-    REVIEWED-BY: David Edmundson <david at davidedmundson.co.uk>
-
-diff --git a/filters/latex/latex-filter.cpp b/filters/latex/latex-filter.cpp
-index bb12d1b..c7122ff 100644
---- a/filters/latex/latex-filter.cpp
-+++ b/filters/latex/latex-filter.cpp
-@@ -32,9 +32,6 @@
- #include <KStandardDirs>
- #include <KProcess>
- 
--#ifndef Q_OS_WIN
--#include <X11/Xproto.h>
--#endif
- LatexFilter::LatexFilter(QObject* parent, const QVariantList &)
-     : AbstractMessageFilter(parent)
- {
diff --git a/debian/patches/series b/debian/patches/series
index 012b27c..f3a215a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 02_ktpchat_soversion.diff
-04_no_require_x11.patch
 

-- 
ktp-text-ui packaging