[SCM] ksystemlog packaging branch, master, updated. debian/16.08.3-1-43-g203fe58

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ksystemlog.git;a=commitdiff;h=b8b545c

The following commit has been merged in the master branch:
commit b8b545c2bfc79ebc29ea7840a346a8bc87c348b7
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Jul 6 16:20:33 2016 +0100

    remove patches already in master
---
 debian/patches/maintainer_fix-test.diff          | 91 ------------------------
 debian/patches/maintainer_systemd_pkgconfig.diff | 13 ----
 debian/patches/series                            |  2 -
 3 files changed, 106 deletions(-)

diff --git a/debian/patches/maintainer_fix-test.diff b/debian/patches/maintainer_fix-test.diff
deleted file mode 100644
index 593f971..0000000
--- a/debian/patches/maintainer_fix-test.diff
+++ /dev/null
@@ -1,91 +0,0 @@
-commit 8283de282f103501ae8d0108db1c52feddfc331c
-Author: Harald Sitter <sitter at kde.org>
-Date:   Wed Jul 6 16:58:23 2016 +0200
-
-    make kiologfilereader test actually do something
-    
-    previously:
-    - it read from http which would error in the kjob but since
-      the kiologreader class has no facilities to communicate errors this
-      gets ignored
-    - it consturcted a !local! url from an http uri string resulting in kio
-      constructing a file slave for http://localhost...
-    - it had a 100 second wait for no good reason
-    - it didn't do any verification of any sort
-    - all in all this test was a fancy sleep 100
-    
-    new:
-    - replaced excess slot with lambda to compress test case to make it
-      more readable in one go
-    - find fixture on-disk via QFINDTESTDATA
-    - make logfile read that
-    - connect to read lines and line-for-line compare them with the fixture
-      (read via qtextstream)
-    
-    i.e. this test now actually checks that the logfile class can read lines
-    
-    REVIEW: 128328
-
-diff --git a/tests/kioLogFileReaderTest.cpp b/tests/kioLogFileReaderTest.cpp
-index 4c15f34..56a3390 100644
---- a/tests/kioLogFileReaderTest.cpp
-+++ b/tests/kioLogFileReaderTest.cpp
-@@ -2,6 +2,8 @@
-  *   KSystemLog, a system log viewer tool                                  *
-  *   Copyright (C) 2007 by Nicolas Ternisien                               *
-  *   nicolas.ternisien at gmail.com                                           *
-+ *   Copyright (C) 2016 by Harald Sitter                                   *
-+ *   sitter at kde.org                                                        *
-  *                                                                         *
-  *   This program is free software; you can redistribute it and/or modify  *
-  *   it under the terms of the GNU General Public License as published by  *
-@@ -43,8 +45,6 @@ private slots:
- 
-     void testKioLogFileReader();
- 
--    void readLine(const QString &line);
--
- private:
-     TestUtil testUtil;
- };
-@@ -56,27 +56,24 @@ void KioLogFileReaderTest::initTestCase()
- 
- void KioLogFileReaderTest::testKioLogFileReader()
- {
--    /*
--    QList<LogFile> logFiles = testUtil.createLogFiles(":/logs/logFileReader/file.txt");
--    LogFile logFile = logFiles.first();
--    */
--
--    /// home/nicolas/test.txt
--    LogFile logFile(QUrl::fromLocalFile(QStringLiteral("http://localhost/test.txt")),
-+    QString fixturePath = QFINDTESTDATA("testFiles/logFileReader/file.txt");
-+    LogFile logFile(QUrl::fromLocalFile(fixturePath),
-                     Globals::instance().informationLogLevel());
- 
-     KioLogFileReader *logFileReader = new KioLogFileReader(logFile);
--
-     logFileReader->open();
- 
--    connect(logFileReader, &KioLogFileReader::lineRead, this, &KioLogFileReaderTest::readLine);
--
--    QTest::qWait(100000);
--}
--
--void KioLogFileReaderTest::readLine(const QString &line)
--{
--    logDebug() << "Line " << line << endl;
-+    connect(logFileReader, &KioLogFileReader::lineRead, this, [=](const QString &line) {
-+        logDebug() << "Line " << line << endl;
-+        static QFile file(fixturePath);
-+        static bool open = false;
-+        if (!open) {
-+            QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));
-+            open = true;
-+        }
-+        static QTextStream stream(&file);
-+        QCOMPARE(line, stream.readLine());
-+    });
- }
- 
- QTEST_MAIN(KioLogFileReaderTest)
diff --git a/debian/patches/maintainer_systemd_pkgconfig.diff b/debian/patches/maintainer_systemd_pkgconfig.diff
deleted file mode 100644
index c91ce00..0000000
--- a/debian/patches/maintainer_systemd_pkgconfig.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/cmake/FindJournald.cmake b/cmake/FindJournald.cmake
-index 874d8ba..39bf54c 100644
---- a/cmake/FindJournald.cmake
-+++ b/cmake/FindJournald.cmake
-@@ -15,7 +15,7 @@
- # use pkg-config to get the directories and then use these values
- # in the FIND_PATH() and FIND_LIBRARY() calls
- find_package(PkgConfig)
--pkg_check_modules(PC_JOURNALD QUIET libsystemd-journal)
-+pkg_check_modules(PC_JOURNALD QUIET systemd)
- 
- set(JOURNALD_FOUND ${PC_JOURNALD_FOUND})
- set(JOURNALD_DEFINITIONS ${PC_JOURNALD_CFLAGS_OTHER})
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index d647521..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-maintainer_fix-test.diff
-maintainer_systemd_pkgconfig.diff

-- 
ksystemlog packaging