From 6f41cb67d596b1d440f53929d4d3afb11acee7ab Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sat, 20 Oct 2007 18:54:37 +0000 Subject: [PATCH 1/6] Initialize branch F-8 for wdaemon --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..e9e7ccd --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-8 From 227d0b0f1c9de991880882e81e733b8f2a24a3ee Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Mon, 28 Jan 2008 20:32:33 +0000 Subject: [PATCH 2/6] update to version 0.13 --- .cvsignore | 1 + sources | 3 +-- wdaemon.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 27b7b0b..478fb49 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,3 @@ wdaemon-0.11.tar.bz2 wdaemon-0.12.tar.bz2 +wdaemon-0.13.tar.bz2 diff --git a/sources b/sources index eb739b2..8542cae 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -ccf216d77a096613aa7ddc9da7976102 wdaemon-0.11.tar.bz2 -3ca0ff8aad51a12a6deb1fe0734da33c wdaemon-0.12.tar.bz2 +4061282edd35cc80291323c4225e4e93 wdaemon-0.13.tar.bz2 diff --git a/wdaemon.spec b/wdaemon.spec index e633709..34f4925 100644 --- a/wdaemon.spec +++ b/wdaemon.spec @@ -1,5 +1,5 @@ Name: wdaemon -Version: 0.12 +Version: 0.13 Release: 1%{?dist} Summary: Hotplug helper for Wacom X.org driver @@ -63,6 +63,9 @@ fi %{_sysconfdir}/udev/scripts/is_uinput.sh %changelog +* Mon Jan 28 2008 Aristeu Rozanski 0.13-1 +- Updated to version 0.13 + * Wed Sep 19 2007 Aristeu Rozanski 0.12-1 - Updated to version 0.12 From dcebf3dcaa1c30c32a016a4246296082e07f8c3e Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Mon, 28 Jan 2008 21:13:20 +0000 Subject: [PATCH 3/6] adding missing entries (Bamboo and Intuos3 4x6") to udev rules --- ...0.13-add_missing_entries_to_udev_rules.patch | 17 +++++++++++++++++ wdaemon.spec | 8 +++++++- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 wdaemon-0.13-add_missing_entries_to_udev_rules.patch diff --git a/wdaemon-0.13-add_missing_entries_to_udev_rules.patch b/wdaemon-0.13-add_missing_entries_to_udev_rules.patch new file mode 100644 index 0000000..ff3c756 --- /dev/null +++ b/wdaemon-0.13-add_missing_entries_to_udev_rules.patch @@ -0,0 +1,17 @@ +upstream on revision 91 + +--- + udev/60-wacom.rules | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- wdaemon-0.13.orig/udev/60-wacom.rules 2007-07-20 14:12:25.000000000 -0400 ++++ wdaemon-0.13/udev/60-wacom.rules 2008-01-28 16:04:32.000000000 -0500 +@@ -47,5 +47,7 @@ SUBSYSTEM=="usb", KERNEL=="event*", ATTR + SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b4", SYMLINK+="input/wacom-tablets/intuos3-12x19 input/wacom-tablets/intuos3-12x19-%b" + SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b5", SYMLINK+="input/wacom-tablets/intuos3-6x11 input/wacom-tablets/intuos3-6x11-%b" + SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="003f", SYMLINK+="input/wacom-tablets/cintiq21ux input/wacom-tablets/cintiq21ux-%b" +-SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8a input/wacom-tablets/intuos2-6x8a-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8 input/wacom-tablets/intuos2-6x8-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00B7", SYMLINK+="input/wacom-tablets/intuos3-4x6 input/wacom-tablets/intuos3-4x6-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0065", SYMLINK+="input/wacom-tablets/bamboo input/wacom-tablets/bamboo-%b" + diff --git a/wdaemon.spec b/wdaemon.spec index 34f4925..ab8f462 100644 --- a/wdaemon.spec +++ b/wdaemon.spec @@ -1,6 +1,6 @@ Name: wdaemon Version: 0.13 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Hotplug helper for Wacom X.org driver Group: User Interface/X Hardware Support @@ -12,6 +12,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release} BuildRequires: glibc-devel Requires: udev >= 030-21 +Patch: wdaemon-0.13-add_missing_entries_to_udev_rules.patch + %description Helper application which emulates persistent input devices for Wacom tablets so they can be plugged and unplugged while X.org server is running. This should @@ -19,6 +21,7 @@ go away as soon X.org properly supports hotplugging. %prep %setup -q +%patch -p1 %build export CFLAGS="$RPM_OPT_FLAGS" @@ -63,6 +66,9 @@ fi %{_sysconfdir}/udev/scripts/is_uinput.sh %changelog +* Mon Jan 28 2008 Aristeu Rozanski 0.13-2 +- adding missing entries (Bamboo, Intuos3 4x6") on udev rules + * Mon Jan 28 2008 Aristeu Rozanski 0.13-1 - Updated to version 0.13 From f27b9c516f16ea710ae240cc463e5bd34ad5ec3f Mon Sep 17 00:00:00 2001 From: Aristeu Sergio Rozanski Filho Date: Mon, 28 Jan 2008 22:00:52 +0000 Subject: [PATCH 4/6] add missing entries in uinput-wacom udev file --- ...13-add_missing_entries_to_udev_rules.patch | 24 +++++++++++++------ wdaemon.spec | 5 +++- 2 files changed, 21 insertions(+), 8 deletions(-) diff --git a/wdaemon-0.13-add_missing_entries_to_udev_rules.patch b/wdaemon-0.13-add_missing_entries_to_udev_rules.patch index ff3c756..c66d95b 100644 --- a/wdaemon-0.13-add_missing_entries_to_udev_rules.patch +++ b/wdaemon-0.13-add_missing_entries_to_udev_rules.patch @@ -1,17 +1,27 @@ -upstream on revision 91 - --- - udev/60-wacom.rules | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + udev/60-wacom.rules | 4 +++- + udev/61-uinput-wacom.rules | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) ---- wdaemon-0.13.orig/udev/60-wacom.rules 2007-07-20 14:12:25.000000000 -0400 -+++ wdaemon-0.13/udev/60-wacom.rules 2008-01-28 16:04:32.000000000 -0500 +--- wdaemon-0.13.orig/udev/60-wacom.rules 2008-01-28 16:51:12.000000000 -0500 ++++ wdaemon-0.13/udev/60-wacom.rules 2008-01-28 16:53:22.000000000 -0500 @@ -47,5 +47,7 @@ SUBSYSTEM=="usb", KERNEL=="event*", ATTR SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b4", SYMLINK+="input/wacom-tablets/intuos3-12x19 input/wacom-tablets/intuos3-12x19-%b" SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b5", SYMLINK+="input/wacom-tablets/intuos3-6x11 input/wacom-tablets/intuos3-6x11-%b" SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="003f", SYMLINK+="input/wacom-tablets/cintiq21ux input/wacom-tablets/cintiq21ux-%b" -SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8a input/wacom-tablets/intuos2-6x8a-%b" +SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0047", SYMLINK+="input/wacom-tablets/intuos2-6x8 input/wacom-tablets/intuos2-6x8-%b" -+SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00B7", SYMLINK+="input/wacom-tablets/intuos3-4x6 input/wacom-tablets/intuos3-4x6-%b" ++SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="00b7", SYMLINK+="input/wacom-tablets/intuos3-4x6 input/wacom-tablets/intuos3-4x6-%b" +SUBSYSTEM=="usb", KERNEL=="event*", ATTR{idVendor}=="056a", ATTR{idProduct}=="0065", SYMLINK+="input/wacom-tablets/bamboo input/wacom-tablets/bamboo-%b" +--- wdaemon-0.13.orig/udev/61-uinput-wacom.rules 2007-07-20 11:47:16.000000000 -0400 ++++ wdaemon-0.13/udev/61-uinput-wacom.rules 2008-01-28 16:53:22.000000000 -0500 +@@ -44,5 +44,7 @@ KERNEL=="event*", PROGRAM=="/etc/udev/sc + KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-00b4", SYMLINK+="input/uinput-devices/uinput-wacom-intuos3-12x19-tablet" + KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-00b5", SYMLINK+="input/uinput-devices/uinput-wacom-intuos3-6x11-tablet" + KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-003f", SYMLINK+="input/uinput-devices/uinput-wacom-cintiq21ux-tablet" +-KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-0047", SYMLINK+="input/uinput-devices/uinput-wacom-intuos2-6x8a-tablet" ++KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-0047", SYMLINK+="input/uinput-devices/uinput-wacom-intuos2-6x8-tablet" ++KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-00b7", SYMLINK+="input/uinput-devices/uinput-wacom-intuos3-4x6-tablet" ++KERNEL=="event*", PROGRAM=="/etc/udev/scripts/is_uinput.sh", RESULT=="056a-0065", SYMLINK+="input/uinput-devices/uinput-wacom-bamboo-tablet" + diff --git a/wdaemon.spec b/wdaemon.spec index ab8f462..59e2553 100644 --- a/wdaemon.spec +++ b/wdaemon.spec @@ -1,6 +1,6 @@ Name: wdaemon Version: 0.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Hotplug helper for Wacom X.org driver Group: User Interface/X Hardware Support @@ -66,6 +66,9 @@ fi %{_sysconfdir}/udev/scripts/is_uinput.sh %changelog +* Mon Jan 28 2008 Aristeu Rozanski 0.13-3 +- adding missing entries (Bamboo, Intuos3 4x6") on uinput udev rules + * Mon Jan 28 2008 Aristeu Rozanski 0.13-2 - adding missing entries (Bamboo, Intuos3 4x6") on udev rules From 9bdff5e6e11f6e6396b175e663727012a5ddd399 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:15:45 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 029ac21..ca5ba3c 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := wdaemon SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 9724f3bcab21f253028dcf7b92007bd47babd87c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 15:13:49 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ca5ba3c..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: wdaemon -# $Id$ -NAME := wdaemon -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index e9e7ccd..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-8