Hello community, here is the log from the commit of package xf86-input-wacom for openSUSE:Factory checked in at 2016-05-23 17:31:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-input-wacom (Old) and /work/SRC/openSUSE:Factory/.xf86-input-wacom.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-input-wacom" Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-input-wacom/xf86-input-wacom.changes 2016-02-22 08:56:58.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xf86-input-wacom.new/xf86-input-wacom.changes 2016-05-23 17:31:23.000000000 +0200 @@ -1,0 +2,13 @@ +Sat May 21 10:02:02 UTC 2016 - jeng...@inai.de + +- Ensure all unit template instances are gone on uninstall + [boo#981004] + +------------------------------------------------------------------- +Thu May 19 13:26:08 UTC 2016 - sndir...@suse.com + +- U_conf-rename-to-70-wacom.conf.patch + * bump up wacom driver to 070, so it get's preferred over + libinput, which was dropped down to 060 (boo #979554) + +------------------------------------------------------------------- New: ---- U_conf-rename-to-70-wacom.conf.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-input-wacom.spec ++++++ --- /var/tmp/diff_new_pack.Gg38wV/_old 2016-05-23 17:31:24.000000000 +0200 +++ /var/tmp/diff_new_pack.Gg38wV/_new 2016-05-23 17:31:24.000000000 +0200 @@ -30,6 +30,7 @@ Group: System/X11/Servers/XF86_4 Url: http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Xf86-input-wacom Source0: http://downloads.sourceforge.net/project/linuxwacom/xf86-input-wacom/%{name}-%{version}.tar.bz2 +Patch0: U_conf-rename-to-70-wacom.conf.patch Patch7: n_01-Add-option-to-enable-logging.patch Patch8: n_02-Log-PROXIMITY-LOW-LEVEL-events.patch Patch9: n_03-Log-PRESSURE-low-level-events.patch @@ -84,6 +85,7 @@ %prep %setup -q +%patch0 -p1 %patch7 -p1 %patch8 -p1 %patch9 -p1 @@ -115,6 +117,9 @@ udevadm trigger --subsystem-match=input --action=change exit 0 +%preun +%service_del_preun wacom-inputattach@.service + %postun test -n "$FIRST_ARG" || FIRST_ARG=$1 if [ $FIRST_ARG -le 1 ]; then @@ -134,7 +139,7 @@ %doc AUTHORS ChangeLog GPL README %{!?install_serial:%exclude} %{_udevrulesdir}/65-wacom.rules %{!?install_serial:%exclude} %{_unitdir}/wacom-inputattach@.service -%config %{_sysconfdir}/X11/xorg.conf.d/50-wacom.conf +%config %{_sysconfdir}/X11/xorg.conf.d/70-wacom.conf %dir %{_libdir}/xorg/modules/input %{_libdir}/xorg/modules/input/wacom_drv.so %{_bindir}/xsetwacom ++++++ U_conf-rename-to-70-wacom.conf.patch ++++++ >From 0da5cd545e38079b62656a23835c4943af05dc92 Mon Sep 17 00:00:00 2001 From: Jason Gerecke <killert...@gmail.com> Date: Wed, 27 Apr 2016 10:10:27 -0700 Subject: [PATCH] conf: rename to 70-wacom.conf This is part of a two-step solution, the other half is renaming the xf86-input-libinput config snippet to sort lower than ours. Currently libinput picks up devices that are (for now) destined to the wacom driver. Since the wacom driver is more of a leaf package than libinput, the best option here is to make the wacom driver sort higher and let users uninstall it when not needed. To avoid crowding the 90-* space where users usually have custom config snippets, libinput will drop down to 60 and wacom will bump up to 70. Fixes: https://sourceforge.net/p/linuxwacom/bugs/315/ Fixes: https://github.com/linuxwacom/xf86-input-wacom/issues/4 Signed-off-by: Jason Gerecke <jason.gere...@wacom.com> Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> --- conf/50-wacom.conf | 103 ----------------------------------------------------- conf/70-wacom.conf | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++ conf/Makefile.am | 2 +- 3 files changed, 104 insertions(+), 104 deletions(-) delete mode 100644 conf/50-wacom.conf create mode 100644 conf/70-wacom.conf Index: xf86-input-wacom-0.32.0/conf/70-wacom.conf =================================================================== --- /dev/null +++ xf86-input-wacom-0.32.0/conf/70-wacom.conf @@ -0,0 +1,103 @@ +# Some of the below input classes appear 3x times, once for each of +# "tablet", "touchscreen", and "touchpad" to ensure that the Wacom +# driver is not accidentally bound to other types of hardware that +# Wacom has made which are not handled by the wacom driver (e.g the +# Wacom Bluetooth Keyboard) +# +# https://sourceforge.net/p/linuxwacom/bugs/294/ + +Section "InputClass" + Identifier "Wacom USB tablet class" + MatchUSBID "056a:*" + MatchDevicePath "/dev/input/event*" + MatchIsTablet "true" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom USB touchscreen class" + MatchUSBID "056a:*" + MatchDevicePath "/dev/input/event*" + MatchIsTouchscreen "true" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom USB touchpad class" + MatchUSBID "056a:*" + MatchDevicePath "/dev/input/event*" + MatchIsTouchpad "true" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom tablet class" + MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4" + MatchDevicePath "/dev/input/event*" + MatchIsTablet "true" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom touchscreen class" + MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4" + MatchDevicePath "/dev/input/event*" + MatchIsTouchscreen "true" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom touchpad class" + MatchProduct "Wacom|WACOM|PTK-540WL|ISD-V4" + MatchDevicePath "/dev/input/event*" + MatchIsTouchpad "true" + Driver "wacom" +EndSection + +# Serial Wacom devices should always be one of tablet, touchscreen, or +# touchpad so we can safely get away with just one match section in +# these cases +Section "InputClass" + Identifier "Wacom PnP device class" + MatchPnPID "WACf*|WCOM*|WACM*|FUJ02e5|FUJ02e7|FUJ02e9" + MatchDevicePath "/dev/input/event*" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom serial class" + MatchProduct "Serial Wacom Tablet" + Driver "wacom" +EndSection + +Section "InputClass" + Identifier "Wacom serial class identifiers" + MatchProduct "WACf|FUJ02e5|FUJ02e7|FUJ02e9" + Driver "wacom" +EndSection + +# Hanwang tablets +Section "InputClass" + Identifier "Hanwang class" + MatchProduct "Hanwang" + MatchDevicePath "/dev/input/event*" + Driver "wacom" +EndSection + +# Waltop tablets +Section "InputClass" + Identifier "Waltop class" + MatchProduct "WALTOP" + MatchIsTablet "on" + MatchDevicePath "/dev/input/event*" + Driver "wacom" +EndSection + +# N-Trig Duosense Electromagnetic Digitizer +Section "InputClass" + Identifier "Wacom N-Trig class" + MatchProduct "HID 1b96:0001|N-Trig Pen|N-Trig DuoSense" + MatchDevicePath "/dev/input/event*" + Driver "wacom" + Option "Button2" "3" +EndSection Index: xf86-input-wacom-0.32.0/conf/Makefile.am =================================================================== --- xf86-input-wacom-0.32.0.orig/conf/Makefile.am +++ xf86-input-wacom-0.32.0/conf/Makefile.am @@ -1,7 +1,7 @@ CLEANFILES= if HAS_XORG_CONF_DIR -dist_config_DATA = 50-wacom.conf +dist_config_DATA = 70-wacom.conf else fdidir = $(datadir)/hal/fdi/policy/20thirdparty dist_fdi_DATA = wacom.fdi
