xserver-xorg-input-synaptics: Changes to 'debian-unstable'
debian/NEWS | 62 ++--------
debian/changelog | 12 -
debian/control | 2
debian/examples/prehal-defaults.fdi | 13 --
debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch | 6
debian/patches/02-mention-tapping-in-manpage-notes.patch | 16 ++
debian/patches/series | 1
debian/xserver-xorg-input-synaptics.README.Debian | 13 +-
debian/xserver-xorg-input-synaptics.docs | 1
9 files changed, 53 insertions(+), 73 deletions(-)
New commits:
commit bfcc8ea7e23ca148e41767c9a2091a9083916219
Author: Mattia Dongili <malattia@linux.it>
Date: Wed May 13 22:53:52 2009 +0900
Upload to unstable
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 74072bb..75258a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-synaptics (1.1.1~git20090510-1) unreleased; urgency=low
+xserver-xorg-input-synaptics (1.1.1~git20090510-1) unstable; urgency=low
[ David Nusinow ]
* Add NEWS.Debian entry about enabling tapping again (closes: #497523)
commit 3c5b7c902c6414520a6aa576ef01cfd9b5d91d32
Author: Mattia Dongili <malattia@linux.it>
Date: Wed May 13 00:27:59 2009 +0900
Amend NEWS entry about tapping configuration
Be more concise and point users to available resources to configure the
touchpad but still provide an immediate workaround.
Additionally explain how defaults are assigned in the manpage.
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/NEWS b/debian/NEWS
index a0a5c92..d8150a7 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,50 +1,20 @@
xserver-xorg-input-synaptics (1.1.1~git20090510-1) unstable; urgency=low
- * Tapping has been disabled by default on many touchpads by upstream. If
- you want to re-enable it, you can do so explicitly by adding the
- following to your xorg.conf:
-
- Section "InputDevice"
- Identifier "synaptics"
- Driver "synaptics"
- Option "TapButton1" "1"
- Option "TapButton2" "2"
- Option "TapButton3" "3"
- EndSection
-
- You may only require one or two TapButton options for your own
- configuration. For more details see synaptics(4) and
- http://who-t.blogspot.com/2009/04/synaptics-11-and-what-your-touchpad-can.html
-
- Another option is to configure it through hal. An exemple hal policy file is
- available : /usr/share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
- In order to re-enable tapping, you can put the following contents in
- /etc/hal/fdi/policy/11-x11-synaptics.fdi :
-
- <?xml version="1.0" encoding="ISO-8859-1"?>
- <deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.touchpad">
- <match key="input.x11_driver" contains="synaptics">
- <merge key="input.x11_options.TapButton1"
- type="string">1</merge>
- <merge key="input.x11_options.TapButton2"
- type="string">2</merge>
- <merge key="input.x11_options.TapButton3"
- type="string">3</merge>
- </match>
- </match>
- </device>
- </deviceinfo>
-
- For the changes to be taken into account, restart hal :
-
- # /etc/init.d/hal restart
-
- * On a more general note, the defaults have changed in this version. To
- restore the defaults to the old ones, just drop
- /usr/share/doc/xserver-xorg-input-synaptics/examples/prehal-defaults.fdi
- into
- /etc/hal/fdi/policy/11-x11-synaptics.fdi
+ * Tapping has been disabled by default on many touchpads by upstream, see
+ the "NOTES" section in the synaptics(4) manpage for a short overview
+ about how defaults are calculated.
+ If you want to re-enable it, you can do so from within the X
+ environment by running the following commands in a terminal:
+
+ $ synclient TapButton1=1
+ $ synclient TapButton2=2
+ $ synclient TapButton3=3
+
+ Note that the configuration will not be permanently modified, to do
+ so assign the above option values in your xorg.conf or custom fdi file
+ (see the synaptics(4) manpage or the documents in
+ /usr/share/doc/xserver-xorg-input-synaptics for additional details).
+ Another alternative is to use desktop environment specific tools
+ like gpointing-device-settings or touchfreeze.
-- David Nusinow <dnusinow@debian.org> Sat, 11 Apr 2009 16:23:11 -0400
diff --git a/debian/patches/02-mention-tapping-in-manpage-notes.patch b/debian/patches/02-mention-tapping-in-manpage-notes.patch
new file mode 100644
index 0000000..3bc96d7
--- /dev/null
+++ b/debian/patches/02-mention-tapping-in-manpage-notes.patch
@@ -0,0 +1,16 @@
+Mention how to enable tapping in the driver manpage
+
+Index: xserver-xorg-input-synaptics/man/synaptics.man
+===================================================================
+--- xserver-xorg-input-synaptics.orig/man/synaptics.man 2009-05-13 00:14:36.753651106 +0900
++++ xserver-xorg-input-synaptics/man/synaptics.man 2009-05-13 00:27:28.785651827 +0900
+@@ -813,6 +813,9 @@
+ vertical scrolling is enabled, horizontal two-finger scrolling is disabled and
+ edge scrolling is disabled. If no multi-finger capabilities are reported,
+ edge scrolling is enabled for both horizontal and vertical scrolling.
++Tapping is disabled by default for touchpads with two buttons or more, to enable
++it you need to map tap actions to buttons. See the "TapButton1", "TapButton2"
++and "TapButton3" option descriptions for their meaning.
+ .LP
+ Button mapping for physical buttons is handled in the server.
+ If the device is switched to left-handed (an in-server mapping of physical
diff --git a/debian/patches/series b/debian/patches/series
index 77484fc..997fd71 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
01-synaptics-dont-grab-if-not-on-current-VT.patch
+02-mention-tapping-in-manpage-notes.patch
commit b58718a5b344ee3d236b3bcdf6dda2be931d4fe5
Author: Mattia Dongili <malattia@linux.it>
Date: Wed May 13 00:15:39 2009 +0900
Really refresh 01-synaptics-dont-grab-if-not-on-current-VT.patch
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
index 9a809b5..89b0eaa 100644
--- a/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
+++ b/debian/patches/01-synaptics-dont-grab-if-not-on-current-VT.patch
@@ -4,9 +4,9 @@ instance of Xorg.
Index: xserver-xorg-input-synaptics/src/synaptics.c
===================================================================
---- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-05-10 16:21:45.205197265 +0900
-+++ xserver-xorg-input-synaptics/src/synaptics.c 2009-05-10 16:22:29.281198113 +0900
-@@ -716,6 +716,9 @@
+--- xserver-xorg-input-synaptics.orig/src/synaptics.c 2009-05-10 21:48:36.607797666 +0900
++++ xserver-xorg-input-synaptics/src/synaptics.c 2009-05-12 23:45:41.218675859 +0900
+@@ -710,6 +710,9 @@
DBG(3, ErrorF("Synaptics DeviceOn called\n"));
commit 2621a721ac13165e0e4d9df661368bcf38e4d172
Author: Mattia Dongili <malattia@linux.it>
Date: Mon May 11 23:04:40 2009 +0900
Remove the fdi example and amend the Debian doc
The fdi file provided in the upstream package has plenty of examples and
there is no need to add more of them. Make sure we mention how to
customize the default hal configuration for touchapds.
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 874db1b..74072bb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,11 +12,10 @@ xserver-xorg-input-synaptics (1.1.1~git20090510-1) unreleased; urgency=low
(closes: #498299) and suggest gpointing-device-settings (replacement of
gsynaptics) and touchfreeze instead
* Remove the upstream NEWS file which doesn't exist anymore
+ * Updates to the README.Debian to make sure we mention how to customize the
+ fdi configuration
- [ Alexandre Rossi ]
- * Provide Hal configurations for re-enabling tapping and scrolling
-
- -- Mattia Dongili <malattia@debian.org> Sun, 10 May 2009 13:43:58 +0900
+ -- Mattia Dongili <malattia@debian.org> Mon, 11 May 2009 23:08:15 +0900
xserver-xorg-input-synaptics (1.1.0-1) unstable; urgency=low
diff --git a/debian/examples/prehal-defaults.fdi b/debian/examples/prehal-defaults.fdi
deleted file mode 100644
index bc401f1..0000000
--- a/debian/examples/prehal-defaults.fdi
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<deviceinfo version="0.2">
- <device>
- <match key="info.capabilities" contains="input.touchpad">
- <merge key="input.x11_driver" type="string">synaptics</merge>
- <merge key="input.x11_options.VertEdgeScroll" type="string">true</merge>
- <merge key="input.x11_options.HorizEdgeScroll" type="string">true</merge>
- <merge key="input.x11_options.TapButton1" type="string">1</merge>
- <merge key="input.x11_options.TapButton2" type="string">2</merge>
- <merge key="input.x11_options.TapButton3" type="string">3</merge>
- </match>
- </device>
-</deviceinfo>
diff --git a/debian/xserver-xorg-input-synaptics.README.Debian b/debian/xserver-xorg-input-synaptics.README.Debian
index bd3eb48..b125d39 100644
--- a/debian/xserver-xorg-input-synaptics.README.Debian
+++ b/debian/xserver-xorg-input-synaptics.README.Debian
@@ -8,19 +8,26 @@ package (by Stefan Gmeiner <riddlebox@freesurf.ch>), but first of all a
security notice about SHMConfig:
If you want to be able to change driver parameters without
- restarting the X server, enable the "SHMConfig" option in the X
- configuration file. You can then use the "synclient" program to
+ restarting the X server, one option is to enable the "SHMConfig" option in
+ the X configuration file. You can then use the "synclient" program to
query and modify driver parameters on the fly.
SECURITY NOTE! This is not secure if you are in an untrusted
multiuser environment. All local users can change the parameters at any
time.
+ Since version 1.1 the driver doesn't require doesn't require the
+ SHMConfig option anymore to allow runtime configuration changes,
+ synclient will only use the shared memory segment when invoked with
+ the -s option.
+
Xorg auto-configuration
-----------------------
Recent X.Org has support for automatic configuration. The synaptics driver does
not support automatic configuration yet but the information required is
supplied by a third party fdi script through HAL.
-The file is /usr/share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi
+The file is /usr/share/hal/fdi/policy/20thirdparty/11-x11-synaptics.fdi,
+if you need to customize it, you can first copy it to
+/etc/hal/fdi/policy and the edit it to match your requirements.
Manual configuration
diff --git a/debian/xserver-xorg-input-synaptics.docs b/debian/xserver-xorg-input-synaptics.docs
index 5ced86b..ed60b60 100644
--- a/debian/xserver-xorg-input-synaptics.docs
+++ b/debian/xserver-xorg-input-synaptics.docs
@@ -2,4 +2,3 @@ README
docs/README.alps
TODO
docs/trouble-shooting.txt
-debian/examples/
commit e674ba5b0aa56f3984ce9c4978119792d3861553
Author: Mattia Dongili <malattia@linux.it>
Date: Mon May 11 22:25:14 2009 +0900
Suggest gpointing-device-settings and touchfreeze
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 846233f..874db1b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,8 @@ xserver-xorg-input-synaptics (1.1.1~git20090510-1) unreleased; urgency=low
- Edge calculation fixes bring back vertical scrolling (closes: #523946)
- Fix float properties handling on 64bit arches (closes: #525473)
* Remove Suggests for [kq]synaptics which are not in the repository anymore
- (closes: #498299)
+ (closes: #498299) and suggest gpointing-device-settings (replacement of
+ gsynaptics) and touchfreeze instead
* Remove the upstream NEWS file which doesn't exist anymore
[ Alexandre Rossi ]
diff --git a/debian/control b/debian/control
index af051d9..e9b8ede 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Depends: ${shlibs:Depends}, ${xserver:Depends}, libxi6
Conflicts: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics
Replaces: xfree86-driver-synaptics (<< 0.14.4-2), xorg-driver-synaptics
Provides: ${xinpdriver:Provides}, xfree86-driver-synaptics, xorg-driver-synaptics
-Suggests: gsynaptics
+Suggests: gpointing-device-settings, touchfreeze
Description: Synaptics TouchPad driver for X.Org server
This package provides an input driver for the X.Org X server to enable
advanced features of the Synaptics Touchpad including:
Reply to: