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.
 .
 libinput (1.10.6-1) unstable; urgency=medium
 .
   * New upstream release.
Author: Timo Aaltonen <tjaalton@debian.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-05-17

--- libinput-1.10.6.orig/src/evdev-debounce.c
+++ libinput-1.10.6/src/evdev-debounce.c
@@ -569,7 +569,7 @@ fallback_init_debounce(struct fallback_d
 	char timer_name[64];
 
 	if (device->model_flags &
-	    (EVDEV_MODEL_MS_NANO_TRANSCEIVER|EVDEV_MODEL_LOGITECH_K400)) {
+	    (EVDEV_MODEL_MS_NANO_TRANSCEIVER)) {
 		dispatch->debounce.state = DEBOUNCE_STATE_DISABLED;
 		return;
 	}
--- libinput-1.10.6.orig/src/evdev.c
+++ libinput-1.10.6/src/evdev.c
@@ -1257,7 +1257,6 @@ evdev_read_model_flags(struct evdev_devi
 		MODEL(ALPS_TOUCHPAD),
 		MODEL(SYNAPTICS_SERIAL_TOUCHPAD),
 		MODEL(JUMPING_SEMI_MT),
-		MODEL(LOGITECH_K400),
 		MODEL(CYBORG_RAT),
 		MODEL(HP_STREAM11_TOUCHPAD),
 		MODEL(LENOVO_T450_TOUCHPAD),
--- libinput-1.10.6.orig/src/evdev.h
+++ libinput-1.10.6/src/evdev.h
@@ -110,7 +110,6 @@ enum evdev_device_model {
 	EVDEV_MODEL_ALPS_TOUCHPAD = (1 << 8),
 	EVDEV_MODEL_SYNAPTICS_SERIAL_TOUCHPAD = (1 << 9),
 	EVDEV_MODEL_JUMPING_SEMI_MT = (1 << 10),
-	EVDEV_MODEL_LOGITECH_K400 = (1 << 11),
 	EVDEV_MODEL_LENOVO_X220_TOUCHPAD_FW81 = (1 << 12),
 	EVDEV_MODEL_LENOVO_CARBON_X1_6TH = (1 << 13),
 	EVDEV_MODEL_CYBORG_RAT = (1 << 14),
--- libinput-1.10.6.orig/udev/90-libinput-model-quirks.hwdb
+++ libinput-1.10.6/udev/90-libinput-model-quirks.hwdb
@@ -255,7 +255,19 @@ libinput:mouse:input:b0003v046DpC408*
 
 # Logitech K400
 libinput:mouse:input:b0003v046Dp4024*
- LIBINPUT_MODEL_LOGITECH_K400=1
+ LIBINPUT_MODEL_MS_NANO_TRANSCEIVER=1
+
+# Logitech K400r
+libinput:mouse:input:b0003v046Dp404B*
+ LIBINPUT_MODEL_MS_NANO_TRANSCEIVER=1
+ 
+# Logitech K830
+libinput:mouse:input:b0003v046Dp404C*
+ LIBINPUT_MODEL_MS_NANO_TRANSCEIVER=1
+
+# Logitech K400Plus
+libinput:mouse:input:b0003v046Dp404D*
+ LIBINPUT_MODEL_MS_NANO_TRANSCEIVER=1
 
 ##########################################
 # Microsoft