debian/changelog | 6 ++++++ debian/patches/touch-point-orientation-size.patch | 15 --------------- 2 files changed, 6 insertions(+), 15 deletions(-)
New commits: commit 83db762de1f98ac78418c176d2aafb26d1cc1d0d Author: Timo Aaltonen <[email protected]> Date: Tue Aug 2 12:18:06 2016 +0300 touch-point-orientation-size.patch: Drop conflicting deg2rad. diff --git a/debian/changelog b/debian/changelog index e78e99f..74c9a7d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +libinput (1.4.0-1ubuntu2) yakkety; urgency=medium + + * touch-point-orientation-size.patch: Drop conflicting deg2rad. + + -- Timo Aaltonen <[email protected]> Tue, 02 Aug 2016 12:16:25 +0300 + libinput (1.4.0-1ubuntu1) yakkety; urgency=medium * Merge from Debian. diff --git a/debian/patches/touch-point-orientation-size.patch b/debian/patches/touch-point-orientation-size.patch index 26992a9..0d74dd9 100644 --- a/debian/patches/touch-point-orientation-size.patch +++ b/debian/patches/touch-point-orientation-size.patch @@ -819,21 +819,6 @@ Signed-off-by: Andreas Pokorny <[email protected]> void touch_notify_touch_up(struct libinput_device *device, ---- a/src/libinput-util.h -+++ b/src/libinput-util.h -@@ -148,6 +148,12 @@ msleep(unsigned int ms) - usleep(ms * 1000); - } - -+static inline double -+deg2rad(double angle) -+{ -+ return angle * M_PI/180.0; -+} -+ - static inline int - long_bit_is_set(const unsigned long *array, int bit) - { --- a/src/libinput.c +++ b/src/libinput.c @@ -112,6 +112,8 @@ struct libinput_event_touch {
