[SCM] ktp-text-ui packaging branch, master, updated. debian/0.9.0+dfsg-1-11-ga1c2a80

[Diane Trout]

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

The following commit has been merged in the master branch:
commit a1c2a80a36c79f6350cb2001f1eb0494df09b6f9
Author: Diane Trout <diane at ghic.org>
Date:   Wed Jul 22 21:15:29 2015 -0700

    Don't apply 02_ktpchat_soversion.diff Remove diffs no longer being applied.
---
 debian/changelog                               |  2 ++
 debian/patches/01_no_useless_dependencies.diff | 29 ------------------
 debian/patches/02_ktpchat_soversion.diff       | 15 ---------
 debian/patches/03_no_redundant_glib_calls.diff | 42 --------------------------
 debian/patches/drop-tests.patch                | 12 --------
 debian/patches/series                          |  2 --
 6 files changed, 2 insertions(+), 100 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 56d5454..bf5104c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,8 @@ ktp-text-ui (15.04.3-1) UNRELEASED; urgency=medium
   * Remove kde-telepathy-text-ui.links scriptaculous was removed and
     jquery is being handled by kde-telepathy-text-ui.linktree
   * Update install paths for KF5 locations.
+  * Don't apply 02_ktpchat_soversion.diff
+    Remove diffs no longer being applied.
 
  -- Diane Trout <diane at debian.org>  Sun, 12 Jul 2015 21:15:11 -0700
 
diff --git a/debian/patches/01_no_useless_dependencies.diff b/debian/patches/01_no_useless_dependencies.diff
deleted file mode 100644
index b799e20..0000000
--- a/debian/patches/01_no_useless_dependencies.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: kde-telepathy-text-ui/cmake/modules/FindTelepathyLoggerQt4.cmake
-===================================================================
---- kde-telepathy-text-ui.orig/cmake/modules/FindTelepathyLoggerQt4.cmake	2012-11-28 00:10:21.936607799 +0530
-+++ kde-telepathy-text-ui/cmake/modules/FindTelepathyLoggerQt4.cmake	2012-11-29 00:04:39.198474099 +0530
-@@ -19,24 +19,13 @@
- set(TELEPATHY_LOGGER_QT4_LIBRARIES ${TELEPATHY_LOGGER_QT4_LIBRARY} )
- set(TELEPATHY_LOGGER_QT4_INCLUDE_DIRS ${TELEPATHY_LOGGER_QT4_INCLUDE_DIR} ${TELEPATHY_LOGGER_QT4_INCLUDE_DIR}/telepathy-logger-0.2 )
- 
--find_package(TelepathyLogger)
--find_package(TelepathyGlib)
--find_package(GObject)
--find_package(GIO)
--find_package(GLIB2)
- find_package(QtGLib)
- 
- list(APPEND TELEPATHY_LOGGER_QT4_LIBRARIES
--    ${TELEPATHY_LOGGER_LIBRARIES}
--    ${TELEPATHY_GLIB_LIBRARIES}
--    ${GLIB2_LIBRARIES}
--    ${GOBJECT_LIBRARIES}
-     ${QTGLIB_LIBRARIES}
--    ${GIO_LIBRARIES}
- )
- 
- list(APPEND TELEPATHY_LOGGER_QT4_INCLUDE_DIRS
--    ${GLIB2_INCLUDE_DIR}
-     ${QTGLIB_INCLUDE_DIR}
- )
- 
diff --git a/debian/patches/02_ktpchat_soversion.diff b/debian/patches/02_ktpchat_soversion.diff
deleted file mode 100644
index c2879a2..0000000
--- a/debian/patches/02_ktpchat_soversion.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Author: George Kiagiadakis, Diane Trout
-Description: Force a SO version number on libktpchat.
- later update so the SO version number defaults to the package version.
-
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -52,6 +52,8 @@
- 
- kde4_add_library(ktpchat SHARED ${ktpchat_SRCS})
- 
-+set_target_properties(ktpchat PROPERTIES SOVERSION 0 VERSION ${KTP_TEXT_UI_VERSION})
-+
- target_link_libraries(ktpchat
-     ${KDE4_KDECORE_LIBS}
-     ${KDE4_KIO_LIBS}
diff --git a/debian/patches/03_no_redundant_glib_calls.diff b/debian/patches/03_no_redundant_glib_calls.diff
deleted file mode 100644
index 4090039..0000000
--- a/debian/patches/03_no_redundant_glib_calls.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- a/lib/logmanager.cpp
-+++ b/lib/logmanager.cpp
-@@ -33,9 +33,6 @@
- #include <TelepathyLoggerQt4/TextEvent>
- #include <TelepathyLoggerQt4/CallEvent>
- #include <TelepathyLoggerQt4/LogManager>
--
--#include <glib-object.h>
--#include <QGlib/Init>
- #endif
- 
- #include <TelepathyQt/Types>
-@@ -48,8 +45,6 @@
-     m_fetchAmount(10)
- {
- #ifdef TELEPATHY_LOGGER_QT4_FOUND
--    g_type_init();
--    QGlib::init();
-     Tpl::init();
- 
-     m_logManager = Tpl::LogManager::instance();
---- a/logviewer/log-viewer.cpp
-+++ b/logviewer/log-viewer.cpp
-@@ -28,9 +28,6 @@
- #include <TelepathyLoggerQt4/Entity>
- #include <TelepathyLoggerQt4/LogManager>
- 
--#include <glib-object.h>
--#include <QGlib/Init>
--
- #include <QSortFilterProxyModel>
- 
- #include "entity-model.h"
-@@ -42,8 +39,6 @@
-     ui->setupUi(this);
-     setWindowIcon(KIcon(QLatin1String("documentation")));
-     Tp::registerTypes();
--    g_type_init();
--    QGlib::init(); //are these 4 really needed?
-     Tpl::init();
- 
-     m_accountManager = Tp::AccountManager::create();
diff --git a/debian/patches/drop-tests.patch b/debian/patches/drop-tests.patch
deleted file mode 100644
index ef76bed..0000000
--- a/debian/patches/drop-tests.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: kde-telepathy-text-ui/CMakeLists.txt
-===================================================================
---- kde-telepathy-text-ui.orig/CMakeLists.txt	2012-11-28 00:11:00.008612766 +0530
-+++ kde-telepathy-text-ui/CMakeLists.txt	2012-11-29 00:40:14.366838008 +0530
-@@ -48,7 +48,6 @@
- 
- 
- add_subdirectory(filters)
--add_subdirectory(tests)
- 
- find_package(Msgfmt REQUIRED)
- find_package(Gettext REQUIRED)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index f3a215a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-02_ktpchat_soversion.diff
-

-- 
ktp-text-ui packaging