xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |8 +
debian/control | 11 +
debian/local/10-evtouch.conf |6
debian/local/50-evtouch.conf |6
debian/rules |4
debian/xsfbs/repack.sh | 32
debian/xsfbs/xsfbs.mk| 54 +++
debian/xsfbs/xsfbs.sh| 311 ---
8 files changed, 81 insertions(+), 351 deletions(-)
New commits:
commit fd3ddced82d38a41751201307579a77840969e9d
Author: Julien Cristau
Date: Sat May 15 16:48:39 2010 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index 8936349..7f93d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-xf86-input-evtouch (0.8.8-4) UNRELEASED; urgency=low
+xf86-input-evtouch (0.8.8-4) unstable; urgency=medium
* Line-wrap the Build-Depends control field.
* Update xsfbs and use new ${xinpdriver:Depends} substvar.
* Rename 10-evtouch.conf to 50-evtouch.conf, and install it in /usr/share.
- -- Julien Cristau Sat, 15 May 2010 16:41:45 +0200
+ -- Julien Cristau Sat, 15 May 2010 16:48:36 +0200
xf86-input-evtouch (0.8.8-3) unstable; urgency=low
commit 213dd6e9e008c8ba24eed1d40af37ad2b8efe36e
Author: Julien Cristau
Date: Sat May 15 16:48:11 2010 +0200
Rename 10-evtouch.conf to 50-evtouch.conf, and install it in /usr/share.
diff --git a/debian/changelog b/debian/changelog
index c6a8ff8..8936349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xf86-input-evtouch (0.8.8-4) UNRELEASED; urgency=low
* Line-wrap the Build-Depends control field.
* Update xsfbs and use new ${xinpdriver:Depends} substvar.
+ * Rename 10-evtouch.conf to 50-evtouch.conf, and install it in /usr/share.
-- Julien Cristau Sat, 15 May 2010 16:41:45 +0200
diff --git a/debian/local/10-evtouch.conf b/debian/local/10-evtouch.conf
deleted file mode 100644
index 0e8150f..000
--- a/debian/local/10-evtouch.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
- Identifier "touchscreen catchall"
- MatchIsTouchscreen "on"
- Driver "evtouch"
-EndSection
-
diff --git a/debian/local/50-evtouch.conf b/debian/local/50-evtouch.conf
new file mode 100644
index 000..0e8150f
--- /dev/null
+++ b/debian/local/50-evtouch.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+ Identifier "touchscreen catchall"
+ MatchIsTouchscreen "on"
+ Driver "evtouch"
+EndSection
+
diff --git a/debian/rules b/debian/rules
index cc4890b..d669f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,8 +63,8 @@ binary-arch: install serverabi
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
--exclude=.a
- install -d debian/xserver-xorg-input-evtouch/usr/lib/X11/xorg.conf.d
- install -m 644 debian/local/10-evtouch.conf
debian/xserver-xorg-input-evtouch/usr/lib/X11/xorg.conf.d
+ install -d debian/xserver-xorg-input-evtouch/usr/share/X11/xorg.conf.d
+ install -m 644 debian/local/50-evtouch.conf
debian/xserver-xorg-input-evtouch/usr/share/X11/xorg.conf.d
dh_installchangelogs ChangeLog
dh_installdocs
dh_installexamples
commit c44d8977cda62d7b4b23d5803f392c5c3cfd
Author: Julien Cristau
Date: Sat May 15 16:44:04 2010 +0200
Remove README.source
This packages uses 3.0 (quilt) format.
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index b09a1ab..000
--- a/debian/README.source
+++ /dev/null
@@ -1,73 +0,0 @@
---
-Quick Guide To Patching This Package For The Impatient
---
-
-1. Make sure you have quilt installed
-2. Unpack the package as usual with "dpkg-source -x"
-3. Run the "patch" target in debian/rules
-4. Create a new patch with "quilt new" (see quilt(1))
-5. Edit all the files you want to include in the patch with "quilt edit"
- (see quilt(1)).
-6. Write the patch with "quilt refresh" (see quilt(1))
-7. Run the "clean" target in debian/rules
-
-Alternatively, instead of using quilt directly, you can drop the patch in to
-debian/patches and add the name of the patch to debian/patches/series.
-
-
-Guide To The X Strike Force Packages
-
-
-The X Strike Force team maintains X packages in git repositories on
-git.debian.org in the pkg-xorg subdirectory. Most upstream packages
-are actually maintained in git repositories as well, so they often
-just need to be pulled into git.debian.org in a "upstream-*" branch.
-Otherwise, the upstream sources are manually installed in the Debian
-git repository.
-
-The .orig.tar.gz upstream source file could be generated using this
-"upstream-*" branch in the Debian git repository but it is actually
-copied from upstream tarballs directly.
-
-Due to X.org being highly modular, packaging all X.org applications
-as
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 4355e15a8d1d72b430798f50f2e002d5e7768b88 Author: Timo Aaltonen Date: Tue Mar 30 21:44:37 2010 +0300 Release to unstable diff --git a/debian/changelog b/debian/changelog index 7565419..d8a880b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xf86-input-evtouch (0.8.8-3) UNRELEASED; urgency=low +xf86-input-evtouch (0.8.8-3) unstable; urgency=low * Add 10-evtouch.conf. - -- Timo Aaltonen Tue, 30 Mar 2010 17:38:09 +0300 + -- Timo Aaltonen Tue, 30 Mar 2010 21:44:25 +0300 xf86-input-evtouch (0.8.8-2) unstable; urgency=low -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1nwgqz-0005wu...@alioth.debian.org
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |6 ++ debian/local/10-evtouch.conf |6 ++ debian/rules |2 ++ 3 files changed, 14 insertions(+) New commits: commit 7ad3e04b8e8fa563e2c36ccc82ad3a7804cac6b5 Author: Timo Aaltonen Date: Tue Mar 30 17:38:52 2010 +0300 Add 10-evtouch.conf. diff --git a/debian/changelog b/debian/changelog index 38cb962..7565419 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xf86-input-evtouch (0.8.8-3) UNRELEASED; urgency=low + + * Add 10-evtouch.conf. + + -- Timo Aaltonen Tue, 30 Mar 2010 17:38:09 +0300 + xf86-input-evtouch (0.8.8-2) unstable; urgency=low [ Mattia Dongili ] diff --git a/debian/local/10-evtouch.conf b/debian/local/10-evtouch.conf new file mode 100644 index 000..0e8150f --- /dev/null +++ b/debian/local/10-evtouch.conf @@ -0,0 +1,6 @@ +Section "InputClass" + Identifier "touchscreen catchall" + MatchIsTouchscreen "on" + Driver "evtouch" +EndSection + diff --git a/debian/rules b/debian/rules index 49301cf..cc4890b 100755 --- a/debian/rules +++ b/debian/rules @@ -63,6 +63,8 @@ binary-arch: install serverabi dh_testdir dh_testroot dh_install --sourcedir=debian/tmp --list-missing --exclude=.la --exclude=.a + install -d debian/xserver-xorg-input-evtouch/usr/lib/X11/xorg.conf.d + install -m 644 debian/local/10-evtouch.conf debian/xserver-xorg-input-evtouch/usr/lib/X11/xorg.conf.d dh_installchangelogs ChangeLog dh_installdocs dh_installexamples -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1nwcau-0001c5...@alioth.debian.org
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |3 +-
debian/patches/04_server-1.7-ftbfs.diff | 31 +++
debian/patches/05_fix_CURSORDIR.diff |4 +-
debian/patches/06_add_TSC-10_to_evdev_rules.diff |4 +-
4 files changed, 22 insertions(+), 20 deletions(-)
New commits:
commit 6df11d7f2b0f98f54dedb6de3e93bc351d63f7a5
Author: Mattia Dongili
Date: Sun Feb 14 14:30:44 2010 +0900
Close FTBFS and pkg uninstallable bugs
Signed-off-by: Mattia Dongili
diff --git a/debian/changelog b/debian/changelog
index 184ff43..38cb962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
xf86-input-evtouch (0.8.8-2) unstable; urgency=low
[ Mattia Dongili ]
- * Fix building and rebuild with xorg 1.7
+ * Fix building and rebuild with xorg 1.7 (Closes: #569444 and Closes:
+#569523)
* Switch to dpkg-source 3.0 (quilt) format
* add 05_fix_CURSORDIR.diff to let ev_calibrate find empty_cursor.xpm
(Closes: #482195)
commit 09cb8d214e47f64ff8c5a5ae446204472dbfe71b
Author: Mattia Dongili
Date: Sun Feb 14 13:44:27 2010 +0900
Bah, building the package also helps...
Signed-off-by: Mattia Dongili
diff --git a/debian/patches/04_server-1.7-ftbfs.diff
b/debian/patches/04_server-1.7-ftbfs.diff
index a68c22c..726297c 100644
--- a/debian/patches/04_server-1.7-ftbfs.diff
+++ b/debian/patches/04_server-1.7-ftbfs.diff
@@ -10,8 +10,8 @@ Date: Sun Jan 24 15:45:51 2010 +0900
Index: xserver-xorg-input-evtouch/evtouch.c
===
xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-13 20:16:09.802485295
+0900
-+++ xserver-xorg-input-evtouch/evtouch.c 2010-02-13 20:16:10.330503893
+0900
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-14 14:08:33.0
+0900
xserver-xorg-input-evtouch/evtouch.c 2010-02-14 14:13:51.0
+0900
@@ -57,6 +57,7 @@
#define NEED_EVENTS
#include
@@ -227,7 +227,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
ioctl(local->fd, EVIOCGRAB, (void *)0);
xf86RemoveEnabledDevice (local);
if (priv->buffer)
-@@ -577,6 +643,72 @@
+@@ -577,6 +643,73 @@
}
@@ -243,6 +243,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
+labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+
++return labels;
+#endif
+}
+
@@ -300,7 +301,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
static Bool
-@@ -585,6 +717,7 @@
+@@ -585,6 +718,7 @@
DBGOUT(2, "EVTouch: %s\n", __FUNCTION__);
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
@@ -308,7 +309,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
unsigned char map[EV_MAX_BUTTONS];
int i;
-@@ -593,7 +726,7 @@
+@@ -593,7 +727,7 @@
priv->btn_count = EV_MAX_BUTTONS;
@@ -317,7 +318,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
* these have to be here instead of in the SetupProc, because when the
* SetupProc is run at server startup, screenInfo is not setup yet
*/
-@@ -603,9 +736,9 @@
+@@ -603,9 +737,9 @@
priv->screen_height = pScrn->virtualY;
priv->pViewPort_X0 = &(pScrn->frameX0); /* initialize the pointers
to the viewport coords */
if ( (priv->screen_width != priv->phys_width) ||
@@ -329,7 +330,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
priv->virtual = 0;
priv->pViewPort_Y0 = &(pScrn->frameY0);
-@@ -620,24 +753,29 @@
+@@ -620,24 +754,29 @@
DBGOUT(2, "EVTouch: MaxValue H,V: %d %d\n", pScrn->maxHValue,
pScrn->maxVValue);
priv->screen_width = screenInfo.screens[priv->screen_num]->width;
@@ -341,7 +342,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
* Device reports button press for 5 buttons.
*/
-if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS, map) == FALSE)
-+ labels = EvtouchInitButtonLabels(labels);
++ labels = EvtouchInitButtonLabels();
+if (InitButtonClassDeviceStruct (dev, EV_MAX_BUTTONS,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ labels,
@@ -367,7 +368,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
priv->btn_count);
if (InitFocusClassDeviceStruct(dev) == FALSE) {
-@@ -645,13 +783,18 @@
+@@ -645,13 +784,18 @@
return !Success;
}
@@ -387,7 +388,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
#endif
local->history_size, Absolute) ==
FALSE)
{
-@@ -660,12 +803,20 @@
+@@ -660,12 +804,20 @@
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
@@ -410,7 +411,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/patches/04_server-1.7-ftbfs.diff | 75 ++-
debian/patches/05_fix_CURSORDIR.diff |4 -
debian/patches/06_add_TSC-10_to_evdev_rules.diff |4 -
3 files changed, 39 insertions(+), 44 deletions(-)
New commits:
commit 849ae808017835009d344516d40f4b3fcf2404aa
Author: Mattia Dongili
Date: Sat Feb 13 20:24:12 2010 +0900
Fix 04_server-1.7-ftbfs.diff
Assign proper button and axis labels, really count buttons.
As a side effect all other patches following this one have been
refreshed.
Signed-off-by: Mattia Dongili
diff --git a/debian/patches/04_server-1.7-ftbfs.diff
b/debian/patches/04_server-1.7-ftbfs.diff
index ab46a04..a68c22c 100644
--- a/debian/patches/04_server-1.7-ftbfs.diff
+++ b/debian/patches/04_server-1.7-ftbfs.diff
@@ -10,8 +10,8 @@ Date: Sun Jan 24 15:45:51 2010 +0900
Index: xserver-xorg-input-evtouch/evtouch.c
===
xserver-xorg-input-evtouch.orig/evtouch.c 2010-01-25 00:07:31.356444503
+0900
-+++ xserver-xorg-input-evtouch/evtouch.c 2010-01-25 00:10:29.235974617
+0900
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2010-02-13 20:16:09.802485295
+0900
xserver-xorg-input-evtouch/evtouch.c 2010-02-13 20:16:10.330503893
+0900
@@ -57,6 +57,7 @@
#define NEED_EVENTS
#include
@@ -84,7 +84,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
} else {
if (ev->code == BTN_LEFT) {
SetBtnAction(priv, 1, ev->value);
-@@ -478,26 +476,99 @@
+@@ -478,26 +476,98 @@
return;
}
@@ -143,11 +143,10 @@ Index: xserver-xorg-input-evtouch/evtouch.c
+/* count all buttons */
+for (i = BTN_MISC; i < BTN_JOYSTICK; i++)
+{
-+int mapping = 0;
+if (TestBit(i, priv->key_bitmask))
+{
-+if (mapping > num_buttons)
-+num_buttons = mapping;
++if (i > num_buttons)
++num_buttons = i;
+}
+}
+if (num_buttons)
@@ -192,7 +191,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
local->fd = xf86OpenSerial(local->options);
DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ );
-@@ -512,8 +583,7 @@
+@@ -512,8 +582,7 @@
DBG (9, XisbTrace (priv->buffer, 1));
@@ -202,7 +201,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
{
xf86CloseSerial(local->fd);
local->fd = -1;
-@@ -531,7 +601,6 @@
+@@ -531,7 +600,6 @@
if (ioctl(local->fd, EVIOCGRAB, (void *)1))
xf86Msg(X_ERROR, "%s: Unable to grab device (%s).\n",
local->name, strerror(errno));
@@ -210,7 +209,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
#ifndef XFREE86_V4
xf86AddEnabledDevice(local);
#else
-@@ -544,8 +613,6 @@
+@@ -544,8 +612,6 @@
}
@@ -219,7 +218,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
static Bool
DeviceOff (DeviceIntPtr dev)
{
-@@ -555,7 +622,7 @@
+@@ -555,7 +621,7 @@
DBGOUT(2, "EVTouch: %s\n", __FUNCTION__ );
if (local->fd != -1)
@@ -228,39 +227,36 @@ Index: xserver-xorg-input-evtouch/evtouch.c
ioctl(local->fd, EVIOCGRAB, (void *)0);
xf86RemoveEnabledDevice (local);
if (priv->buffer)
-@@ -577,6 +644,75 @@
+@@ -577,6 +643,72 @@
}
-+static void EvtouchInitButtonLabels(int natoms, Atom *atoms)
++static Atom *EvtouchInitButtonLabels(void)
+{
+#ifdef HAVE_LABELS
-+Atom atom;
-+int button;
++Atom *labels = xalloc(EV_MAX_BUTTONS * sizeof(Atom));
+
-+/* First, make sure all atoms are initialized */
-+atom = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
-+for (button = 0; button < natoms; button++)
-+atoms[button] = atom;
++/* initialize the 5 button labels used by this driver */
++labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
++labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
++labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
++labels[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
++labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+
+#endif
+}
+
+static char* abs_labels[] = {
-+AXIS_LABEL_PROP_ABS_X, /* 0x00 */
-+AXIS_LABEL_PROP_ABS_Y, /* 0x01 */
-+AXIS_LABEL_PROP_ABS_Z, /* 0x02 */
-+AXIS_LABEL_PROP_ABS_RX, /* 0x03 */
-+AXIS_LABEL_PROP_ABS_RY, /* 0x04 */
-+AXIS_LABEL_PROP_ABS_RZ /* 0x05 */
++AXIS_LABEL_PROP_ABS_X,
++AXIS_LABEL_PROP_ABS_Y,
++AXIS_LABEL_PROP_ABS_Z,
++AXIS_LABEL_PROP_ABS_WHEEL
+};
+static char* rel_labels[] = {
+AXIS_LABEL_PROP_REL_X,
+AXIS_LABEL_PROP_REL_Y,
+AXIS_LABEL_PROP_REL_Z,
-+AXIS_LABEL_PROP_REL_RX,
-+AXIS_LABEL_PROP_REL_RY,
-+AXIS_LABEL_PROP_REL_RZ
++AXIS_LABEL_PROP_REL_WHEEL
+};
+
+static void
@@ -304,7 +300,7 @@ Index: xser
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog | 11
debian/control |4
debian/patches/04_server-1.7-ftbfs.diff | 520 +++
debian/patches/05_fix_CURSORDIR.diff | 35 +
debian/patches/06_add_TSC-10_to_evdev_rules.diff | 12
debian/patches/series|3
debian/rules |2
debian/source/format |1
8 files changed, 585 insertions(+), 3 deletions(-)
New commits:
commit bd34f8ca35b7ce4c2c5abb1317c99d2d85aa7199
Author: Mattia Dongili
Date: Mon Jan 25 00:59:43 2010 +0900
Add TSC-10 to udev rules
Signed-off-by: Mattia Dongili
diff --git a/debian/changelog b/debian/changelog
index dc0c983..184ff43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ xf86-input-evtouch (0.8.8-2) unstable; urgency=low
* Switch to dpkg-source 3.0 (quilt) format
* add 05_fix_CURSORDIR.diff to let ev_calibrate find empty_cursor.xpm
(Closes: #482195)
+ * add TSC-10 to udev's rules (Closes: #487793)
-- Mattia Dongili Mon, 25 Jan 2010 00:29:03 +0900
diff --git a/debian/patches/06_add_TSC-10_to_evdev_rules.diff
b/debian/patches/06_add_TSC-10_to_evdev_rules.diff
new file mode 100644
index 000..b7561cc
--- /dev/null
+++ b/debian/patches/06_add_TSC-10_to_evdev_rules.diff
@@ -0,0 +1,12 @@
+Add TSC-10 to udev's rules
+
+Index: xserver-xorg-input-evtouch/69-touchscreen.rules
+===
+--- xserver-xorg-input-evtouch.orig/69-touchscreen.rules 2010-01-25
00:57:11.691970131 +0900
xserver-xorg-input-evtouch/69-touchscreen.rules2010-01-25
00:57:49.287972512 +0900
+@@ -50,3 +50,5 @@
+ KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="LBPS/2 Fujitsu Lifebook
TouchScreen", SYMLINK+="input/evtouch_event"
+ # Elo Touchscreen
+ KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="04e7",
ATTRS{idProduct}=="0020", SYMLINK+="input/evtouch_event"
++# TSC-10
++KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="TSC-10 DM TSC-10 DM",
SYMLINK+="input/evtouch_event"
diff --git a/debian/patches/series b/debian/patches/series
index 2538745..45d6360 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
03_server-1.6-ftbfs.diff
04_server-1.7-ftbfs.diff
05_fix_CURSORDIR.diff
+06_add_TSC-10_to_evdev_rules.diff
commit d982790bbc5fffbde1e691de4161409217aee7ac
Author: Mattia Dongili
Date: Mon Jan 25 00:39:55 2010 +0900
Fix CURSORDIR
for some reason the build rules define CURSORDIR but the code uses
CURSORDIRECTORY. Just make the code consistent.
Signed-off-by: Mattia Dongili
diff --git a/debian/changelog b/debian/changelog
index b8d1476..dc0c983 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ xf86-input-evtouch (0.8.8-2) unstable; urgency=low
[ Mattia Dongili ]
* Fix building and rebuild with xorg 1.7
* Switch to dpkg-source 3.0 (quilt) format
+ * add 05_fix_CURSORDIR.diff to let ev_calibrate find empty_cursor.xpm
+(Closes: #482195)
-- Mattia Dongili Mon, 25 Jan 2010 00:29:03 +0900
diff --git a/debian/patches/05_fix_CURSORDIR.diff
b/debian/patches/05_fix_CURSORDIR.diff
new file mode 100644
index 000..a72df9a
--- /dev/null
+++ b/debian/patches/05_fix_CURSORDIR.diff
@@ -0,0 +1,35 @@
+The code uses CURSORDIRECTORY but the build rules define CURSORDIR.
+
+Index: xserver-xorg-input-evtouch/ev_calibrate.c
+===
+--- xserver-xorg-input-evtouch.orig/ev_calibrate.c 2010-01-25
00:43:21.327944157 +0900
xserver-xorg-input-evtouch/ev_calibrate.c 2010-01-25 00:44:05.639972621
+0900
+@@ -16,8 +16,8 @@
+ #include "ev_calibrate.h"
+ #include "config.h"
+
+-#ifndef CURSORDIRECTORY
+-#define CURSORDIRECTORY ""
++#ifndef CURSORDIR
++#define CURSORDIR ""
+ #endif
+
+ pthread_mutex_t got_min_max_mtx;
+@@ -287,7 +287,7 @@
+ }
+
+ rc = XReadBitmapFile(display, win,
+- CURSORDIRECTORY"/empty_cursor.xbm",
++ CURSORDIR"/empty_cursor.xbm",
+ &cursor_width, &cursor_height,
+ &cursor_pic,
+ &hotspot_x, &hotspot_y);
+@@ -295,7 +295,7 @@
+ /* check for failure or success. */
+ switch (rc) {
+ case BitmapOpenFailed:
+-fprintf(stderr, "XReadBitmapFile - could not open file
'%s/empty_cursor.xbm'.\n", CURSORDIRECTORY);
++fprintf(stderr, "XReadBitmapFile - could not open file
'%s/empty_cursor.xbm'.\n", CURSORDIR);
+ break;
+ case BitmapFileInvalid:
+ fprintf(stderr,
diff --git a/debian/patches/series b/debian/patches/series
index 33259ec..2538745 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
02_calibration_1.6.
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/watch|2 +- debian/xserver-xorg-input-evtouch.links |1 + 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 00f976caa5e38867f396eb452b697a830c35f1ae Author: Mattia Dongili Date: Wed May 20 08:58:40 2009 +0900 Link the -core bug reporting script Signed-off-by: Mattia Dongili diff --git a/debian/xserver-xorg-input-evtouch.links b/debian/xserver-xorg-input-evtouch.links new file mode 100644 index 000..d5436f3 --- /dev/null +++ b/debian/xserver-xorg-input-evtouch.links @@ -0,0 +1 @@ +usr/share/bug/xserver-xorg-core/script usr/share/bug/xserver-xorg-input-evtouch/script commit a6be01e3f4b308714b59c9ec314e1cef94ad7fe8 Author: Mattia Dongili Date: Wed May 20 08:56:02 2009 +0900 Fix watch file to download the correct page in the first place Signed-off-by: Mattia Dongili diff --git a/debian/watch b/debian/watch index efd4e47..88d6d5b 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,2 @@ version=3 -http://www.conan.de/touchscreen/ evtouch-(.*)\.tar\.gz +http://www.conan.de/touchscreen/evtouch.html evtouch-(.*)\.tar\.gz -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |5 ++--- debian/control |2 +- debian/copyright |4 ++-- debian/patches/01_fix_warnings.patch |2 ++ debian/watch |2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) New commits: commit be5a1464dacd86a8a85cc279e3daf697f5979260 Author: Mattia Dongili Date: Tue May 19 01:32:35 2009 +0900 Revert changelog addition that didn't make it to the package Signed-off-by: Mattia Dongili diff --git a/debian/changelog b/debian/changelog index 923c9a7..850e501 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,7 +9,6 @@ xf86-input-evtouch (0.8.8-1) unstable; urgency=low * Add patch 03_server-1.6-ftbfs.diff to fix build with server 1.6 (closes: #527711). * debian/rules: fix some rule dependencies. - * Update upstream download url in debian/copyright. -- Mattia Dongili Tue, 19 May 2009 00:33:51 +0900 commit b8187120779c29a19db3d7f6e9f679d98401a567 Author: Mattia Dongili Date: Tue May 19 00:49:47 2009 +0900 Upload to unstable Signed-off-by: Mattia Dongili diff --git a/debian/changelog b/debian/changelog index 0a464e8..923c9a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low +xf86-input-evtouch (0.8.8-1) unstable; urgency=low [ Mattia Dongili ] * New upstream release @@ -11,7 +11,7 @@ xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low * debian/rules: fix some rule dependencies. * Update upstream download url in debian/copyright. - -- Mattia Dongili Mon, 19 Jan 2009 09:12:53 +0900 + -- Mattia Dongili Tue, 19 May 2009 00:33:51 +0900 xf86-input-evtouch (0.8.7-3) unstable; urgency=low commit 56c95634041fe1988a42d2f7ed5d96f8694135a1 Author: Mattia Dongili Date: Tue May 19 01:04:27 2009 +0900 Make lintian happy I: xf86-input-evtouch source: debian-watch-file-is-missing W: xf86-input-evtouch source: out-of-date-standards-version 3.7.3 (current is 3.8.1) I: xf86-input-evtouch source: quilt-patch-missing-description 01_fix_warnings.patch I: xserver-xorg-input-evtouch: copyright-with-old-dh-make-debian-copyright Signed-off-by: Mattia Dongili diff --git a/debian/control b/debian/control index 3ba4f09..c5f9d6a 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Debian X Strike Force Uploaders: Mattia Dongili Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt -Standards-Version: 3.7.3 +Standards-Version: 3.8.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git Homepage: http://www.conan.de/touchscreen/evtouch.html diff --git a/debian/copyright b/debian/copyright index 67c3b1b..4f76d0b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -29,6 +29,6 @@ License: CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -The Debian packaging is (C) 2006, Mattia Dongili and -is licensed under the GPL, see `/usr/share/common-licenses/GPL'. +The Debian packaging is © 2006, Mattia Dongili and +is licensed under the GPLv2, see `/usr/share/common-licenses/GPL-2'. diff --git a/debian/patches/01_fix_warnings.patch b/debian/patches/01_fix_warnings.patch index a97b5d6..7218383 100644 --- a/debian/patches/01_fix_warnings.patch +++ b/debian/patches/01_fix_warnings.patch @@ -1,3 +1,5 @@ +Remove unused variables and code just to make gcc happy + Index: xserver-xorg-input-evtouch/evtouch.c === --- xserver-xorg-input-evtouch.orig/evtouch.c 2009-01-21 20:06:50.647249439 +0900 diff --git a/debian/watch b/debian/watch new file mode 100644 index 000..efd4e47 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://www.conan.de/touchscreen/ evtouch-(.*)\.tar\.gz -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |1 + debian/copyright |2 +- 2 files changed, 2 insertions(+), 1 deletion(-) New commits: commit 27f7d00c3a7a3145bf2e4cc0844a993fdd24b4ad Author: Julien Cristau Date: Mon May 18 18:07:16 2009 +0200 Update upstream download url in debian/copyright. diff --git a/debian/changelog b/debian/changelog index ff559e0..0a464e8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low * Add patch 03_server-1.6-ftbfs.diff to fix build with server 1.6 (closes: #527711). * debian/rules: fix some rule dependencies. + * Update upstream download url in debian/copyright. -- Mattia Dongili Mon, 19 Jan 2009 09:12:53 +0900 diff --git a/debian/copyright b/debian/copyright index b31afb1..67c3b1b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,7 +1,7 @@ This package was debianized Mattia Dongili based on the work by Rex Tsai on Sun, 03 Dec 2006 18:53:48 +0100. -It was downloaded from http://www.stz-softwaretechnik.com/~ke/touchscreen/evtouch.html +It was downloaded from http://www.conan.de/touchscreen/evtouch.html Upstream Author: Kenan Esau -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog|8
debian/patches/02_calibration_1.6.patch | 41 +
debian/patches/03_server-1.6-ftbfs.diff | 61
debian/patches/series |2 +
debian/rules|6 +--
5 files changed, 115 insertions(+), 3 deletions(-)
New commits:
commit 910a1dd642805ad506af8f22c054bedb9feb9362
Author: Julien Cristau
Date: Sun May 17 19:07:39 2009 +0200
debian/rules: fix some rule dependencies
diff --git a/debian/changelog b/debian/changelog
index 727f3fd..ff559e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low
with new xserver.
* Add patch 03_server-1.6-ftbfs.diff to fix build with server 1.6
(closes: #527711).
+ * debian/rules: fix some rule dependencies.
-- Mattia Dongili Mon, 19 Jan 2009 09:12:53 +0900
diff --git a/debian/rules b/debian/rules
index bb0581d..453f647 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ else
endif
configure: configure-stamp
-configure-stamp: patch
+configure-stamp: $(STAMP_DIR)/patch
dh_testdir
# Add here commands to configure the package.
./configure --prefix=/usr --enable-evcalibrate
@@ -55,11 +55,11 @@ install: build
# Build architecture-independent files here.
-binary-indep: build install
+binary-indep:
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install serverabi
+binary-arch: install serverabi
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
--exclude=.a
commit 62f4be43aab54b254dd0f5a73ab81f32870c9b5c
Author: Julien Cristau
Date: Sun May 17 18:56:37 2009 +0200
Add patch 03_server-1.6-ftbfs.diff
Fixes build with server 1.6 (closes: #527711).
diff --git a/debian/changelog b/debian/changelog
index 5debace..727f3fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ xf86-input-evtouch (0.8.8-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Add patch 02_calibration_1.6.patch stolen from Ubuntu to fix calibration
with new xserver.
+ * Add patch 03_server-1.6-ftbfs.diff to fix build with server 1.6
+(closes: #527711).
-- Mattia Dongili Mon, 19 Jan 2009 09:12:53 +0900
diff --git a/debian/patches/03_server-1.6-ftbfs.diff
b/debian/patches/03_server-1.6-ftbfs.diff
new file mode 100644
index 000..79192cb
--- /dev/null
+++ b/debian/patches/03_server-1.6-ftbfs.diff
@@ -0,0 +1,61 @@
+From: Julien Cristau
+Date: Sun, 17 May 2009 18:54:59 +0200
+Subject: Fix build with server 1.6
+
+* uninclude xf86Version.h
+* fix InitValuatorClassDeviceStruct usage
+* fix input ABI check
+
+Index: xserver-xorg-input-evtouch/evtouch.c
+===
+--- xserver-xorg-input-evtouch.orig/evtouch.c
xserver-xorg-input-evtouch/evtouch.c
+@@ -30,10 +30,8 @@
+
+ #define _evdev_touch_C_
+
+-#include
+-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
++#include
+ #define XFREE86_V4
+-#endif
+
+ /*
+ *Standard Headers
+@@ -74,7 +72,6 @@
+ #include "xf86_OSproc.h"
+ #include "xf86Xinput.h"
+ #include "exevents.h"
+-#include "xf86OSmouse.h"
+ #include "randrstr.h"
+
+ #ifndef NEED_XF86_TYPES
+@@ -139,7 +136,7 @@
+ "Kenan Esau",
+ MODINFOSTRING1,
+ MODINFOSTRING2,
+-XF86_VERSION_CURRENT,
++XORG_VERSION_CURRENT,
+ 0, 8, 8,
+ ABI_CLASS_XINPUT,
+ ABI_XINPUT_VERSION,
+@@ -652,14 +649,17 @@
+ * Device reports motions on 2 axes in absolute coordinates.
+ * Axes min and max values are reported in raw coordinates.
+ */
+-if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
++if (InitValuatorClassDeviceStruct(dev, 2,
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
++ xf86GetMotionEvents,
++#endif
+ local->history_size, Absolute) ==
FALSE)
+ {
+ ErrorF ("Unable to allocate EVTouch touchscreen
ValuatorClassDeviceStruct\n");
+ return !Success;
+ }
+
+-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 2
++#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 2
+ xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width,
+1024,
+EV_AXIS_MIN_RES /* min_res */ ,
diff --git a/debian/patches/series b/debian/patches/series
index 7cb7bf1..dca9e11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01_fix_warnings.patch
02_calibration_1.6.patch
+03_server-1.6-ftbfs.diff
commit 1d8d4de6a49c5bc660adb2e57810fc7eeb8ca1c7
Author: Julien Cristau
Date: Sun May 17 18:50:35 2009 +0200
Add patch 02
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
69-touchscreen.rules |3
ChangeLog | 13
Makefile.in | 240
aclocal.m4| 9137 ++
calibrate.sh | 67
config.guess | 60
config.h.in |4
config.sub| 66
configure |15856 --
configure.ac |2
debian/changelog |6
debian/control|2
debian/patches/01_fix_warnings.patch | 30
debian/patches/02-buttonless-device.patch | 86
debian/patches/04_include_xf86_ansic_h.patch | 23
debian/patches/05_build_with_1_4.patch| 22
debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch | 770
debian/patches/07_random_fixes_for_06.patch | 523
debian/patches/series |7
debian/xsfbs/xsfbs-autoreconf.mk | 150
debian/xsfbs/xsfbs.mk | 51
debian/xsfbs/xsfbs.sh | 387
ev_calibrate.c| 17
evtouch.c | 118
evtouch.h |3
install-sh| 514
libtouch.c|4
ltmain.sh | 7911 +---
make_distrib.sh |2
29 files changed, 15050 insertions(+), 21024 deletions(-)
New commits:
commit e77ff9390f8965489e7628b5fb832b1b37372293
Author: Mattia Dongili
Date: Wed Jan 21 21:27:03 2009 +0900
Clean up some gcc warning about unused stuff
Signed-off-by: Mattia Dongili
diff --git a/debian/patches/01_fix_warnings.patch
b/debian/patches/01_fix_warnings.patch
new file mode 100644
index 000..a97b5d6
--- /dev/null
+++ b/debian/patches/01_fix_warnings.patch
@@ -0,0 +1,30 @@
+Index: xserver-xorg-input-evtouch/evtouch.c
+===
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2009-01-21 20:06:50.647249439
+0900
xserver-xorg-input-evtouch/evtouch.c 2009-01-21 20:07:39.518253785
+0900
+@@ -352,7 +352,6 @@ void EVTouchProcessAbs(EVTouchPrivatePtr
+ void EVTouchProcessRel(EVTouchPrivatePtr priv)
+ {
+ struct input_event *ev; /* packet being/just read */
+-int dummy;
+
+ ev = &priv->ev;
+ if ( ev->code == REL_X ) {
+@@ -745,17 +744,6 @@ EVTouchNewPacket (EVTouchPrivatePtr priv
+
+
+
+-static unsigned char
+-EVTouchRead(EVTouchPrivatePtr priv)
+-{
+-unsigned char c;
+-XisbBlockDuration (priv->buffer, EV_TIMEOUT);
+-c = XisbRead(priv->buffer);
+-return (c);
+-}
+-
+-
+-
+ static Bool
+ EVTouchGetPacket (EVTouchPrivatePtr priv)
+ {
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..3a0786b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_fix_warnings.patch
commit 511b452ec29e1ab9865d89a2dba6103a604e1243
Author: Mattia Dongili
Date: Mon Jan 19 21:13:08 2009 +0900
Remove unused patches from the series file
The patches have either been applied upstream or reworked implementing
similar functionality
Signed-off-by: Mattia Dongili
diff --git a/debian/patches/02-buttonless-device.patch
b/debian/patches/02-buttonless-device.patch
deleted file mode 100644
index 161d4ae..000
--- a/debian/patches/02-buttonless-device.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Index: xf86-input-evtouch-0.8.3.dirty/evtouch.c
-===
xf86-input-evtouch-0.8.3.dirty.orig/evtouch.c 2007-02-19
18:28:41.749371445 +0100
-+++ xf86-input-evtouch-0.8.3.dirty/evtouch.c 2007-02-19 20:14:50.612312260
+0100
-@@ -364,9 +364,15 @@ void EVTouchLBRBEvent(EVTouchPrivatePtr
- void EVTouchProcessKey(EVTouchPrivatePtr priv)
- {
- struct input_event *ev; /* packet being/just read */
-+ev = &priv->ev;
-
- DBGOUT(2, "EVTouch: %s\n", __FUNCTION__);
--ev = &priv->ev;
-+
-+ /* for buttonless devices no emulate3 is available,
-+ only go through the SM */
-+ if (priv->buttonless)
-+ return;
-+
- if ( (ev->code == BTN_LEFT) ||
- (ev->code == BTN_RIGHT) ||
- (ev->code == BTN_MIDDLE) ) {
-@@ -688,6 +694,8 @@ static void ReadInput (LocalDevicePtr lo
- while (EVTouchGetPacket (priv) == Success)
- {
- ev = &priv->ev;
-+
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/patches/07_random_fixes_for_06.patch | 496 +++-
1 file changed, 489 insertions(+), 7 deletions(-)
New commits:
commit 14a087f813f1e2a0eb8a95edcff598f4cd411aeb
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sun Feb 3 11:54:13 2008 +0900
Re-enable swapping coords when the screen is randr rotated
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/07_random_fixes_for_06.patch
b/debian/patches/07_random_fixes_for_06.patch
index d5a1269..e25b999 100644
--- a/debian/patches/07_random_fixes_for_06.patch
+++ b/debian/patches/07_random_fixes_for_06.patch
@@ -1,8 +1,307 @@
+# Description:
+# o Random whitespace fixes
+# o uninitialized variables warning fix
+#
Index: xserver-xorg-input-evtouch/evtouch.c
===
xserver-xorg-input-evtouch.orig/evtouch.c 2008-02-02 21:35:07.970972486
+0900
-+++ xserver-xorg-input-evtouch/evtouch.c 2008-02-02 21:36:37.970971869
+0900
-@@ -884,7 +884,7 @@ ConvertProc ( LocalDevicePtr local,
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2008-02-03 11:51:32.082972688
+0900
xserver-xorg-input-evtouch/evtouch.c 2008-02-03 11:51:32.106981862
+0900
+@@ -1,6 +1,6 @@
+ /*
+ *
+- * Copyright 2004 by Kenan Esau <[EMAIL PROTECTED]>, Baltmannsweiler,
++ * Copyright 2004 by Kenan Esau <[EMAIL PROTECTED]>, Baltmannsweiler,
+ * Germany.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software and its
+@@ -182,17 +182,17 @@ static const char *default_options[] =
+ static int
+ ControlProc(LocalDevicePtr device, xDeviceCtl *ctrl);
+
+-static void
++static void
+ PostMotionEvent(LocalDevicePtr local);
+
+-static void
++static void
+ PostProximityEvent(LocalDevicePtr local,int is_in);
+
+-static void
++static void
+ PostButtonEvent(LocalDevicePtr local, int button,
+int is_down, int x,int y);
+
+-static void
++static void
+ InputSetScreen(LocalDevicePtr local);
+
+
+@@ -216,7 +216,7 @@ emulate3Timer(OsTimerPtr timer, CARD32 n
+
+ PostMotionEvent(local);
+
+-/*
++/*
+ * Emit a button press -- release is handled in EVTouchLBRBEvent
+ */
+ if ( ( priv->touch_flags & LB_STAT ) &&
+@@ -241,11 +241,11 @@ emulate3Timer(OsTimerPtr timer, CARD32 n
+
+ priv->emulate3_timer_expired = TRUE;
+ xf86UnblockSIGIO(sigstate);
+-
++
+ return 0;
+ }
+
+-static void DoBtnAction(EVTouchPrivatePtr priv)
++static void DoBtnAction(EVTouchPrivatePtr priv)
+ {
+ int btn = 0;
+ LocalDevicePtr local = priv->local;
+@@ -253,7 +253,7 @@ static void DoBtnAction(EVTouchPrivatePt
+ DBGOUT(2, "EVTouch: %s btn_count=%d\n", __FUNCTION__,
priv->btn_count);
+
+ for (btn = 0; btn < priv->btn_count; btn++) {
+-DBGOUT(9, "EVTouch: %s do_it = %d \n",
++DBGOUT(9, "EVTouch: %s do_it = %d \n",
+__FUNCTION__, priv->btn_actions[btn].do_it);
+ if (priv->btn_actions[btn].do_it != 0) {
+ if (priv->emulate3_timer != NULL)
+@@ -263,10 +263,10 @@ static void DoBtnAction(EVTouchPrivatePt
+ priv->emulate3_timer_expired = FALSE;
+ }
+
+-DBGOUT(2, "EVTouch: %s btn = %d action = %d\n",
+- __FUNCTION__, btn,
++DBGOUT(2, "EVTouch: %s btn = %d action = %d\n",
++ __FUNCTION__, btn,
+priv->btn_actions[btn].action);
+- PostButtonEvent (local, btn,
priv->btn_actions[btn].action,priv->cur_x,priv->cur_y);
++ PostButtonEvent (local, btn,
priv->btn_actions[btn].action,priv->cur_x,priv->cur_y);
+
+ priv->btn_actions[btn].do_it = 0;
+ priv->btn_actions[btn].action = 0;
+@@ -318,7 +318,7 @@ void EVTouchProcessAbs(EVTouchPrivatePtr
+ PostButtonEvent (local,
5,1,priv->cur_x,priv->cur_y);
+ PostButtonEvent (local,
5,0,priv->cur_x,priv->cur_y);
+ }
+- }
++ }
+ }
+ }
+
+@@ -337,7 +337,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr
+ if (priv->cur_x < priv->min_x)
+ priv->cur_x = priv->min_x;
+ return;
+-}
++}
+ if ( ev->code == REL_Y ) {
+ priv->cur_y += ev->value;
+ if (priv->cur_y > priv->max_y)
+@@ -346,7 +346,7 @@ void EVTouchProcessRel(EVTouchPrivatePtr
+ priv->cur_y = priv->min_y;
+ return;
+ }
+-
++
+ libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y);
+ }
+
+@@ -363,12 +363,12 @@ void EVTouchLBRBEve
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog | 10
debian/control|8
debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch | 770 ++
debian/patches/07_random_fixes_for_06.patch | 41
debian/patches/series |4
debian/xsfbs/xsfbs.mk | 76 -
6 files changed, 828 insertions(+), 81 deletions(-)
New commits:
commit d862eaed24c4dbd457ad6d2da71ff7deed02b03c
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sun Feb 3 10:34:56 2008 +0900
Close bugs in changelog and add more changelog entries
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 8569c3f..1fa3210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ xf86-input-evtouch (0.8.7-3) unstable; urgency=low
* work() with xserver-xorg-core 1.4
* added xf86-input-evtouch-0.8.7-misc.patch from
-http://www.postnuklear.de/xorg-patches/
+http://www.postnuklear.de/xorg-patches/ (Closes: #443726)
+ * bump Standards-Version to 3.7.3
+ * use Vcs and Homepage headers in debian/control
-- Mattia Dongili <[EMAIL PROTECTED]> Sat, 02 Feb 2008 21:32:15 +0900
diff --git a/debian/control b/debian/control
index c031375..3f2fe77 100644
--- a/debian/control
+++ b/debian/control
@@ -4,9 +4,10 @@ Priority: optional
Maintainer: Debian X Strike Force
Uploaders: Mattia Dongili <[EMAIL PROTECTED]>
Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4),
x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch
-XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch
+Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git
+Homepage: http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html
Package: xserver-xorg-input-evtouch
Architecture: any
@@ -17,5 +18,4 @@ Description: Touchscreen-Driver for X.Org/XFree86 server
The driver is actually an evdev-driver which supports events for moving
in absolute coordinates, relative coordinates and mouse-buttons.
.
- Homepage: http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html
commit d361163e3e5240e2156e975cdf121bc089421556
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat Feb 2 22:05:08 2008 +0900
added xf86-input-evtouch-0.8.7-misc.patch from
http://www.postnuklear.de/xorg-patches/
to fix the driver non working on the xserver 1.4
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index c18974d..8569c3f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xf86-input-evtouch (0.8.7-3) unstable; urgency=low
+
+ * work() with xserver-xorg-core 1.4
+ * added xf86-input-evtouch-0.8.7-misc.patch from
+http://www.postnuklear.de/xorg-patches/
+
+ -- Mattia Dongili <[EMAIL PROTECTED]> Sat, 02 Feb 2008 21:32:15 +0900
+
xf86-input-evtouch (0.8.7-2) unstable; urgency=low
* build with xserver-xorg-core 1.4
diff --git a/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch
b/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch
new file mode 100644
index 000..db90f82
--- /dev/null
+++ b/debian/patches/06_xf86-input-evtouch-0.8.7-misc.patch
@@ -0,0 +1,770 @@
+#
+# This patch is from http://www.postnuklear.de/xorg-patches/
+#
+# Description: This is a patch for the evtouch input driver (
+# http://stz-softwaretechnik.com/~ke/touchscreen/evtouch.html).
+# Changes (for full description see ChangeLog file after patching (-: ):
+# o Changed code to compile a working driver for both XInput ABI 0.x and 2.0
(Xorg 1.4.0)
+# o changed rotation (due to segfault on xorg + fbdev)
+# o drag support
+# o tap "tolerance"
+# o added generic ts-adc touchscreen device to udev rules file
+#
+# Feel free to send comments, critics, suggestions to [EMAIL PROTECTED]
+# To apply simply change into the toplevel directory of the source to be
modified and enter:
+# patch -p1 <
+#
+# All patches are available under the GNU GPL, I hope they might be useful for
you (-:
+# - Harald Radke
+#
+Index: xserver-xorg-input-evtouch/69-touchscreen.rules
+===
+--- xserver-xorg-input-evtouch.orig/69-touchscreen.rules 2008-02-02
21:49:20.783972805 +0900
xserver-xorg-input-evtouch/69-touchscreen.rules2008-02-02
21:49:39.730979724 +0900
+@@ -7,8 +7,11 @@
+ # Name can be found in /proc/bus/input/devices ('cat /proc/bus/input/devices')
+ #
+
+-# These are the touchscreens supported by kernel's "usbtouchscreen" module
++# Generic ts-adc touchscreen modules
++KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="t
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |6 ++
debian/control |3 ++-
debian/patches/05_build_with_1_4.patch | 22 ++
debian/patches/series |1 +
4 files changed, 31 insertions(+), 1 deletion(-)
New commits:
commit ab5e06325473febb7af64c601236299af13e61f8
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Mon Sep 17 17:34:32 2007 +0900
Make the driver build with xorg 1.4
- remove DBG usage in evtouch.c
- don't use xf86AlwaysCore as this is taken care in xf86ProcessCommonOption
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/05_build_with_1_4.patch
b/debian/patches/05_build_with_1_4.patch
new file mode 100644
index 000..3a60d4f
--- /dev/null
+++ b/debian/patches/05_build_with_1_4.patch
@@ -0,0 +1,22 @@
+Index: xserver-xorg-input-evtouch/evtouch.c
+===
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2007-09-17 17:20:21.736761738
+0900
xserver-xorg-input-evtouch/evtouch.c 2007-09-17 17:31:22.274403633
+0900
+@@ -492,9 +492,6 @@ DeviceOn (DeviceIntPtr dev)
+
+ priv->buffer = XisbNew(local->fd, 64);
+
+-DBG (9, XisbTrace (priv->buffer, 1));
+-
+-
+ if (!priv->buffer)
+ {
+ xf86CloseSerial(local->fd);
+@@ -1207,7 +1204,6 @@ EVTouchPreInit(InputDriverPtr drv, IDevP
+ priv->diff[i][0], priv->diff[i][1]);
+ }
+
+-xf86AlwaysCore(local, TRUE);
+ priv->touch_flags = 0;
+
+ local->history_size = xf86SetIntOption( local->options,
"HistorySize", 0 );
diff --git a/debian/patches/series b/debian/patches/series
index 1b48c59..59b87ff 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
#02-buttonless-device.patch
#03_fix_compile_warns.patch
04_include_xf86_ansic_h.patch
+05_build_with_1_4.patch
commit bbb9a75a9c8134659d9fd860f8ea26326c901eaf
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Mon Sep 17 16:54:11 2007 +0900
Build for server-xorg-core 1.4
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index ac01702..c18974d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xf86-input-evtouch (0.8.7-2) unstable; urgency=low
+
+ * build with xserver-xorg-core 1.4
+
+ -- Mattia Dongili <[EMAIL PROTECTED]> Mon, 17 Sep 2007 16:52:54 +0900
+
xf86-input-evtouch (0.8.7-1) unstable; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index 55ee014..c031375 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force
Uploaders: Mattia Dongili <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4),
x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
Standards-Version: 3.7.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch
XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git
@@ -11,6 +11,7 @@ XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evto
Package: xserver-xorg-input-evtouch
Architecture: any
Depends: ${shlibs:Depends}, ${xserver:Depends}
+Provides: ${xinpdriver:Provides}
Description: Touchscreen-Driver for X.Org/XFree86 server
This XFree/X.Org driver provides support for touchscreens input devices.
The driver is actually an evdev-driver which supports events for moving
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/rules |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 738ad722844d54e6cf6ed0d32f1605294d41ff0b Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Wed Sep 12 21:47:17 2007 +0900 Use [ ! -f Makefile ] || $(MAKE) distclean and make lintian happy Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/rules b/debian/rules index ed5016a..bb0581d 100755 --- a/debian/rules +++ b/debian/rules @@ -40,7 +40,7 @@ clean-patched: rm -f build-stamp configure-stamp # Add here commands to clean up after the build process. - -$(MAKE) distclean + [ ! -f Makefile ] || $(MAKE) distclean dh_clean -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |9 + debian/patches/03_fix_compile_warns.patch| 27 --- debian/patches/04_include_xf86_ansic_h.patch | 23 +++ debian/patches/series|3 ++- debian/rules | 12 +--- 5 files changed, 35 insertions(+), 39 deletions(-) New commits: commit 568e337aa66dc57abab98cfe2dd382dfd2804e99 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Sep 11 23:04:05 2007 +0900 Fix a compile warning by moving xf86=ansic.h header inclusion Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/patches/04_include_xf86_ansic_h.patch b/debian/patches/04_include_xf86_ansic_h.patch new file mode 100644 index 000..009ff7e --- /dev/null +++ b/debian/patches/04_include_xf86_ansic_h.patch @@ -0,0 +1,23 @@ +Index: xserver-xorg-input-evtouch/libtouch.c +=== +--- xserver-xorg-input-evtouch.orig/libtouch.c 2007-09-11 23:00:20.762131559 +0900 xserver-xorg-input-evtouch/libtouch.c 2007-09-11 23:00:43.263413833 +0900 +@@ -34,7 +34,6 @@ + #ifndef NEED_XF86_TYPES + #define NEED_XF86_TYPES + #endif +-#include + #include + #include + #include +Index: xserver-xorg-input-evtouch/libtouch.h +=== +--- xserver-xorg-input-evtouch.orig/libtouch.h 2007-09-11 23:00:20.762131559 +0900 xserver-xorg-input-evtouch/libtouch.h 2007-09-11 23:00:51.263869754 +0900 +@@ -1,5 +1,6 @@ + #ifndef _libtouch_H_ + #define _libtouch_H_ ++#include + #include + + #define TOUCHED 0x01 diff --git a/debian/patches/series b/debian/patches/series index 2531ad2..1b48c59 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ #02-buttonless-device.patch #03_fix_compile_warns.patch +04_include_xf86_ansic_h.patch commit f70e88a6eae55c5dbd2df26fab37b83e844037c5 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Sep 11 22:55:21 2007 +0900 Removed 03_fix_compile_warns.patch applied upstream Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/changelog b/debian/changelog index 5bb4363..ac01702 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,7 @@ xf86-input-evtouch (0.8.7-1) unstable; urgency=low * New upstream release: - Added "fix" for AMD64-crashes on touch (Closes: #431925) * updated xsfbs + * removed 03_fix_compile_warns.patch applied upstream -- Mattia Dongili <[EMAIL PROTECTED]> Tue, 11 Sep 2007 22:42:32 +0900 diff --git a/debian/patches/03_fix_compile_warns.patch b/debian/patches/03_fix_compile_warns.patch deleted file mode 100644 index 08f5699..000 --- a/debian/patches/03_fix_compile_warns.patch +++ /dev/null @@ -1,27 +0,0 @@ -Index: xserver-xorg-input-evtouch/evtouch.c -=== xserver-xorg-input-evtouch.orig/evtouch.c 2007-06-13 22:38:27.256330304 +0900 -+++ xserver-xorg-input-evtouch/evtouch.c 2007-06-13 22:48:38.791179689 +0900 -@@ -79,6 +79,9 @@ - #include "compiler.h" - - #include "xisb.h" -+#include -+#include -+#include - - /* - *Local Headers -Index: xserver-xorg-input-evtouch/libtouch.h -=== xserver-xorg-input-evtouch.orig/libtouch.h 2007-06-13 22:33:17.738691899 +0900 -+++ xserver-xorg-input-evtouch/libtouch.h 2007-06-13 22:48:38.791179689 +0900 -@@ -61,6 +61,8 @@ void libtouchSetMoveLimit(LibTouchRecPtr - void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local); - - void libtouchSetPos(LibTouchRecPtr libtouch, int x, int y); -+void libtouchSetYPos(LibTouchRecPtr libtouch, int y); -+void libtouchSetXPos(LibTouchRecPtr libtouch, int x); - void libtouchTriggerSM(LibTouchRecPtr libtouch, LibTouchState_t touch); - - #endif diff --git a/debian/patches/series b/debian/patches/series index f2279f2..2531ad2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,2 @@ #02-buttonless-device.patch -03_fix_compile_warns.patch +#03_fix_compile_warns.patch commit d0d1c2d26e8df1b6345ab04e545da97f1319d129 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Sep 11 22:47:31 2007 +0900 Add changelog entry for 0.8.7-1 Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> diff --git a/debian/changelog b/debian/changelog index ff9a2ca..5bb4363 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +xf86-input-evtouch (0.8.7-1) unstable; urgency=low + + * New upstream release: +- Added "fix" for AMD64-crashes on touch (Closes: #431925) + * updated xsfbs + + -- Mattia Dongili <[EMAIL PROTECTED]> Tue, 11 Sep 2007 22:42:32 +0900 + xf86-input-evtouch (0.8.6-1) unstable; urgency=low * New upstream release: commit 0c4ca7dc2
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
69-touchscreen.rules |2
ChangeLog | 10
Makefile.am |7 ++-
Makefile.in | 49 --
configure | 111 +-
configure.ac | 18 ++--
debian/xsfbs/xsfbs.mk | 27
debian/xsfbs/xsfbs.sh |7 ---
evtouch.c | 57 +++--
evtouch.h | 49 +-
libtouch.c| 14 +-
libtouch.h|2
12 files changed, 216 insertions(+), 137 deletions(-)
New commits:
commit 8e7f8ae329922dca37a4b11b1dee339c9463d01a
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Tue Sep 11 22:01:35 2007 +0900
Imported upstream sources (version 0.8.7)
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/69-touchscreen.rules b/69-touchscreen.rules
index 536c8c5..5bdaa1c 100644
--- a/69-touchscreen.rules
+++ b/69-touchscreen.rules
@@ -45,3 +45,5 @@ KERNEL=="event*", SUBSYSTEM=="input",
ATTRS{idVendor}=="0637", ATTRS{idProduct}=
KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="0AFA",
ATTRS{idProduct}=="03E8", SYMLINK+="input/evtouch_event"
# Lifebook B-Series
KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="LBPS/2 Fujitsu Lifebook
TouchScreen", SYMLINK+="input/evtouch_event"
+# Elo Touchscreen
+KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="04e7",
ATTRS{idProduct}=="0020", SYMLINK+="input/evtouch_event"
diff --git a/ChangeLog b/ChangeLog
index 2cbf76f..6d41d7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+0.8.7
+ - Added Elo Touchscreen to udev-rules (Stephen Webb)
+ - Added "fix" for AMD64-crashes on touch (Martin Letenay)
+ - Fixed driver-behavior when resolution is changed using xrandr
+ (Yura Semashko)
+ - Added stuff for installing udev-rules to /etc/... (Tuuka
+ Pasanen)
+ - Added workaround for kernel-driver reporting ABS_Z and ABS_RX
+ instead of ABS_X and ABS_Y (Lutz Sammer + me)
+
0.8.6
- replaced old udev-rules with a more complete one (Thomas Bartosik)
- Added Lifebook B-series to udev-rules
diff --git a/Makefile.am b/Makefile.am
index 56dfdaa..fa3daca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright 2005 Tuukka Pasanen
+# Copyright 2005-2007 Tuukka Pasanen
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -22,6 +22,11 @@ EXTRA_DIST = ev_calibrate.c ev_calibrate.h evtouch.h
calibrate.sh make_distrib.s
README.calibration empty_cursor.xbm 69-touchscreen.rules
noinst_HEADERS = libtouch.h evtouch.h ev_calibrate.h
+if ENABLE_UDEVINSTALL
+udevdir = @sysconfdir@/udev/rules.d
+udev_DATA = 69-touchscreen.rules
+endif
+
if ENABLE_EVCAL
pkglib_PROGRAMS = ev_calibrate
pkglib_SCRIPTS = calibrate.sh
diff --git a/Makefile.in b/Makefile.in
index 5a03534..56a38af 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@
@SET_MAKE@
-# Copyright 2005 Tuukka Pasanen
+# Copyright 2005-2007 Tuukka Pasanen
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -84,7 +84,7 @@ am__vpath_adj = case $$p in \
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
am__installdirs = "$(DESTDIR)$(@[EMAIL PROTECTED])" \
"$(DESTDIR)$(pkglibdir)" "$(DESTDIR)$(pkglibdir)" \
- "$(DESTDIR)$(pkgdatadir)"
+ "$(DESTDIR)$(pkgdatadir)" "$(DESTDIR)$(udevdir)"
@[EMAIL PROTECTED] = $(INSTALL)
LTLIBRARIES = $(@[EMAIL PROTECTED])
@[EMAIL PROTECTED] =
@@ -116,7 +116,8 @@ SOURCES = $(@[EMAIL PROTECTED]) $(ev_calibrate_SOURCES)
DIST_SOURCES = $(@[EMAIL PROTECTED]) \
$(am__ev_calibrate_SOURCES_DIST)
pkgdataDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgdata_DATA)
+udevDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(pkgdata_DATA) $(udev_DATA)
HEADERS = $(noinst_HEADERS)
ETAGS = etags
CTAGS = ctags
@@ -161,6 +162,8 @@ ECHO_T = @ECHO_T@
EGREP = @EGREP@
ENABLE_EVCAL_FALSE = @ENABLE_EVCAL_FALSE@
ENABLE_EVCAL_TRUE = @ENABLE_EVCAL_TRUE@
+ENABLE_UDEVINSTALL_FALSE = @ENABLE_UDEVINSTALL_FALSE@
+ENABLE_UDEVINSTALL_TRUE = @ENABLE_UDEVINSTALL_TRUE@
EVCALIBRATE_CFLAGS = @EVCALIBRATE_CFLAGS@
EVCALIBRATE_LDFLAGS = @EVCALIBRATE_LDFLAGS@
EVCALIBRATE_LIBS = @EVCALIBRATE_LIBS@
@@ -251,6 +254,8 @@ EXTRA_DIST = ev_calibrate.c ev_calibrate.h evtouch.h
calibrate.sh make_distrib.s
README.calibration empty_cursor.xbm 69-touchscreen.rules
noinst_HEADERS = libtouch.h evtouch.h ev_calibrate.h
[EMAIL PROTECTED]@udevdir = @sysconfdir@/udev/rules.d
[EMAIL PROTECTED]@udev_DATA = 69-touchscreen.rules
@[EMAIL PROTECTED] = calibrate.sh
@[EMAIL PROTECTED] = empty_cursor.xbm
@[EMAIL PROTECTED] = ev_calibrate.c
@@ -481,6 +486,23 @@ uninstall-pkgdataDATA:
echo " rm -f '$(DESTDIR)$(pkgdatadir)/$$f'"; \
rm -f "$(DESTDIR)$(pkgdatadir)/$$f"; \
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog|3 -
debian/evtouch.html | 138 +++-
2 files changed, 97 insertions(+), 44 deletions(-)
New commits:
commit d282eadc1bc798512dacf679e184ddd4558c0997
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat Jun 16 14:32:14 2007 +0900
Udated upstream documentation
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 2e845ee..ff9a2ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xf86-input-evtouch (0.8.6-1) unstable; urgency=low
* New upstream release:
- Fixed classic rotation (Closes: #417546)
* removed 04_fix_segv_on_device_off.patch, applied upstream
+ * updated evtouch.html
- -- Mattia Dongili <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:41:24 +0900
+ -- Mattia Dongili <[EMAIL PROTECTED]> Sat, 16 Jun 2007 14:31:58 +0900
xf86-input-evtouch (0.8.5-3) unstable; urgency=low
diff --git a/debian/evtouch.html b/debian/evtouch.html
index 6e29e93..d80ba8d 100644
--- a/debian/evtouch.html
+++ b/debian/evtouch.html
@@ -16,22 +16,30 @@ driver">
-Last updated: 01.01.2006
+Last updated: 09.06.2007
Linux-Touchscreen Driver for X
+
Evtouch is a Touchscreen-Driver for X. This site contains the configuration and installation description as well as the
possibility to download the driver.
+
Installation/Configuration
+
Download the tarball and extract it to some
-temporary directory.
-tar xzvf evtouch-xx.yy.tar.gz
-Copy the file "evtouch_drv.o" to the appropriate location
-("/usr/X11R6/lib/modules/input").
-
-Insert the lines below to the file "/etc/X11/XF86Config-4" or
-"/etc/X11/xorg.conf".
+temporary directory.
+
+tar xzvf evtouch-xx.yy.tar.gz
+
+Copy the file "evtouch_drv.so" to the appropriate location
+(Some distributions use "/usr/X11R6/lib/modules/input" or
+"/usr/lib/xorg/modules/input/" (for Ubuntu)).
+
+
+Insert the lines below to the file "/etc/X11/XF86Config-4" or
+"/etc/X11/xorg.conf".
+
Section "InputDevice"
@@ -51,7 +59,7 @@ EndSection
Beware that some distributions use other names for the device. Some use
"/dev/input/evdevX" and others use "/dev/input/eventX".
- Add the line below to the file "/etc/X11/XF86Config-4" or
+Add the line below to the file "/etc/X11/XF86Config-4" or
"/etc/X11/xorg.conf" to the section "ServerLayout".
InputDevice "touchscreen" "CorePointer"
@@ -62,51 +70,52 @@ event-device. Maybe you should try the next few
event-devices
+Since Xorg 7.2 there is always a default-mouse-pointer
which will run simultaneously with evtouch if you do not prevent it from
loading. It is extremely important that you add the following to your
configuration. Otherwise you will get double click events and all kind of
strange things.
+
+
+
+Add the following new input-device to your xorg.conf:
+
+Section "InputDevice"
+Identifier "dummy"
+Driver "void"
+Option "Device" "/dev/input/mice"
+EndSection
+
+
+
+Add the following line your your "ServerLayout"-section:
+InputDevice "dummy"
+
+
+
+
Calibration is also supported since V0.6.0. You can also reuse your
settings from the old driver for the 2.6 driver. Actually you only
have to exchange the driver name in the "Inputdevice"-section from
"lbtouch" to "evtouch" and change the "Device".
+
Button-Events
-With the new state-machine based code (>= V 0.8) you can have three types of
-events which are mapped to actions like "left mouse-button click", or "right
-mouse-button down" and similar things. At the moment those actions are
-hard-coded but later on they should be configurable by the user.
+
+With the state-machine based code you can have the three types of button
actions (button up, down, click) which are issued in different states of the
state-machine. So the complete behaviour is configurable.
+
+
+
+Have a look at Libtouch to see which
default-actions are hard-coded in the driver and what you have to do to change
the default-behaviour.
+
-
-
- Event-Name
- Description
- Action
-
-
- Tap-Event
- A Tap-Event occurs if you tap with the pen on the screen
-
- left mouse-button click
-
-
- Longtouch-Event
- This Event occurs if you touch the screen for a long time
-without moving the pen too much.
-
- right mouse-button down
-
-
- OneAndAHalfTap-Event
- This event occurs if you tap the screen and immediately
-after that touch the same place on the screen again without moving the pen on
-the screen too much.
-
- left mouse-button down
-
-
Advanced Configuration
+
+Changing Timers
+
+
If you are not confident with the default behaviour of your touchpanel you
can configure certain timers which change its behaviour.
-
+
+
Option
@@ -115,7 +124,7 @@ can configure certain timers which change its behaviour.
TapTimer
- This timer starts when the state ENTER_MAYBE_TAPPED is
+ This timer starts when the state
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
69-touchscreen.rules | 49 ++--
ChangeLog |8 +
Makefile.am|2
Makefile.in|2
configure | 20 ++--
configure.ac |2
debian/changelog |8 +
debian/patches/03_fix_compile_warns.patch | 22 ++---
debian/patches/04_fix_segv_on_device_off.patch | 12 --
debian/patches/series |1
evtouch.c | 102 +++--
evtouch.h | 10 --
12 files changed, 146 insertions(+), 92 deletions(-)
New commits:
commit 3703cb1723ff72b03a24421f99e094c69037151d
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Wed Jun 13 22:49:29 2007 +0900
refreshed 03_fix_compile_warns.patch
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/03_fix_compile_warns.patch
b/debian/patches/03_fix_compile_warns.patch
index 991e9db..08f5699 100644
--- a/debian/patches/03_fix_compile_warns.patch
+++ b/debian/patches/03_fix_compile_warns.patch
@@ -1,8 +1,8 @@
-diff --git a/evtouch.c b/evtouch.c
-index 9f10e6e..8df4bc9 100644
a/evtouch.c
-+++ b/evtouch.c
-@@ -66,6 +66,9 @@
+Index: xserver-xorg-input-evtouch/evtouch.c
+===
+--- xserver-xorg-input-evtouch.orig/evtouch.c 2007-06-13 22:38:27.256330304
+0900
xserver-xorg-input-evtouch/evtouch.c 2007-06-13 22:48:38.791179689
+0900
+@@ -79,6 +79,9 @@
#include "compiler.h"
#include "xisb.h"
@@ -10,13 +10,13 @@ index 9f10e6e..8df4bc9 100644
+#include
+#include
-
/*
-diff --git a/libtouch.h b/libtouch.h
-index 565009f..950ff71 100644
a/libtouch.h
-+++ b/libtouch.h
-@@ -61,6 +61,8 @@ void libtouchSetMoveLimit(LibTouchRecPtr libtouch, int
move_limit);
+ *Local Headers
+Index: xserver-xorg-input-evtouch/libtouch.h
+===
+--- xserver-xorg-input-evtouch.orig/libtouch.h 2007-06-13 22:33:17.738691899
+0900
xserver-xorg-input-evtouch/libtouch.h 2007-06-13 22:48:38.791179689
+0900
+@@ -61,6 +61,8 @@ void libtouchSetMoveLimit(LibTouchRecPtr
void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local);
void libtouchSetPos(LibTouchRecPtr libtouch, int x, int y);
commit 3edc92eb10f4ee31d13c592776f7e06a75df94cb
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Wed Jun 13 22:48:03 2007 +0900
Remove patch 04 as its been applied upstream
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 3a8b092..2e845ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xf86-input-evtouch (0.8.6-1) unstable; urgency=low
* New upstream release:
- Fixed classic rotation (Closes: #417546)
+ * removed 04_fix_segv_on_device_off.patch, applied upstream
-- Mattia Dongili <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:41:24 +0900
diff --git a/debian/patches/04_fix_segv_on_device_off.patch
b/debian/patches/04_fix_segv_on_device_off.patch
deleted file mode 100644
index 7cd03a4..000
--- a/debian/patches/04_fix_segv_on_device_off.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: xf86-input-evtouch-0.8.5/evtouch.c
-===
xf86-input-evtouch-0.8.5.orig/evtouch.c2007-05-30 15:42:27.800337532
+0900
-+++ xf86-input-evtouch-0.8.5/evtouch.c 2007-05-30 15:42:38.800964422 +0900
-@@ -533,7 +533,6 @@ DeviceOff (DeviceIntPtr dev)
- local->fd = -1;
- }
-
--xf86RemoveEnabledDevice (local);
- dev->public.on = FALSE;
-
- if ( (priv->calibrate) && (priv->fifo>0) ){
diff --git a/debian/patches/series b/debian/patches/series
index 7e75dc2..f2279f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
#02-buttonless-device.patch
03_fix_compile_warns.patch
-04_fix_segv_on_device_off.patch
commit be30b2880eeb22b0029a6b879c76108bf59740a2
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Wed Jun 13 22:43:39 2007 +0900
Closing bugs solved upstream.
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 32bab2f..3a8b092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xf86-input-evtouch (0.8.6-1) unstable; urgency=low
+
+ * New upstream release:
+- Fixed classic rotation (Closes: #417546)
+
+ -- Mattia Dongili <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:41:24 +0900
+
xf86-input-evtouch (0.8.5-3) unstable; urgency=low
* Use xsfbs to get xserver dependencies automatically.
commit ce8962fbf2f2861a63431d7325227248f279d60e
Author: Mattia Dongil
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |6
debian/control |2
debian/rules |7
debian/xsfbs/xsfbs-autoreconf.mk | 150 ++
debian/xsfbs/xsfbs.mk| 379
debian/xsfbs/xsfbs.sh| 907 +++
6 files changed, 1448 insertions(+), 3 deletions(-)
New commits:
commit 47d21123339a01eb0530b5b0c391976f79d9fac3
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sun Jun 10 10:45:42 2007 +0900
Use xsfbs to get xserver dependencies automatically.
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index b129290..32bab2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xf86-input-evtouch (0.8.5-3) unstable; urgency=low
+
+ * Use xsfbs to get xserver dependencies automatically.
+
+ -- Mattia Dongili <[EMAIL PROTECTED]> Sun, 10 Jun 2007 10:44:51 +0900
+
xf86-input-evtouch (0.8.5-2) unstable; urgency=low
* Fix SEGV on vt switch (DeviceClose actually).
diff --git a/debian/control b/debian/control
index e620370..55ee014 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evto
Package: xserver-xorg-input-evtouch
Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${xserver:Depends}
Description: Touchscreen-Driver for X.Org/XFree86 server
This XFree/X.Org driver provides support for touchscreens input devices.
The driver is actually an evdev-driver which supports events for moving
diff --git a/debian/rules b/debian/rules
index dd97b2b..a0c101b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+include debian/xsfbs/xsfbs.mk
+
+PACKAGE=xserver-xorg-input-evtouch
CFLAGS = -Wall -g
@@ -40,7 +43,7 @@ build-stamp: configure-stamp
touch $@
-clean: clean-patched unpatch
+clean: xsfclean clean-patched unpatch
clean-patched:
dh_testdir
dh_testroot
@@ -66,7 +69,7 @@ binary-indep: build install
# We have nothing to do by default.
# Build architecture-dependent files here.
-binary-arch: build install
+binary-arch: build install serverabi
dh_testdir
dh_testroot
dh_install --sourcedir=debian/tmp --list-missing --exclude=.la
--exclude=.a
commit 271778bd6338575afa3e4ae7f614f38cdff8e2fb
Author: Branden Robinson <[EMAIL PROTECTED](none)>
Date: Thu Apr 12 23:18:32 2007 -0400
Test for existence of debian/patches directory before creating a symlink to
it.
This prevents packages that apply no patches from ending up with a broken
symlink in them.
Remove SVN keyword.
Update copyright notice.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index d88c6db..63dde45 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -1,11 +1,10 @@
#!/usr/bin/make -f
-# $Id$
-# Debian rules file for xorg-x11 source package
+# Debian X Strike Force Build System (XSFBS): Make portion
# Copyright 1996 Stephen Early
# Copyright 1997 Mark Eichin
-# Copyright 1998-2005 Branden Robinson
+# Copyright 1998-2005, 2007 Branden Robinson
# Copyright 2005 David Nusinow
#
# Licensed under the GNU General Public License, version 2. See the file
@@ -127,7 +126,7 @@ $(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ ! -e patches ]; then \
+ if [ -e debian/patches ] && [ ! -e patches ]; then \
ln -s debian/patches patches; \
fi; \
>$@
commit 72811b4cede7275a35d36b44bcb5f431a8aa0133
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Fri Mar 2 20:28:15 2007 +0100
Fix copy/paste typo in the input driver provides.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 0343aec..d88c6db 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -359,7 +359,7 @@ VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver
2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
SERVER_DEPENDS = xserver-xorg-core (>= $(SERVERMINVERS))
VIDDRIVER_PROVIDES = xserver-xorg-video-$(VIDEOABI)
-INPDRIVER_PROVIDES = xserver-xorg-video-$(INPUTABI)
+INPDRIVER_PROVIDES = xserver-xorg-input-$(INPUTABI)
ifeq ($(PACKAGE),)
PACKAGE=$(shell awk '/^Package:/ { print $$2; exit }' < debian/control)
endif
commit 4a943db2564c4f573ce2f5f676a841267e961f16
Author: David Nusinow <[EMAIL PROTECTED]>
Date: Thu Mar 1 22:06:04 2007 -0500
Fix one missed bit from the serverabiver -> serverminver rename
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index cfc5496..0343aec 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -366,7 +366,7 @@ endif
.PHONY: serverabi
serverabi:
-ifeq ($(SERVERABI),)
+ifeq ($(SERVERMINVERS),)
@echo error: xserve
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog |6 ++
debian/patches/04_fix_segv_on_device_off.patch | 12
debian/patches/series |1 +
3 files changed, 19 insertions(+)
New commits:
commit 5f907d509dd0ddb2d5847cba0160ffa4dd6c08a3
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Wed May 30 15:56:19 2007 +0900
Update changelog for new upload
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index 7a5c237..b129290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xf86-input-evtouch (0.8.5-2) unstable; urgency=low
+
+ * Fix SEGV on vt switch (DeviceClose actually).
+
+ -- Mattia Dongili <[EMAIL PROTECTED]> Wed, 30 May 2007 15:55:59 +0900
+
xf86-input-evtouch (0.8.5-1) unstable; urgency=low
* New upstream release.
commit 549c6bc67bd702d47356e991853540eeefdae1b7
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Wed May 30 15:53:02 2007 +0900
Fix segv on VT switch (actually DeviceClose)
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/04_fix_segv_on_device_off.patch
b/debian/patches/04_fix_segv_on_device_off.patch
new file mode 100644
index 000..7cd03a4
--- /dev/null
+++ b/debian/patches/04_fix_segv_on_device_off.patch
@@ -0,0 +1,12 @@
+Index: xf86-input-evtouch-0.8.5/evtouch.c
+===
+--- xf86-input-evtouch-0.8.5.orig/evtouch.c2007-05-30 15:42:27.800337532
+0900
xf86-input-evtouch-0.8.5/evtouch.c 2007-05-30 15:42:38.800964422 +0900
+@@ -533,7 +533,6 @@ DeviceOff (DeviceIntPtr dev)
+ local->fd = -1;
+ }
+
+-xf86RemoveEnabledDevice (local);
+ dev->public.on = FALSE;
+
+ if ( (priv->calibrate) && (priv->fifo>0) ){
diff --git a/debian/patches/series b/debian/patches/series
index f2279f2..7e75dc2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
#02-buttonless-device.patch
03_fix_compile_warns.patch
+04_fix_segv_on_device_off.patch
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
ChangeLog |4 ++--
evtouch.c |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit 75ec0bde2f26d23393ecb54c558e2e225ad25014
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat May 12 12:16:12 2007 +0900
Update to upstream latest 0.8.5
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/ChangeLog b/ChangeLog
index 48a0d7b..751dbba 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,5 @@
-0.8.5-rc1
- - Made Events in libtouch configurable
+0.8.5
+ - Made Events in libtouch configurable (experimental)
- Changed initialization for Xorg 7.2
0.8.4
diff --git a/evtouch.c b/evtouch.c
index 9f10e6e..92fd7eb 100644
--- a/evtouch.c
+++ b/evtouch.c
@@ -880,7 +880,7 @@ ConvertProc ( LocalDevicePtr local,
EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
ScrnInfoPtr pScrn = xf86Screens[priv->screen_num];
- Rotation r = RRGetRotation(pScrn->pScreen);
+ Rotation rotation = RRGetRotation(pScrn->pScreen);
DBGOUT(2, "FIRST: v0=%d v1=%d\n", v0, v1);
@@ -1027,7 +1027,7 @@ ConvertProc ( LocalDevicePtr local,
v1 = xc;
}
- switch (r) {
+ switch (rotation) {
case RR_Rotate_0:
v0 = xc;
v1 = yc;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
ChangeLog |8
Makefile.am |1
aclocal.m4|3
config.guess | 21
config.sub| 58 -
configure | 1405 --
configure.ac |2
debian/changelog |6
debian/control|7
debian/patches/03_fix_compile_warns.patch | 27
debian/patches/series |3
debian/rules |2
evtouch.c | 175 +--
evtouch.h | 38
libtouch.c| 200 +++-
make_distrib.sh |8
16 files changed, 734 insertions(+), 1230 deletions(-)
New commits:
commit 1cc00d65c7a59b71e99190cff8f6a707a57a7221
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat May 12 11:53:15 2007 +0900
Fix compile warnings in upstream code
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/03_fix_compile_warns.patch
b/debian/patches/03_fix_compile_warns.patch
new file mode 100644
index 000..991e9db
--- /dev/null
+++ b/debian/patches/03_fix_compile_warns.patch
@@ -0,0 +1,27 @@
+diff --git a/evtouch.c b/evtouch.c
+index 9f10e6e..8df4bc9 100644
+--- a/evtouch.c
b/evtouch.c
+@@ -66,6 +66,9 @@
+ #include "compiler.h"
+
+ #include "xisb.h"
++#include
++#include
++#include
+
+
+ /*
+diff --git a/libtouch.h b/libtouch.h
+index 565009f..950ff71 100644
+--- a/libtouch.h
b/libtouch.h
+@@ -61,6 +61,8 @@ void libtouchSetMoveLimit(LibTouchRecPtr libtouch, int
move_limit);
+ void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local);
+
+ void libtouchSetPos(LibTouchRecPtr libtouch, int x, int y);
++void libtouchSetYPos(LibTouchRecPtr libtouch, int y);
++void libtouchSetXPos(LibTouchRecPtr libtouch, int x);
+ void libtouchTriggerSM(LibTouchRecPtr libtouch, LibTouchState_t touch);
+
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
index 0e9228d..f2279f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
#02-buttonless-device.patch
+03_fix_compile_warns.patch
commit a37309349311a207a7dbd7c1fc9880415c5ad9f8
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat May 12 11:45:13 2007 +0900
Make quilt happy with no pathes in series
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/rules b/debian/rules
index ae98fb4..dd97b2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ configure-stamp: patch-stamp
patch: patch-stamp
patch-stamp:
- QUILT_PATCHES=debian/patches quilt push -a
+ QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
touch patch-stamp
unpatch:
commit 9e4ab9e02e86dc4ed350c20d2807bd865ecb1544
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat May 12 11:44:33 2007 +0900
temporarily disable the buttonless patch as I have no time to fw-port it
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/series b/debian/patches/series
index d05f7ae..0e9228d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-02-buttonless-device.patch
+#02-buttonless-device.patch
commit e1d25547808278eb186e616e02a6c295cc11b1a4
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Sat May 12 11:43:18 2007 +0900
- set Maintaner to the XSF and me as Uploader
- add XS-Vcs-* fields
- update {build-,}dependencies
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/control b/debian/control
index 9fa5258..e620370 100644
--- a/debian/control
+++ b/debian/control
@@ -1,9 +1,12 @@
Source: xf86-input-evtouch
Section: x11
Priority: optional
-Maintainer: Mattia Dongili <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev,
x11proto-randr-dev, libx11-dev, quilt
+Maintainer: Debian X Strike Force
+Uploaders: Mattia Dongili <[EMAIL PROTECTED]>
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>=
2:1.2.99.902), x11proto-randr-dev, libxrender-dev, libx11-dev, quilt
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evtouch
+XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evtouch.git
Package: xserver-xorg-input-evtouch
Architecture: any
commit 359943b14ebec8357c21ead68a86744867db6e45
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Fri May 11 20:40:49 2007 +0900
Preparing new revision based on current upstream
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/changelog b/debian/changelog
index dd4592c..7a5c237 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xf86-in
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
69-touchscreen.rules | 14
ChangeLog |7
Makefile.am|2
Makefile.in| 165 +--
aclocal.m4 | 187 +--
calibrate.sh |8
configure | 1559 +++--
configure.ac |7
debian/patches/01-randr-rotation.patch | 52 -
debian/patches/series |1
ev_calibrate.c |9
evtouch.c | 255 ++---
evtouch.h | 13
libtouch.c |3
14 files changed, 1438 insertions(+), 844 deletions(-)
New commits:
commit 68a77dcf187616e87ca90d144b2d721a3f13dec0
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Mon Apr 30 17:51:26 2007 +0900
Remove Randr rotation patch applied upstream.
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/debian/patches/01-randr-rotation.patch
b/debian/patches/01-randr-rotation.patch
deleted file mode 100644
index 5ec0034..000
--- a/debian/patches/01-randr-rotation.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-diff -ur xf86-input-evtouch-0.8.3/evtouch.c
xf86-input-evtouch-0.8.3.dirty/evtouch.c
xf86-input-evtouch-0.8.3/evtouch.c 2007-02-15 18:52:07.0 +0100
-+++ xf86-input-evtouch-0.8.3.dirty/evtouch.c 2007-02-19 17:25:30.033293860
+0100
-@@ -41,6 +41,7 @@
- #include
- #include
- #include
-+#include
- #include
- #include
-
-@@ -821,6 +822,8 @@
- #endif
-
- EVTouchPrivatePtr priv = (EVTouchPrivatePtr) (local->private);
-+ ScrnInfoPtr pScrn = xf86Screens[priv->screen_num];
-+ Rotation r = RRGetRotation(pScrn->pScreen);
-
- DBGOUT(2, "FIRST: v0=%d v1=%d\n", v0, v1);
-
-@@ -965,10 +968,28 @@
- } else if (priv->rotate == EV_ROTATE_CCW) {
- v0 = screen_height - yc;
- v1 = xc;
--} else {
--v0 = xc;
--v1 = yc;
- }
-+
-+ switch (r) {
-+ case RR_Rotate_0:
-+ v0 = xc;
-+ v1 = yc;
-+ break;
-+ case RR_Rotate_180:
-+ v0 = screen_width - xc;
-+ v1 = screen_height - yc;
-+ break;
-+ case RR_Rotate_90:
-+ v0 = screen_height - yc;
-+ v1 = xc;
-+ break;
-+ case RR_Rotate_270:
-+ v0 = yc;
-+ v1 = screen_width - xc;
-+ break;
-+ default:
-+ break;
-+ }
- }
-
- DBGOUT(2, "FINAL: v0=%d v1=%d\n", v0, v1);
diff --git a/debian/patches/series b/debian/patches/series
index e9553a3..d05f7ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01-randr-rotation.patch
02-buttonless-device.patch
commit fc60dcabd627b9df2b13ba8eb7d81d702d330890
Author: Mattia Dongili <[EMAIL PROTECTED]>
Date: Mon Apr 30 17:35:45 2007 +0900
Import upstream sources (version 0.8.4)
Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]>
diff --git a/69-touchscreen.rules b/69-touchscreen.rules
new file mode 100644
index 000..e0ebec4
--- /dev/null
+++ b/69-touchscreen.rules
@@ -0,0 +1,14 @@
+# Evtouch udev.rules
+#
+# Because Evtouch can't autoprobe devices we assume that we only
+# Have one device so we can make it like this :P
+#
+# List here your touchscreen, check if it works and send it to
rpms_AT_ilmi_DOT_fi
+# Name can be found in /proc/bus/input/devices (In console make command 'cat
/proc/bus/input/devices')
+#
+# Tested on Telepeak Model 800-Y-Y-V (http://www.telepeak.com). Should work
on most eGalax based stuff!
+KERNEL=="event*", SUBSYSTEM=="input", ATTRS{name}=="eGalax Inc. USB
TouchController", SYMLINK+="input/evtouch_event"
+#
+# This could be also like this (eGalax Inc. USB TouchController)
+# KERNEL=="event*", SUBSYSTEM=="input", ATTRS{idVendor}=="0eef",
ATTRS{idProduct}=="0001", SYMLINK+="input/evtouch_event"
+#
diff --git a/ChangeLog b/ChangeLog
index da19c47..ab9b7af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+0.8.4
+ - Added XRandr-support (Mattia Dongili)
+ - Fixed Error in calibrate.sh
+ - Minor Compile-Warning fixes (Tuukka Pasanen)
+ - Make CURSORDIR work again (Tuukka Pasanen)
+ - added udev-rules for touchscreen device detection (Tuuka Pasanen + me)
+
0.8.3:
- removed useless trigger_sm
- fixed Middle-Button-Handling again
diff --git a/Makefile.am b/Makefile.am
index b92b3c2..4555c94 100644
--- a/Ma
xserver-xorg-input-evtouch: Changes to 'debian-unstable'
New branch 'debian-unstable' available with the following commits: commit 3719638a30107262d5d37db73d581fd910680e64 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 27 16:56:25 2007 +0100 Run `autoheader && aclocal && autoconf && automake` Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit a1a4515103dac345b180460f12fb8c5aac031588 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 27 16:51:29 2007 +0100 Install in FHS compliant locations by default. This makes /usr/lib/$(PACKAGE) the default directory for ev_calibrate and calibrate.sh and /usr/share/$(PACKAGE) for empty_cursor.xbm. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 26650c4119b68ef094501845bf16ba0e8bdf5154 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 27 16:48:48 2007 +0100 Cleanup CFLAGS usage in the autostuff scripts. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 898653628da17d5f147bd322e83b100921d4280a Merge: 0ceded81de0336b2e849037868af2e30675e38a3 b98a405d874c9e2b73fcc46a97a3ebc892461443 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 27 16:37:30 2007 +0100 Merge branch 'upstream' into debian-unstable commit 0ceded81de0336b2e849037868af2e30675e38a3 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 26 19:55:12 2007 +0100 Remove useless debian/dirs Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit f5ddc8402f173fc2286b3b13b72388197b11f1f2 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 26 19:47:35 2007 +0100 Update file locations. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 62904974659f0afd975a17303c3173aca4feca82 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 26 19:22:53 2007 +0100 Install the files in the changed locations Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 4436d2c516a7f1f3f5e498c67dfee18acce4088c Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 26 19:17:09 2007 +0100 Build using the modified configure.ac Makefile.am The fixes include CFLAGS cleanup and FHS compliant installation. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 425e497a71357a2a6096de037c66459784ea9242 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 20 14:21:05 2007 +0100 Fix path for calibrate.sh (it was taken from Fatih's files) Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 0a21b1772590b2a10d212ad866f75a176961a758 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 20 14:13:51 2007 +0100 Fix typ in --with-cursor-dir Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 20cf9ef90af83805277ca91da7296637110c2c78 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 20 13:49:50 2007 +0100 Make the calibrate script executable after installation Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 5f1eb444706fece9e3517d796b7dfcd6f5025b10 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Tue Feb 20 13:49:16 2007 +0100 Add missing build-deps and remove useless ones Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 9960bedeb5ed9eb5171c103cc56243c20a2f9bc5 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 19 20:40:43 2007 +0100 And quote CFLAGS... Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 3849904fbb8391c997c92be5d1d02c31ed576955 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 19 20:39:42 2007 +0100 Re-enable quilt patching Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit b968049cd8f3101592189076aba6dd8ec512d14b Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 19 20:39:05 2007 +0100 Use CFLAGS at ./configure time This is because a broken configure.ac and I'd rather avoid re-running the autotools stuff. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit b085142111779e028eb3f89dece99c975f4468b9 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 19 20:34:20 2007 +0100 Add buttonless.patch Allow buttonless devices to emulate the 3rd button using a long tap Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 4c7fe2a881df68ec463e2fbfc588d527ae61f30e Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 19 17:39:19 2007 +0100 Start working towards 0.8.3-1 Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit ba94ed00f1bc47530feecd7cac33c4e52b014427 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Mon Feb 19 17:38:51 2007 +0100 Add randr-rotation patch Allows rotating the screen using the randr extension without loosing the ability to use the pen. Signed-off-by: Mattia Dongili <[EMAIL PROTECTED]> commit 590be2a50eaa0099b7477e650f018c7fa3490199 Author: Mattia Dongili <[EMAIL PROTECTED]> Date: Sat Feb 3 20:15:14 2007 +0100 New upstream release. Signed-off-by: Mattia Dongili <[EMA
