diff -Nru kde-l10n-kk-17.08.3/debian/changelog kde-l10n-kk-17.08.3/debian/changelog
--- kde-l10n-kk-17.08.3/debian/changelog	2018-02-17 12:32:28.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/changelog	2018-02-17 15:57:59.000000000 +0000
@@ -1,3 +1,9 @@
+kde-l10n-kk (4:17.08.3-0ubuntu3) bionic; urgency=medium
+
+  * Remove overlapping files that conflict with KDE Apps 17.12
+
+ -- Rik Mills <rikmills@kubuntu.org>  Sat, 17 Feb 2018 15:57:59 +0000
+
 kde-l10n-kk (4:17.08.3-0ubuntu2) bionic; urgency=medium
 
   * Remove kfontinst.js, now supplied in plasma-destop-data
diff -Nru kde-l10n-kk-17.08.3/debian/overlapping-files kde-l10n-kk-17.08.3/debian/overlapping-files
--- kde-l10n-kk-17.08.3/debian/overlapping-files	2018-02-17 12:32:28.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/overlapping-files	2018-02-17 15:57:59.000000000 +0000
@@ -8,6 +8,7 @@
 freespacenotifier
 htmlsearch
 joystick
+juk
 kaccess
 kcmaccess
 kcm_activities
@@ -60,8 +61,11 @@
 kdesu
 kfilemetadata
 kfontinst
+kget
+kgetplugin
 khelpcenter
 khotkeys
+kimagemapeditor
 kinfocenter
 kio_applications
 kio_archive
@@ -82,7 +86,10 @@
 klipper
 kmenuedit
 kmimetypefinder
+kmix
+kmouth
 knetattach
+kolf
 konqprofiles
 konsoleprofiles
 krdb
@@ -90,6 +97,8 @@
 kscreenlocker
 kscreenlocker_greet
 ksgrd
+ksirk
+ksirkskineditor
 ksmserver
 kstart
 ksysguard
@@ -108,6 +117,7 @@
 libplasmaweather
 libpowerdevilcommonconfig
 libtaskmanager
+palapeli
 phonon_kde
 plasma_applet_binaryclock
 plasma_applet_bookmarks
@@ -118,6 +128,7 @@
 plasma_applet_frame
 plasma_applet_groupingpanel
 plasma_applet_incomingmsg
+plasma_applet_kget
 plasma_applet_knowledgebase
 plasma_applet_kolourpicker
 plasma_applet_leavenote
@@ -162,6 +173,7 @@
 plasma_runner_datetime
 plasma_runner_events
 plasma_runner_katesessions
+plasma_runner_kget
 plasma_runner_kill
 plasma_runner_konquerorsessions
 plasma_runner_konsolesessions
@@ -190,5 +202,6 @@
 processcore
 processui
 soliduiserver
+sweeper
 systemsettings
 useraccount
diff -Nru kde-l10n-kk-17.08.3/debian/overlapping-manpages kde-l10n-kk-17.08.3/debian/overlapping-manpages
--- kde-l10n-kk-17.08.3/debian/overlapping-manpages	1970-01-01 00:00:00.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/overlapping-manpages	2018-02-17 15:57:59.000000000 +0000
@@ -0,0 +1,19 @@
+adddebug
+cheatmake
+create_cvsignore
+create_makefile
+create_makefiles
+cvscheck
+cvslastchange
+cvslastlog
+cvsrevertlast
+cxxmetric
+extend_dmalloc
+extractrc
+fixincludes
+kmouth
+pruneemptydirs
+qtdoc
+reportview
+transxx
+zonetab2pot.py
diff -Nru kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu2 kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu2
--- kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu2	2018-02-17 12:32:28.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu2	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-Description: <short summary of the patch>
- TODO: Put a short summary on the line above and replace this paragraph
- with a longer explanation of this change. Complete the meta-information
- with other relevant fields (see below for details). To make it easier, the
- information below has been extracted from the changelog. Adjust it or drop
- it.
- .
- kde-l10n-kk (4:17.08.3-0ubuntu2) bionic; urgency=medium
- .
-   * Remove kfontinst.js, now supplied in plasma-destop-data
-Author: Rik Mills <rikmills@kubuntu.org>
-
----
-The information above should follow the Patch Tagging Guidelines, please
-checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
-are templates for supplementary fields that you might want to add:
-
-Origin: <vendor|upstream|other>, <url of original patch>
-Bug: <url in upstream bugtracker>
-Bug-Debian: https://bugs.debian.org/<bugnumber>
-Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
-Forwarded: <no|not-needed|url proving that it has been forwarded>
-Reviewed-By: <name and email of someone who approved the patch>
-Last-Update: 2018-02-17
-
---- /dev/null
-+++ kde-l10n-kk-17.08.3/.bzr-builddeb/default.conf
-@@ -0,0 +1,2 @@
-+[BUILDDEB]
-+merge = True
diff -Nru kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu3 kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu3
--- kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu3	1970-01-01 00:00:00.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/patches/debian-changes-4:17.08.3-0ubuntu3	2018-02-17 15:57:59.000000000 +0000
@@ -0,0 +1,30 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ kde-l10n-kk (4:17.08.3-0ubuntu3) bionic; urgency=medium
+ .
+   * Remove overlapping files that conflict with KDE Apps 17.12
+Author: Rik Mills <rikmills@kubuntu.org>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2018-02-22
+
+--- /dev/null
++++ kde-l10n-kk-17.08.3/.bzr-builddeb/default.conf
+@@ -0,0 +1,2 @@
++[BUILDDEB]
++merge = True
diff -Nru kde-l10n-kk-17.08.3/debian/patches/series kde-l10n-kk-17.08.3/debian/patches/series
--- kde-l10n-kk-17.08.3/debian/patches/series	2018-02-17 12:32:28.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/patches/series	2018-02-17 15:57:59.000000000 +0000
@@ -1 +1 @@
-debian-changes-4:17.08.3-0ubuntu2
+debian-changes-4:17.08.3-0ubuntu3
diff -Nru kde-l10n-kk-17.08.3/debian/rules kde-l10n-kk-17.08.3/debian/rules
--- kde-l10n-kk-17.08.3/debian/rules	2018-02-17 12:32:28.000000000 +0000
+++ kde-l10n-kk-17.08.3/debian/rules	2018-02-17 15:57:59.000000000 +0000
@@ -17,6 +17,7 @@
 	for file in `cat debian/overlapping-files`; do echo removing $${file}; rm -f debian/kde-l10n-*/usr/share/locale/*/LC_MESSAGES/$${file}.mo; done
 	rm -vf debian/kde-l10n-*/usr/share/locale/*/LC_SCRIPTS/ki18n5/ki18n5.js
 	rm -vf debian/kde-l10n-*/usr/share/locale/*/LC_SCRIPTS/kfontinst/kfontinst.js
+	for file in `cat debian/overlapping-manpages`; do echo removing $${file}; rm -f debian/kde-l10n-*/usr/share/man/*/man1/$${file}.1; done
 
 override_dh_gencontrol:
 	dh_gencontrol -- -Tdebian/substvars