[SCM] mailimporter packaging branch, master, updated. debian/16.04.2-2-51-g92c6823

Maximiliano Curia maxy at moszumanska.debian.org
Sat Sep 2 17:05:15 UTC 2017


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

The following commit has been merged in the master branch:
commit 6c7ffc74c1c439161796e83aba55b89b4c49a455
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Mar 20 16:17:31 2017 +0000

    remove patches which no longer apply
---
 debian/libkf5mailimporter-dev.install   |  2 +-
 debian/patches/add_missing_include.diff | 21 ---------------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/libkf5mailimporter-dev.install b/debian/libkf5mailimporter-dev.install
index 2b35e60..3c4235b 100644
--- a/debian/libkf5mailimporter-dev.install
+++ b/debian/libkf5mailimporter-dev.install
@@ -1,5 +1,5 @@
-etc/xdg/mailimporter.renamecategories
 etc/xdg/mailimporter.categories
+etc/xdg/mailimporter.renamecategories
 usr/include/KF5/MailImporter/
 usr/include/KF5/mailimporter/
 usr/include/KF5/mailimporter_version.h
diff --git a/debian/patches/add_missing_include.diff b/debian/patches/add_missing_include.diff
deleted file mode 100644
index da2507b..0000000
--- a/debian/patches/add_missing_include.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Tue, 10 May 2016 21:05:13 +0200
-Subject: add_missing_include
-
----
- src/mailimporter_utils.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/mailimporter_utils.h b/src/mailimporter_utils.h
-index d6c7128..7ae311e 100644
---- a/src/mailimporter_utils.h
-+++ b/src/mailimporter_utils.h
-@@ -18,6 +18,8 @@
- #ifndef MAILIMPORTER_UTILS_H
- #define MAILIMPORTER_UTILS_H
- 
-+#include <QString>
-+
- namespace MailImporter
- {
- /**
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 6b2e721..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add_missing_include.diff

-- 
mailimporter packaging



More information about the pkg-kde-commits mailing list