summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClive Johnston <clivejo@aol.com>2016-05-14 10:45:06 (GMT)
committerClive Johnston <clivejo@aol.com>2016-05-14 10:45:06 (GMT)
commit2f9bcd8a8994e5a1972de40c31b6a9d2721420b3 (patch)
treefb30df8c210cfe858e54b199bd6798b09fb6804f
parentd81499f9d06cae5c7e402d78782771118464ce00 (diff)
Added kcm_activities to overlapping-files
-rw-r--r--debian/changelog7
-rw-r--r--debian/overlapping-files1
2 files changed, 8 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index 2499d01..159e073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kde-l10n-aaaUBUNTULANGCODEbbb (4:15.12.3-0ubuntu3) yakkety; urgency=medium
+
+ * Added kcm_activities to overlapping-files as they are also in
+ plasma-desktop 5.6
+
+ -- Clive Johnston <clivejo@kubuntu.org> Sat, 14 May 2016 11:40:14 +0100
+
kde-l10n-aaaUBUNTULANGCODEbbb (4:15.12.3-0ubuntu1.1) xenial; urgency=medium
* Re-run translations for xenial. Closes: (LP: #1576455)
diff --git a/debian/overlapping-files b/debian/overlapping-files
index 4fb1e63..92a663b 100644
--- a/debian/overlapping-files
+++ b/debian/overlapping-files
@@ -10,6 +10,7 @@ htmlsearch
joystick
kaccess
kcmaccess
+kcm_activities
kcm_autostart
kcm_baloofile
kcmbell