[SCM] syntax-highlighting packaging branch, master, updated. debian/5.37.0-3-51-gabd7d44
Maximiliano Curia
maxy at moszumanska.debian.org
Tue Jan 2 18:52:31 UTC 2018
Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/syntax-highlighting.git;a=commitdiff;h=541ce77
The following commit has been merged in the master branch:
commit 541ce7726e0c404b3fe6c93636960e6c87a39bf2
Author: Jonathan Riddell <jr at jriddell.org>
Date: Fri Jan 13 16:18:21 2017 +0000
remove patches now in git repo
---
debian/libkf5syntaxhighlighting5.install | 2 +-
.../0001-don-t-ignore-return-value-verify-it.patch | 27 ----------------------
debian/patches/series | 1 -
3 files changed, 1 insertion(+), 29 deletions(-)
diff --git a/debian/libkf5syntaxhighlighting5.install b/debian/libkf5syntaxhighlighting5.install
index 75a007b..bcc4cc2 100644
--- a/debian/libkf5syntaxhighlighting5.install
+++ b/debian/libkf5syntaxhighlighting5.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKF5SyntaxHighlighting.so.5.*
usr/lib/*/libKF5SyntaxHighlighting.so.5
+usr/lib/*/libKF5SyntaxHighlighting.so.5.*
diff --git a/debian/patches/0001-don-t-ignore-return-value-verify-it.patch b/debian/patches/0001-don-t-ignore-return-value-verify-it.patch
deleted file mode 100644
index 900a685..0000000
--- a/debian/patches/0001-don-t-ignore-return-value-verify-it.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2996ec02a5e442bc8edbaebb0bf0973c6ccfdd5f Mon Sep 17 00:00:00 2001
-From: Harald Sitter <sitter at kde.org>
-Date: Mon, 7 Nov 2016 13:39:28 +0100
-Subject: [PATCH] don't ignore return value, verify it
-
-if we can't mkdir the output dir all tests will fail on creating the output
-file, but rather implicitly at that
----
- autotests/testhighlighter.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/autotests/testhighlighter.cpp b/autotests/testhighlighter.cpp
-index f802381..2b2118c 100644
---- a/autotests/testhighlighter.cpp
-+++ b/autotests/testhighlighter.cpp
-@@ -144,7 +144,7 @@ private Q_SLOTS:
- << syntax;
- }
-
-- QDir().mkpath(QStringLiteral(TESTBUILDDIR "/output/"));
-+ QVERIFY(QDir().mkpath(QStringLiteral(TESTBUILDDIR "/output/")));
- }
-
- void testHighlight()
---
-2.7.4
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 611230e..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-don-t-ignore-return-value-verify-it.patch
--
syntax-highlighting packaging
More information about the pkg-kde-commits
mailing list