[email protected] writes:
> Anyway, could you please rebuild and test with the following patch
> which basically has two upstream patches which fixes:
The patch seems to work, thank you very much for the speedy response!
The patch got mangled in your email so I have attached a more
machine-readable version to this mail so that other people can apply
it faster.
Here's a transscript that shows that the patch actually works:
Script started on Fri Feb 12 16:05:43 2010
li...@ginger:~/debian/debian-xserver-xorg-input-tslib$ apt-get source
xserver-xorg-input-tslib
Reading package lists... Done
Building dependency tree... 99%
Reading state information... Done
Picking 'xf86-input-tslib' as source package instead of
'xserver-xorg-input-tslib'
Need to get 345kB of source archives.
Get:1ohttp://ftp.fi.debian.org unstable/main xf86-input-tslib 0.0.6-2 (dsc)
[1823B]
Get:2ohttp://ftp.fi.debian.orgBunstable/main xf86-input-tslib 0.0.6-2 (tar)
[329kB]
Get:3Whttp://ftp.fi.debian.orgBunstable/main xf86-input-tslib 0.0.6-2 (diff)
[14.6kB]
Fetchedo345kB]int0ss(587kB/s).6kB 0%]
gpgv: keyblock resource `/home/lindi/.gnupg/trustedkeys.gpg': file open error
gpgv: Signature made Tue Jan 26 16:57:03 2010 EET using RSA key ID 76E2AC7B
gpgv: Can't check signature: public key not found
dpkg-source: warning: failed to verify signature on
./xf86-input-tslib_0.0.6-2.dsc
dpkg-source: info: extracting xf86-input-tslib in xf86-input-tslib-0.0.6
dpkg-source: info: unpacking xf86-input-tslib_0.0.6.orig.tar.gz
dpkg-source: info: unpacking xf86-input-tslib_0.0.6-2.debian.tar.gz
dpkg-source: info: applying 95_update-manpage.diff
li...@ginger:~/debian/debian-xserver-xorg-input-tslib$ cd
xf86-input-tslib-0.0.6/
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
sudo apt-get build-dep xserver-xorg-input-tslib
Reading package lists... Done
Building dependency tree... 98%
Reading state information... Done
Picking 'xf86-input-tslib' as source package instead of
'xserver-xorg-input-tslib'
The following NEW packages will be installed:
libts-dev
0 upgraded, 1 newly installed, 0 to remove and 9 not upgraded.
Need to get 12.7kB of archives.
After this operation, 119kB of additional disk space will be used.
Do you want to continue [Y/n]? y
Get:1ohttp://ftp.fi.debian.org unstable/main libts-dev 1.0-7 [12.7kB]
Fetchedo12.7kBvinB0s2(136kB/s)
Selecting previously deselected package libts-dev.
(Reading database ... 60327 files and directories currently installed.)
Unpacking libts-dev (from .../libts-dev_1.0-7_armel.deb) ...
Setting up libts-dev (1.0-7) ...
localepurge: Disk space freed in /usr/share/locale: 0 KiB
localepurge: Disk space freed in /usr/share/man: 0 KiB
localepurge: Disk space freed in /usr/share/gnome/help: 0 KiB
localepurge: Disk space freed in /usr/share/omf: 0 KiB
Total disk space freed by localepurge: 0 KiB
# I applied the patch here
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
dpkg-buildpackage -rfakeroot -us -uc
dpkg-buildpackage: set CFLAGS to default value: -g -O2
dpkg-buildpackage: set CPPFLAGS to default value:
dpkg-buildpackage: set LDFLAGS to default value:
dpkg-buildpackage: set FFLAGS to default value: -g -O2
dpkg-buildpackage: set CXXFLAGS to default value: -g -O2
dpkg-buildpackage: source package xf86-input-tslib
dpkg-buildpackage: source version 0.0.6-2
dpkg-buildpackage: source changed by Wen-Yen Chuang <[email protected]>
dpkg-buildpackage: host architecture armel
fakeroot debian/rules clean
rm -f stampdir/genscripts
rm -f debian/*.config \
debian/*.postinst \
debian/*.postrm \
debian/*.preinst \
debian/*.prerm
mkdir stampdir
>stampdir/stampdir
mkdir -p stampdir/log
rm -f stampdir/patch
Unapplying patches...nothing to do.
dh_testdir
rm -rf .pc
rm -rf stampdir
dh_clean
dh_testdir
dh_testroot
rm -f build-stamp
[ ! -f Makefile ] || /usr/bin/make distclean
dh_clean
dpkg-source -b xf86-input-tslib-0.0.6
dpkg-source: info: using options from
xf86-input-tslib-0.0.6/debian/source/options: --compression-level=9
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building xf86-input-tslib using existing
./xf86-input-tslib_0.0.6.orig.tar.gz
dpkg-source: info: local changes stored in
xf86-input-tslib-0.0.6/debian/patches/debian-changes-0.0.6-2, the modified
files are:
xf86-input-tslib-0.0.6/src/tslib.c
xf86-input-tslib-0.0.6/xserver-xorg-input-tslib.bug569337.patch
dpkg-source: info: building xf86-input-tslib in
xf86-input-tslib_0.0.6-2.debian.tar.gz
dpkg-source: info: building xf86-input-tslib in xf86-input-tslib_0.0.6-2.dsc
debian/rules build
dh_testdir
./configure --build arm-linux-gnueabi --prefix=/usr
--mandir=\${prefix}/share/man --infodir=\${prefix}/share/info CFLAGS="-g -O2"
LDFLAGS="-z,defs"
checking for a BSD-compatible install... /usr/bin/install -c
checking whether build environment is sane... yes
checking for a thread-safe mkdir -p... /bin/mkdir -p
checking for gawk... no
checking for mawk... mawk
checking whether make sets $(MAKE)... yes
checking whether to enable maintainer-specific portions of Makefiles... no
checking build system type... arm-unknown-linux-gnueabi
checking host system type... arm-unknown-linux-gnueabi
checking for style of include used by make... GNU
checking for gcc... gcc
checking for C compiler default output file name... a.out
checking whether the C compiler works... yes
checking whether we are cross compiling... no
checking for suffix of executables...
checking for suffix of object files... o
checking whether we are using the GNU C compiler... yes
checking whether gcc accepts -g... yes
checking for gcc option to accept ISO C89... none needed
checking dependency style of gcc... gcc3
checking for a sed that does not truncate output... /bin/sed
checking for grep that handles long lines and -e... /bin/grep
checking for egrep... /bin/grep -E
checking for ld used by gcc... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking for /usr/bin/ld option to reload object files... -r
checking for BSD-compatible nm... /usr/bin/nm -B
checking whether ln -s works... yes
checking how to recognize dependent libraries... pass_all
checking how to run the C preprocessor... gcc -E
checking for ANSI C header files... yes
checking for sys/types.h... yes
checking for sys/stat.h... yes
checking for stdlib.h... yes
checking for string.h... yes
checking for memory.h... yes
checking for strings.h... yes
checking for inttypes.h... yes
checking for stdint.h... yes
checking for unistd.h... yes
checking dlfcn.h usability... yes
checking dlfcn.h presence... yes
checking for dlfcn.h... yes
checking for g++... g++
checking whether we are using the GNU C++ compiler... yes
checking whether g++ accepts -g... yes
checking dependency style of g++... gcc3
checking how to run the C++ preprocessor... g++ -E
checking for g77... no
checking for xlf... no
checking for f77... no
checking for frt... no
checking for pgf77... no
checking for cf77... no
checking for fort77... no
checking for fl32... no
checking for af77... no
checking for xlf90... no
checking for f90... no
checking for pgf90... no
checking for pghpf... no
checking for epcf90... no
checking for gfortran... no
checking for g95... no
checking for xlf95... no
checking for f95... no
checking for fort... no
checking for ifort... no
checking for ifc... no
checking for efc... no
checking for pgf95... no
checking for lf95... no
checking for ftn... no
checking whether we are using the GNU Fortran 77 compiler... no
checking whether accepts -g... no
checking the maximum length of command line arguments... 805306365
checking command to parse /usr/bin/nm -B output from gcc object... ok
checking for objdir... .libs
checking for ar... ar
checking for ranlib... ranlib
checking for strip... strip
checking if gcc supports -fno-rtti -fno-exceptions... no
checking for gcc option to produce PIC... -fPIC
checking if gcc PIC flag -fPIC works... yes
checking if gcc static flag -static works... yes
checking if gcc supports -c -o file.o... yes
checking whether the gcc linker (/usr/bin/ld) supports shared libraries... yes
checking whether -lc should be explicitly linked in... no
checking dynamic linker characteristics... GNU/Linux ld.so
checking how to hardcode library paths into programs... immediate
checking whether stripping libraries is possible... yes
checking if libtool supports shared libraries... yes
checking whether to build shared libraries... yes
checking whether to build static libraries... no
configure: creating libtool
appending configuration tag "CXX" to libtool
checking for ld used by g++... /usr/bin/ld
checking if the linker (/usr/bin/ld) is GNU ld... yes
checking whether the g++ linker (/usr/bin/ld) supports shared libraries... yes
checking for g++ option to produce PIC... -fPIC
checking if g++ PIC flag -fPIC works... yes
checking if g++ static flag -static works... yes
checking if g++ supports -c -o file.o... yes
checking whether the g++ linker (/usr/bin/ld) supports shared libraries... yes
checking dynamic linker characteristics... GNU/Linux ld.so
(cached) (cached) checking how to hardcode library paths into programs...
immediate
appending configuration tag "F77" to libtool
checking for gcc... (cached) gcc
checking whether we are using the GNU C compiler... (cached) yes
checking whether gcc accepts -g... (cached) yes
checking for gcc option to accept ISO C89... (cached) none needed
checking dependency style of gcc... (cached) gcc3
checking if RANDR is defined... yes
checking if XINPUT is defined... no
checking for pkg-config... /usr/bin/pkg-config
checking pkg-config is at least version 0.9.0... yes
checking for XORG... yes
checking for ts_open in -lts... yes
checking for ANSI C header files... (cached) yes
configure: creating ./config.status
config.status: creating Makefile
config.status: creating src/Makefile
config.status: creating man/Makefile
config.status: creating config.h
config.status: executing depfiles commands
dh_testdir
/usr/bin/make
make[1]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
/usr/bin/make all-recursive
make[2]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
Making all in src
make[3]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/src'
/bin/bash ../libtool --tag=CC --mode=compile gcc -DHAVE_CONFIG_H -I. -I..
-g -O2 -fvisibility=hidden -I/usr/include/xorg -I/usr/include/pixman-1
-I../src -MT tslib.lo -MD -MP -MF .deps/tslib.Tpo -c -o tslib.lo tslib.c
mkdir .libs
gcc -DHAVE_CONFIG_H -I. -I.. -g -O2 -fvisibility=hidden -I/usr/include/xorg
-I/usr/include/pixman-1 -I../src -MT tslib.lo -MD -MP -MF .deps/tslib.Tpo -c
tslib.c -fPIC -DPIC -o .libs/tslib.o
mv -f .deps/tslib.Tpo .deps/tslib.Plo
/bin/bash ../libtool --tag=CC --mode=link gcc -g -O2 -fvisibility=hidden
-I/usr/include/xorg -I/usr/include/pixman-1 -I../src -module -avoid-version
-z,defs -o tslib_drv.la -rpath /usr/lib/xorg/modules/input tslib.lo -lts
gcc -shared .libs/tslib.o /usr/lib/libts.so -Wl,-soname -Wl,tslib_drv.so -o
.libs/tslib_drv.so
creating tslib_drv.la
(cd .libs && rm -f tslib_drv.la && ln -s ../tslib_drv.la tslib_drv.la)
make[3]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/src'
Making all in man
make[3]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/man'
sed -e 's|__vendorversion__|"xf86-input-tslib 0.0.6" "X Version 11"|' -e
's|__xorgversion__|"xf86-input-tslib 0.0.6" "X Version 11"|' -e
's|__xservername__|Xorg|g' -e 's|__xconfigfile__|xorg.conf|g' -e
's|__projectroot__|/usr|g' -e 's|__appmansuffix__|1x|g' -e
's|__drivermansuffix__|4|g' -e 's|__adminmansuffix__|8|g' -e
's|__miscmansuffix__|7|g' -e 's|__filemansuffix__|5x|g' < tslib.man > tslib.4
make[3]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/man'
make[3]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[3]: Nothing to be done for `all-am'.
make[3]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[2]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[1]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
touch build-stamp
fakeroot debian/rules binary
dh_testdir
dh_testroot
dh_clean -k
dh_installdirs
/usr/bin/make
DESTDIR=/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib
install
make[1]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
Making install in src
make[2]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/src'
make[3]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/src'
make[3]: Nothing to be done for `install-exec-am'.
test -z "/usr/lib/xorg/modules/input" || /bin/mkdir -p
"/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib/usr/lib/xorg/modules/input"
/bin/bash ../libtool --mode=install /usr/bin/install -c 'tslib_drv.la'
'/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib/usr/lib/xorg/modules/input/tslib_drv.la'
/usr/bin/install -c .libs/tslib_drv.so
/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib/usr/lib/xorg/modules/input/tslib_drv.so
/usr/bin/install -c .libs/tslib_drv.lai
/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib/usr/lib/xorg/modules/input/tslib_drv.la
libtool: install: warning: remember to run `libtool --finish
/usr/lib/xorg/modules/input'
make[3]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/src'
make[2]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/src'
Making install in man
make[2]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/man'
make[3]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/man'
make[3]: Nothing to be done for `install-exec-am'.
test -z "/usr/share/man/man4" || /bin/mkdir -p
"/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib/usr/share/man/man4"
/usr/bin/install -c -m 644 'tslib.4'
'/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/debian/xserver-xorg-input-tslib/usr/share/man/man4/tslib.4'
make[3]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/man'
make[2]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6/man'
make[2]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[3]: Entering directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[3]: Nothing to be done for `install-exec-am'.
make[3]: Nothing to be done for `install-data-am'.
make[3]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[2]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
make[1]: Leaving directory
`/home/lindi/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6'
rm -fr debian/*/usr/share/man/man4/* \
debian/*/usr/lib/xorg/modules/input/*.la
echo "xserver:Depends=xserver-xorg-core (>= 2:1.6.99.900)" >>
debian/xserver-xorg-input-tslib.substvars
echo "xviddriver:Provides=xserver-xorg-video-6" >>
debian/xserver-xorg-input-tslib.substvars
echo "xinpdriver:Provides=xserver-xorg-input-7" >>
debian/xserver-xorg-input-tslib.substvars
dh_testdir
dh_testroot
dh_installchangelogs ChangeLog
dh_installdocs
dh_installman man/tslib.4
dh_install
dh_strip
dh_compress
dh_fixperms
dh_installdeb
dh_shlibdeps
dpkg-shlibdeps: warning:
debian/xserver-xorg-input-tslib/usr/lib/xorg/modules/input/tslib_drv.so
contains an unresolvable reference to symbol xf86SetStrOption: it's probably a
plugin.
dpkg-shlibdeps: warning: 25 other similar warnings have been skipped (use -v to
see them all).
dh_gencontrol
dpkg-gencontrol: warning: unused substitution variable ${xviddriver:Provides}
dh_md5sums
dh_builddeb
dpkg-deb: building package `xserver-xorg-input-tslib' in
`../xserver-xorg-input-tslib_0.0.6-2_armel.deb'.
dpkg-genchanges >../xf86-input-tslib_0.0.6-2_armel.changes
dpkg-genchanges: not including original source code in upload
dpkg-buildpackage: binary and diff upload (original source NOT included)
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
sudo dpkg -i ../xserver-xorg-input-tslib_0.0.6-2_armel.deb'.
(Reading database ... 60347 files and directories currently installed.)
Preparing to replace xserver-xorg-input-tslib 0.0.6-2 (using
.../xserver-xorg-input-tslib_0.0.6-2_armel.deb) ...
Unpacking replacement xserver-xorg-input-tslib ...
Setting up xserver-xorg-input-tslib (0.0.6-2) ...
Processing triggers for man-db ...
Processing triggers for hal ...
Regenerating hal fdi cache ...
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
sudo /etc/init.d/xdm stop
Stopping X display manager: xdm.
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
sudo /etc/init.d/xdm start
Starting X display manager: xdm.
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
xset mouse
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
xset mouse
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
xset q
Keyboard Control:
auto repeat: on key click percent: 0 LED mask: 00000000
XKB indicators:
00: Caps Lock: off 01: Num Lock: off 02: Scroll Lock: off
03: Compose: off 04: Kana: off 05: Sleep: off
06: Suspend: off 07: Mute: off 08: Misc: off
09: Mail: off 10: Charging: off 11: Shift Lock: off
12: Group 2: off 13: Mouse Keys: off
auto repeat delay: 660 repeat rate: 25
auto repeating keys: 00ffffffdffffbbf
fadfffefffedffff
9fffffffffffffff
fff7ffffffffffff
bell percent: 50 bell pitch: 400 bell duration: 100
Pointer Control:
acceleration: 2/1 threshold: 4
Screen Saver:
prefer blanking: yes allow exposures: yes
timeout: 0 cycle: 0
Colors:
default colormap: 0x20 BlackPixel: 0 WhitePixel: 65535
Font Path:
/usr/share/fonts/X11/misc,built-ins
DPMS (Energy Star):
Standby: 12 Suspend: 12 Off: 12
DPMS is Enabled
Monitor is On
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
xset q
Keyboard Control:
auto repeat: on key click percent: 0 LED mask: 00000000
XKB indicators:
00: Caps Lock: off 01: Num Lock: off 02: Scroll Lock: off
03: Compose: off 04: Kana: off 05: Sleep: off
06: Suspend: off 07: Mute: off 08: Misc: off
09: Mail: off 10: Charging: off 11: Shift Lock: off
12: Group 2: off 13: Mouse Keys: off
auto repeat delay: 660 repeat rate: 25
auto repeating keys: 00ffffffdffffbbf
fadfffefffedffff
9fffffffffffffff
fff7ffffffffffff
bell percent: 50 bell pitch: 400 bell duration: 100
Pointer Control:
acceleration: 2/1 threshold: 4
Screen Saver:
prefer blanking: yes allow exposures: yes
timeout: 0 cycle: 0
Colors:
default colormap: 0x20 BlackPixel: 0 WhitePixel: 65535
Font Path:
/usr/share/fonts/X11/misc,built-ins
DPMS (Energy Star):
Standby: 12 Suspend: 12 Off: 12
DPMS is Enabled
Monitor is On
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
xsetqq
Keyboard Control:
auto repeat: on key click percent: 0 LED mask: 00000000
XKB indicators:
00: Caps Lock: off 01: Num Lock: off 02: Scroll Lock: off
03: Compose: off 04: Kana: off 05: Sleep: off
06: Suspend: off 07: Mute: off 08: Misc: off
09: Mail: off 10: Charging: off 11: Shift Lock: off
12: Group 2: off 13: Mouse Keys: off
auto repeat delay: 660 repeat rate: 25
auto repeating keys: 00ffffffdffffbbf
fadfffefffedffff
9fffffffffffffff
fff7ffffffffffff
bell percent: 50 bell pitch: 400 bell duration: 100
Pointer Control:
acceleration: 2/1 threshold: 4
Screen Saver:
prefer blanking: yes allow exposures: yes
timeout: 0 cycle: 0
Colors:
default colormap: 0x20 BlackPixel: 0 WhitePixel: 65535
Font Path:
/usr/share/fonts/X11/misc,built-ins
DPMS (Energy Star):
Standby: 12 Suspend: 12 Off: 12
DPMS is Enabled
Monitor is On
li...@ginger:~/debian/debian-xserver-xorg-input-tslib/xf86-input-tslib-0.0.6$
exit
exit
Script done on Fri Feb 12 16:30:38 2010
--- xf86-input-tslib-0.0.6/src/tslib.c 2009-10-19 18:07:18.000000000 +0300
+++ xf86-input-tslib-0.0.6.new/src/tslib.c 2010-02-12 16:15:05.000000000 +0200
@@ -103,8 +103,6 @@
static void
PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl)
{
- ErrorF("%s\n", __FUNCTION__);
- return;
}
static Bool
@@ -406,7 +404,9 @@
xf86MotionHistoryAllocate(pInfo);
#endif
- break;
+ if (!InitPtrFeedbackClassDeviceStruct(device, PointerControlProc))
+ return !Success;
+ break;
case DEVICE_ON:
AddEnabledDevice(pInfo->fd);
@@ -435,6 +435,7 @@
xf86TslibControlProc(pInfo->dev, DEVICE_OFF);
ts_close(priv->ts);
xfree(pInfo->private);
+ pInfo->private = NULL;
xf86DeleteInput(pInfo, 0);
}
