xserver-xorg-input-void: Changes to 'debian-experimental'
ChangeLog | 88 ++++++
Makefile.am | 2
configure.ac | 35 --
debian/README.source | 73 +++++
debian/changelog | 23 +
debian/compat | 2
debian/control | 8
debian/rules | 7
debian/xsfbs/repack.sh | 32 ++
debian/xsfbs/xsfbs-autoreconf.mk | 150 -----------
debian/xsfbs/xsfbs.mk | 148 +---------
debian/xsfbs/xsfbs.sh | 526 +++++++++------------------------------
man/void.man | 7
src/void.c | 58 ++--
14 files changed, 405 insertions(+), 754 deletions(-)
New commits:
commit 2e8f6998f7ea2f0c0329094c4f316afe1c48e150
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Dec 5 23:09:53 2009 +0100
Update Build-Depends: bump debhelper from >= 4.0.0 to >= 5.
diff --git a/debian/changelog b/debian/changelog
index 33f7be2..8eb9cc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xserver-xorg-input-void (1:1.3.0-1) experimental; urgency=low
[ Cyril Brulebois ]
* Upload to experimental.
+ * Bump versioned Build-Depends on debhelper from >= 4.0.0 to >= 5 to
+ match the compat level.
-- Cyril Brulebois <kibi@debian.org> Sat, 05 Dec 2009 23:06:37 +0100
diff --git a/debian/control b/debian/control
index 947ff4f..f550fa7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org>
Build-Depends:
- debhelper (>= 4.0.0),
+ debhelper (>= 5),
pkg-config,
xserver-xorg-dev (>= 2:1.7),
x11proto-core-dev,
commit 7b95c32f8792afab5f876adacb51a8a86a956695
Author: Cyril Brulebois <kibi@debian.org>
Date: Sat Dec 5 23:06:48 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 4b1fecf..33f7be2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,16 @@
-xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-void (1:1.3.0-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
* Bump dephelper compat level to 5.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:05 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <kibi@debian.org> Sat, 05 Dec 2009 23:06:37 +0100
xserver-xorg-input-void (1:1.2.0-2) unstable; urgency=low
commit 6ca14e12a512f4183c7fd38412e69d354a89f90d
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 15:20:41 2009 +0200
Bump dephelper compat level to 5.
diff --git a/debian/changelog b/debian/changelog
index 8ae6f43..4b1fecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
+ * Bump dephelper compat level to 5.
-- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:05 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
commit 451feaa8c386b9a5fc972ee0d5a695751565a3dd
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Sat Dec 5 02:09:24 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 6388c53..8ae6f43 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:45:56 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Sat, 05 Dec 2009 01:49:05 +0200
xserver-xorg-input-void (1:1.2.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index de3ce01..947ff4f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusinow@debian.org>, Brice Goglin <bgoglin@debian.org
Build-Depends:
debhelper (>= 4.0.0),
pkg-config,
- xserver-xorg-dev (>= 2:1.5.99.901),
+ xserver-xorg-dev (>= 2:1.7),
x11proto-core-dev,
x11proto-randr-dev,
x11proto-input-dev,
commit 0f64581442d1cb249af60ca8f1dfd03a2b60425e
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 15:48:35 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 9779d4b..6388c53 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump the build-dep on xutils-dev (>= 1:7.5~1).
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:45:56 +0200
diff --git a/debian/control b/debian/control
index 1c9092f..de3ce01 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
automake,
libtool,
xutils-dev (>= 1:7.5~1)
-Standards-Version: 3.7.2.2
+Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-void
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-void.git
commit 2b07acb652574b0dd292b9229841c795cde82267
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 15:47:47 2009 +0200
Bump the build-dep on xutils-dev (>= 1:7.5~1).
diff --git a/debian/changelog b/debian/changelog
index 171d9f5..9779d4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump the build-dep on xutils-dev (>= 1:7.5~1).
-- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:45:56 +0200
diff --git a/debian/control b/debian/control
index dce1352..1c9092f 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
x11proto-input-dev,
automake,
libtool,
- xutils-dev
+ xutils-dev (>= 1:7.5~1)
Standards-Version: 3.7.2.2
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-void
XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-void.git
commit bf0c706d2f34da9a2d2fba972791d3d9efb1e917
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Mon Nov 30 15:46:18 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 52c22a2..768b3e4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,89 @@
+commit 1377264aaf712025ee695eb51b0ec076ee29bea8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Sep 11 11:36:23 2009 +1000
+
+ void 1.3.0
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1f8f6431bf84228b3c5877be8e20eeb43dcab64d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Sep 10 11:25:21 2009 +1000
+
+ Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6b476f2e22337e6d0b4f0e6194ed25e0ed0f9330
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Sep 7 17:05:56 2009 +1000
+
+ Don't pass an empty RMLVO to InitKeyboardDeviceStruct.
+
+ Passing in NULL is ok, an empty one isn't.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 6bc27d6b56336c6dbaad026fb0478f7e620c6258
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Sep 7 14:52:11 2009 +1000
+
+ Remove some unused variables from configure.
+
+commit df567ec35b67ae83269e97d377e4c4e060c6eb63
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Sep 7 14:49:15 2009 +1000
+
+ man: void is only necessary for server < 1.4
+
+ 1.4 and input hotplug introduced virtual core devices.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit a2ce16486c63e48446cc0fb0e5ea4153cae98e90
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Sep 7 14:48:05 2009 +1000
+
+ Remove RCS tags, some useless comments, empty AUTHORS from man.
+
+commit 7d62e4c5d4dc158be6224b5a048f206d2ff7b0ec
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jul 8 15:10:34 2009 +1000
+
+ void doesn't require randrproto or inputproto.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit e1e98ad7d6b813854420206bca6c88356656c299
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jul 8 15:09:10 2009 +1000
+
+ Remove long-obsolete chunks from configure.ac.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit f8bd425aeff224b01bede7ec4b4731132de1a1bd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Wed Jul 8 14:51:17 2009 +1000
+
+ Replace changelog command with CHANGELOG_CMD from m4 macros.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit fb5ef37927c9c440c0ded515cea6ccaca418d00b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jun 19 08:29:59 2009 +1000
+
+ Remove obsolete chunk, focus/key class is added by InitKeyboardDeviceStruct.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 1c549f65bdcb735f45000d88ec5e6016fe00b72d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Fri Jun 19 08:38:14 2009 +1000
+
+ Adjust for ABI_XINPUT_VERSION >= 7
+
commit c1932081e5a6ba2f6196b8f862fe246668e92124
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Feb 25 08:52:53 2009 +1000
@@ -72,7 +158,7 @@ Date: Fri Sep 7 09:36:14 2007 -0700
Replace static ChangeLog with dist-hook to generate from git log
commit fde354a19e19730ce90365732480674fd155cf6e
-Merge: 4df595e... d293873...
+Merge: 4df595e d293873
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Sep 3 06:06:06 2007 -0400
diff --git a/debian/changelog b/debian/changelog
index 7b134f4..171d9f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-void (1:1.3.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 30 Nov 2009 15:45:56 +0200
+
xserver-xorg-input-void (1:1.2.0-2) unstable; urgency=low
* Allow parallel builds.
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 16:39:23 2009 +0200
xsfbs.mk: remove more obsolete code
We can use plain debconf-updatepo, and don't need to clean the 'imports'
directory or shlibs.local.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 82eb45f..5e16b10 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -177,19 +177,7 @@ xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
rm -rf $(STAMP_DIR)
- rm -rf imports
- dh_clean debian/shlibs.local \
- debian/po/pothead
-
-# Generate the debconf templates POT file header.
-debian/po/pothead: debian/po/pothead.in
- sed -e 's/SOURCE_VERSION/$(SOURCE_VERSION)/' \
- -e 's/DATE/$(shell date "+%F %X%z"/)' <$< >$@
-
-# Update POT and PO files.
-.PHONY: updatepo
-updatepo: debian/po/pothead
- debian/scripts/debconf-updatepo --pot-header=pothead --verbose
+ dh_clean
# Remove files from the upstream source tree that we don't need, or which have
# licensing problems. It must be run before creating the .orig.tar.gz.
commit 9a4314c976e0d22e8d47f5d86163791e407a6ecc
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:43:28 2009 +0200
xsfbs.mk: kill obsolete DEFAULT_DCRESOLUTIONS and SOURCE_DIR usage
These variables aren't set anywhere.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 1f86848..82eb45f 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -176,7 +176,7 @@ cleanscripts:
xsfclean: cleanscripts unpatch
dh_testdir
rm -rf .pc
- rm -rf $(STAMP_DIR) $(SOURCE_DIR)
+ rm -rf $(STAMP_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
debian/po/pothead
@@ -252,7 +252,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
| sed -e '/^#INCLUDE_SHELL_LIB#$$/d' >>$$MAINTSCRIPT.tmp; \
sed -e 's/@SOURCE_VERSION@/$(SOURCE_VERSION)/' \
-e 's/@OFFICIAL_BUILD@/$(OFFICIAL_BUILD)/' \
- -e 's/@DEFAULT_DCRESOLUTIONS@/$(DEFAULT_DCRESOLUTIONS)/' \
<$$MAINTSCRIPT.tmp >$$MAINTSCRIPT; \
rm $$MAINTSCRIPT.tmp; \
fi; \
commit bda208ec00d0b7b3632f57fb27e014684cdf73ba
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Sep 25 15:33:39 2009 +0200
xsfbs.sh: fix typo and remove svn keyword
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 45acd59..813fd8d 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -1,5 +1,3 @@
-# $Id$
-
# This is the X Strike Force shell library for X Window System package
# maintainer scripts. It serves to define shell functions commonly used by
# such packages, and performs some error checking necessary for proper operation
@@ -8,7 +6,7 @@
# removal tasks.
# If you are reading this within a Debian package maintainer script (e.g.,
-# /var/lib/dpkg)info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
+# /var/lib/dpkg/info/PACKAGE.{config,preinst,postinst,prerm,postrm}), you can
# skip past this library by scanning forward in this file to the string
# "GOBSTOPPER".
commit 1377264aaf712025ee695eb51b0ec076ee29bea8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Fri Sep 11 11:36:23 2009 +1000
void 1.3.0
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 5b03f86..a73a3b1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-void],
- 1.2.0,
+ 1.3.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-void)
commit 1f8f6431bf84228b3c5877be8e20eeb43dcab64d
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Sep 10 11:25:21 2009 +1000
Require xorg-macros 1.3 and XORG_DEFAULT_OPTIONS.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 9135ad2..5b03f86 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,16 +35,16 @@ AM_MAINTAINER_MODE
DRIVER_NAME=void
AC_SUBST([DRIVER_NAME])
-# Require xorg-macros: XORG_CWARNFLAGS, XORG_CHANGELOG
-m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
-XORG_MACROS_VERSION(1.2)
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.3)
AM_CONFIG_HEADER([config.h])
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
AC_PROG_CC
-XORG_CWARNFLAGS
+XORG_DEFAULT_OPTIONS
AH_TOP([#include "xorg-server.h"])
@@ -65,8 +65,5 @@ AC_SUBST([CFLAGS])
# Checks for header files.
AC_HEADER_STDC
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit 6b476f2e22337e6d0b4f0e6194ed25e0ed0f9330
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 17:05:56 2009 +1000
Don't pass an empty RMLVO to InitKeyboardDeviceStruct.
Passing in NULL is ok, an empty one isn't.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/void.c b/src/void.c
index c4016a0..c741d87 100644
--- a/src/void.c
+++ b/src/void.c
@@ -177,9 +177,6 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
InputInfoPtr pInfo;
unsigned char map[MAXBUTTONS + 1];
int i;
-#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- XkbRMLVOSet rmlvo;
-#endif
Bool result;
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
Atom btn_labels[MAXBUTTONS] = {0};
@@ -215,8 +212,7 @@ xf86VoidControlProc(DeviceIntPtr device, int what)
}
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 5
- memset(&rmlvo, 0, sizeof(XkbRMLVOSet));
- result = InitKeyboardDeviceStruct(device, &rmlvo,
+ result = InitKeyboardDeviceStruct(device, NULL,
BellProc, KeyControlProc);
#else
result = InitKeyboardDeviceStruct((DevicePtr)device, &void_keysyms,
commit 6bc27d6b56336c6dbaad026fb0478f7e620c6258
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 14:52:11 2009 +1000
Remove some unused variables from configure.
diff --git a/configure.ac b/configure.ac
index 3ce517c..9135ad2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -57,14 +57,11 @@ inputdir=${moduledir}/input
AC_SUBST(inputdir)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
-sdkdir=$(pkg-config --variable=sdkdir xorg-server)
+PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
-# Checks for libraries.
-
# Checks for header files.
AC_HEADER_STDC
commit df567ec35b67ae83269e97d377e4c4e060c6eb63
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 14:49:15 2009 +1000
man: void is only necessary for server < 1.4
1.4 and input hotplug introduced virtual core devices.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/man/void.man b/man/void.man
index 3faed5a..b04fdf3 100644
--- a/man/void.man
+++ b/man/void.man
@@ -16,8 +16,8 @@ void \- null input driver
is an dummy/null __xservername__ input driver. It doesn't connect to any
physical device, and it never delivers any events. It functions as
both a pointer and keyboard device, and may be used as X server's core
-pointer and/or core keyboard. It's purpose is to allow the X server
-to operate without a core pointer and/or core keyboard.
+pointer and/or core keyboard. It's purpose is to allow X servers pre
+version 1.4 to operate without a core pointer and/or core keyboard.
.SH CONFIGURATION DETAILS
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
commit a2ce16486c63e48446cc0fb0e5ea4153cae98e90
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Sep 7 14:48:05 2009 +1000
Remove RCS tags, some useless comments, empty AUTHORS from man.
diff --git a/man/void.man b/man/void.man
index 9054363..3faed5a 100644
--- a/man/void.man
+++ b/man/void.man
@@ -1,4 +1,3 @@
-.\" $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.man,v 1.1 2001/01/24 00:06:38 dawes Exp $
.\" shorthand for double quote that works everywhere.
.ds q \N'34'
.TH VOID __drivermansuffix__ __vendorversion__
@@ -25,5 +24,3 @@ details and for options that can be used with all input drivers. This
driver doesn't have any configuration options in addition to those.
.SH "SEE ALSO"
__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
-.SH AUTHORS
-Authors include...
diff --git a/src/void.c b/src/void.c
index aeed18d..c4016a0 100644
--- a/src/void.c
+++ b/src/void.c
@@ -21,8 +21,6 @@
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/void/void.c,v 1.1 1999/11/19 13:54:57 hohndel Exp $ */
-
/* Input device which doesn't output any event. This device can be used
* as a core pointer or as a core keyboard.
*/
@@ -408,11 +406,3 @@ _X_EXPORT XF86ModuleData voidModuleData = {
};
#endif /* XFree86LOADER */
-
-/*
- * Local variables:
- * change-log-default-name: "~/xinput.log"
- * c-file-style: "bsd"
- * End:
- */
-/* end of void.c */
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:53:36 2009 +0200
xsfbs.mk: no need for shlibs.local
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index f0f8953..1f86848 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -265,10 +265,6 @@ $(STAMP_DIR)/genscripts: $(STAMP_DIR)/stampdir
# debian/*.prerm
>$@
-# Generate the shlibs.local file.
-debian/shlibs.local:
- cat debian/*.shlibs >$@
-
SERVERMINVERS = $(shell cat /usr/share/xserver-xorg/serverminver 2>/dev/null)
VIDEOABI = $(shell cat /usr/share/xserver-xorg/videoabiver 2>/dev/null)
INPUTABI = $(shell cat /usr/share/xserver-xorg/inputabiver 2>/dev/null)
commit 1f858adff1ce2687cf542dd9b69b81137412f8a4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:47:09 2009 +0200
xsfbs.sh: remove unused reject_whitespace function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index b3f4bbe..45acd59 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -93,22 +93,6 @@ reject_nondigits () {
done
}
-reject_whitespace () {
- # syntax: reject_whitespace [ operand ]
- #
- # scan operand (typically a shell variable whose value cannot be trusted) for
- # whitespace characters and barf if any are found
- if [ -n "$1" ]; then
- # does the operand contain any whitespace?
- if expr "$1" : "[[:space:]]" > /dev/null 2>&1; then
- # can't use die(), because I want to avoid forward references
- echo "$THIS_PACKAGE $THIS_SCRIPT error: reject_whitespace() encountered" \
- "possibly malicious garbage \"$1\"" >&2
- exit $SHELL_LIB_THROWN_ERROR
- fi
- fi
-}
-
reject_unlikely_path_chars () {
# syntax: reject_unlikely_path_chars [ operand ... ]
#
commit 0dd71e12416aa7dc60ed68af8127e04609b125f4
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:53 2009 +0200
xsfbs.sh: remove unused find_culprits function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 7dbb196..b3f4bbe 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,53 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-find_culprits () {
- local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- msg
-
- reject_whitespace "$1"
- message "Searching for overlapping packages..."
- dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $dpkg_info_dir ]; then
- if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
- possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
- "(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$possible_culprits" ]; then
- smoking_guns=$(grep -l "$1" $possible_culprits || true)
- if [ -n "$smoking_guns" ]; then
- bad_packages=$(printf "\\n")
- for f in $smoking_guns; do
- # too bad you can't nest parameter expansion voodoo
- p=${f%*.list} # strip off the trailing ".list"
- package=${p##*/} # strip off the directories
- bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
- done
- msg=$(cat <<EOF
-The following packages appear to have file overlaps with the X.Org packages;
-these packages are either very old, or in violation of Debian Policy. Try
-upgrading each of these packages to the latest available version if possible:
-for example, with the command "apt-get install". If no newer version of a
-package is available, you will have to remove it; for example, with the command
-"apt-get remove". If even the latest available version of the package has
-this file overlap, please file a bug against that package with the Debian Bug
-Tracking System. You may want to refer the package maintainer to section 12.8
-of the Debian Policy manual.
-EOF
-)
- message "$msg"
- message "The overlapping packages are: $bad_packages"
- else
- message "no overlaps found."
- fi
- fi
- else
- message "cannot search; no matches for $dpkg_info_dir/*.list."
- fi
- else
- message "cannot search; $dpkg_info_dir does not exist."
- fi
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit b6c6eceec66066ebac16c85cc75bfa8a4f6cf58a
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:23:06 2009 +0200
xsfbs.sh: remove unused maplink function
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index f869274..7dbb196 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -199,37 +199,6 @@ usage_error () {
exit $SHELL_LIB_USAGE_ERROR
}
-
-maplink () {
- # returns what symlink should point to; i.e., what the "sane" answer is
- # Keep this in sync with the debian/*.links files.
- # This is only needed for symlinks to directories.
- #
- # XXX: Most of these look wrong in the X11R7 world and need to be fixed.
- # If we've stopped using this function, fixing it might enable us to re-enable
- # it again and catch more errors.
- case "$1" in
- /etc/X11/xkb/compiled) echo /var/lib/xkb ;;
- /etc/X11/xkb/xkbcomp) echo /usr/X11R6/bin/xkbcomp ;;
- /usr/X11R6/lib/X11/app-defaults) echo /etc/X11/app-defaults ;;
- /usr/X11R6/lib/X11/fs) echo /etc/X11/fs ;;
- /usr/X11R6/lib/X11/lbxproxy) echo /etc/X11/lbxproxy ;;
- /usr/X11R6/lib/X11/proxymngr) echo /etc/X11/proxymngr ;;
- /usr/X11R6/lib/X11/rstart) echo /etc/X11/rstart ;;
- /usr/X11R6/lib/X11/twm) echo /etc/X11/twm ;;
- /usr/X11R6/lib/X11/xdm) echo /etc/X11/xdm ;;
- /usr/X11R6/lib/X11/xinit) echo /etc/X11/xinit ;;
- /usr/X11R6/lib/X11/xkb) echo /etc/X11/xkb ;;
- /usr/X11R6/lib/X11/xserver) echo /etc/X11/xserver ;;
- /usr/X11R6/lib/X11/xsm) echo /etc/X11/xsm ;;
- /usr/bin/X11) echo ../X11R6/bin ;;
- /usr/bin/rstartd) echo ../X11R6/bin/rstartd ;;
- /usr/include/X11) echo ../X11R6/include/X11 ;;
- /usr/lib/X11) echo ../X11R6/lib/X11 ;;
- *) internal_error "maplink() called with unknown path \"$1\"" ;;
- esac
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 8eb3d6a5ce9964876e48ea56048f1a5135ef4f28
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:21:34 2009 +0200
xsfbs.sh: remove unused analyze_path
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 4461b1a..f869274 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -230,32 +230,6 @@ maplink () {
esac
}
-analyze_path () {
- # given a supplied set of pathnames, break each one up by directory and do an
- # ls -dl on each component, cumulatively; i.e.
- # analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
- # Thanks to Randolph Chung for this clever hack.
-
- local f g
-
- while [ -n "$1" ]; do
- reject_whitespace "$1"
- g=
- message "Analyzing $1:"
- for f in $(echo "$1" | tr / \ ); do
- if [ -e /$g$f ]; then
- ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
- g=$g$f/
- else
- message "/$g$f: nonexistent; directory contents of /$g:"
- ls -l /$g
- break
- fi
- done
- shift
- done
-}
-
find_culprits () {
local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
msg
commit 1d0081bdf60944d8ef0935a531dfbcc5f01739c5
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Aug 26 18:20:11 2009 +0200
xsfbs.sh: remove unused check_symlinks_and_{bomb,warn}
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 781826f..4461b1a 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -303,115 +303,6 @@ EOF
fi
}
-check_symlink () {
- # syntax: check_symlink symlink
- #
- # See if specified symlink points where it is supposed to. Return 0 if it
- # does, and 1 if it does not.
- #
- # Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
-
- local symlink
-
- # validate arguments
- if [ $# -ne 1 ]; then
- usage_error "check_symlink() called with wrong number of arguments;" \
- "expected 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- symlink="$1"
-
- if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
- return 0
- else
- return 1
- fi
-}
-
-check_symlinks_and_warn () {
- # syntax: check_symlinks_and_warn symlink ...
- #
- # For each argument, check for symlink sanity, and warn if it isn't sane.
- #
- # Call this function from a preinst script in the event $1 is "upgrade" or
- # "install".
-
- local errmsg symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_warn() called with wrong number of" \
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- observe "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink"); removing"
- rm "$symlink"
- fi
- elif [ -e "$symlink" ]; then
- errmsg="$symlink exists and is not a symbolic link; this package cannot"
- errmsg="$errmsg be installed until this"
- if [ -f "$symlink" ]; then
- errmsg="$errmsg file"
- elif [ -d "$symlink" ]; then
- errmsg="$errmsg directory"
- else
- errmsg="$errmsg thing"
- fi
- errmsg="$errmsg is removed"
- die "$errmsg"
- fi
- shift
- done
-}
-
-check_symlinks_and_bomb () {
- # syntax: check_symlinks_and_bomb symlink ...
- #
- # For each argument, check for symlink sanity, and bomb if it isn't sane.
- #
- # Call this function from a postinst script.
-
- local problem symlink
-
- # validate arguments
- if [ $# -lt 1 ]; then
- usage_error "check_symlinks_and_bomb() called with wrong number of"
- "arguments; expected at least 1, got $#"
- exit $SHELL_LIB_USAGE_ERROR
- fi
-
- while [ -n "$1" ]; do
- problem=
- symlink="$1"
- if [ -L "$symlink" ]; then
- if ! check_symlink "$symlink"; then
- problem=yes
- warn "$symlink symbolic link points to wrong location" \
- "$(readlink "$symlink")"
- fi
- elif [ -e "$symlink" ]; then
- problem=yes
- warn "$symlink is not a symbolic link"
- else
- problem=yes
- warn "$symlink symbolic link does not exist"
- fi
- if [ -n "$problem" ]; then
- analyze_path "$symlink" "$(readlink "$symlink")"
- find_culprits "$symlink"
- die "bad symbolic links on system"
- fi
- shift
- done
-}
-
font_update () {
# run $UPDATECMDS in $FONTDIRS
commit 7d62e4c5d4dc158be6224b5a048f206d2ff7b0ec
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 8 15:10:34 2009 +1000
void doesn't require randrproto or inputproto.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 14dc5d3..3ce517c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,10 +56,6 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
-# Checks for extensions
-XORG_DRIVER_CHECK_EXT(RANDR, randrproto)
-XORG_DRIVER_CHECK_EXT(XINPUT, inputproto)
-
# Checks for pkg-config packages
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
commit e1e98ad7d6b813854420206bca6c88356656c299
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Wed Jul 8 15:09:10 2009 +1000
Remove long-obsolete chunks from configure.ac.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index b9efc24..14dc5d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,24 +48,6 @@ XORG_CWARNFLAGS
AH_TOP([#include "xorg-server.h"])
Reply to: