[SCM] KDE Base Runtime module packaging branch, master, updated. debian/16.04.2-2-4-g22aa37a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 22aa37a2f2293e6414a756898d691da0d7009746
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 31 16:04:47 2016 +0200

    stop shipping the custom /etc/sysctl.d/30-baloo-inotify-limit.conf
    
    this is the wrong place for it, and maybe no more needed
---
 debian/30-baloo-inotify-limit.conf | 1 -
 debian/changelog                   | 2 ++
 debian/kde-runtime.install         | 1 -
 debian/kde-runtime.maintscript     | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/30-baloo-inotify-limit.conf b/debian/30-baloo-inotify-limit.conf
deleted file mode 100644
index 57c955a..0000000
--- a/debian/30-baloo-inotify-limit.conf
+++ /dev/null
@@ -1 +0,0 @@
-fs.inotify.max_user_watches = 524288
diff --git a/debian/changelog b/debian/changelog
index bfb4db5..014829c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ kde-runtime (4:16.04.3-0r1) UNRELEASED; urgency=medium
       drop, backported
     - upstream_cmake-fix-add_definitions-according-to-new-policy.patch: drop,
       backported
+  * Stop shipping the custom /etc/sysctl.d/30-baloo-inotify-limit.conf: this
+    is the wrong place for it, and maybe no more needed.
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 31 Jul 2016 15:37:23 +0200
 
diff --git a/debian/kde-runtime.install b/debian/kde-runtime.install
index d9f7fde..893147d 100644
--- a/debian/kde-runtime.install
+++ b/debian/kde-runtime.install
@@ -1,4 +1,3 @@
-debian/30-baloo-inotify-limit.conf etc/sysctl.d/
 usr/bin/kcmshell4
 usr/bin/kde-cp
 usr/bin/kde-mv
diff --git a/debian/kde-runtime.maintscript b/debian/kde-runtime.maintscript
new file mode 100644
index 0000000..5c7ceed
--- /dev/null
+++ b/debian/kde-runtime.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/sysctl.d/30-baloo-inotify-limit.conf 4:16.04.3-1~ kde-runtime

-- 
KDE Base Runtime module packaging