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

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 2f41ac96c6378474f9b83426a5cfe428a247a6ea
Author: Diane Trout <diane at ghic.org>
Date:   Fri Nov 1 22:23:48 2013 -0700

    Add 04_no_require_x11.patch from upstream
    
    Allows removing x11proto-core-dev dependency
---
 debian/changelog                       |  3 ++-
 debian/control                         |  3 +--
 debian/patches/04_no_require_x11.patch | 22 ++++++++++++++++++++++
 debian/patches/series                  |  2 ++
 4 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 838c216..3d5eb22 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 ktp-text-ui (0.7.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Add libqjson-dev, x11proto-core-dev to Build-Depends.
+  * Add libqjson-dev Build-Depends.
+  * Add 04_no_require_x11.patch from upstream
   * Bump ktp-common-internals and kde-telepath-data dependencies to 0.7.0
 
  -- Diane Trout <diane at ghic.org>  Tue, 29 Oct 2013 22:27:58 -0700
diff --git a/debian/control b/debian/control
index cb5c16f..3723d98 100644
--- a/debian/control
+++ b/debian/control
@@ -12,8 +12,7 @@ Build-Depends: debhelper (>= 9),
  libktpcommoninternalsprivate-dev (>= 0.7.0),
  libtelepathy-logger-dev,
  libtelepathy-logger-qt4-dev (>= 0.5.60),
- libqjson-dev,
- x11proto-core-dev,
+ libqjson-dev
 Standards-Version: 3.9.4
 Homepage: https://projects.kde.org/projects/extragear/network/telepathy/ktp-text-ui
 Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/kde-telepathy/ktp-text-ui.git
diff --git a/debian/patches/04_no_require_x11.patch b/debian/patches/04_no_require_x11.patch
new file mode 100644
index 0000000..741121d
--- /dev/null
+++ b/debian/patches/04_no_require_x11.patch
@@ -0,0 +1,22 @@
+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 e794978..012b27c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
 02_ktpchat_soversion.diff
+04_no_require_x11.patch
+

-- 
ktp-text-ui packaging