COPYING | 27 +++--
ChangeLog | 81 ++++++++++++++++
README | 13 +-
configure.ac | 14 +-
debian/README.source | 73 ++++++++++++++
debian/changelog | 17 +++
debian/control | 4
debian/xsfbs/xsfbs.mk | 21 ----
debian/xsfbs/xsfbs.sh | 245 --------------------------------------------------
man/.cvsignore | 2
src/.cvsignore | 6 -
src/acecad.c | 67 ++++++++-----
src/acecad.h | 1
13 files changed, 249 insertions(+), 322 deletions(-)
New commits:
commit fde449c9c2d2475f2b5a9923ba2c1ce5f4e98ab0
Author: Cyril Brulebois <k...@debian.org>
Date: Sat Dec 5 23:25:32 2009 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 78e9593..439295d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-xserver-xorg-input-acecad (1:1.4.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-acecad (1:1.4.0-1) experimental; urgency=low
+ [ Timo Aaltonen ]
* New upstream release.
* Bump Standards-Version to 3.8.3.
* Build against Xserver 1.7.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:01 +0200
+ [ Cyril Brulebois ]
+ * Upload to experimental.
+
+ -- Cyril Brulebois <k...@debian.org> Sat, 05 Dec 2009 23:25:26 +0100
xserver-xorg-input-acecad (1:1.3.0-2) unstable; urgency=low
commit fabb2201e073d80a78931d04be36a7c384ca8910
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Sat Dec 5 02:09:22 2009 +0200
Build against Xserver 1.7.
diff --git a/debian/changelog b/debian/changelog
index 3d4c79f..78e9593 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,9 @@ xserver-xorg-input-acecad (1:1.4.0-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.8.3.
+ * Build against Xserver 1.7.
- -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 27 Nov 2009 17:13:19 +0200
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Sat, 05 Dec 2009 01:49:01 +0200
xserver-xorg-input-acecad (1:1.3.0-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 8ddeb3e..fdb04ee 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons
<dpars...@debian.or
Build-Depends:
debhelper (>= 5),
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 837beea61cf1bc061b87b78803699604e93f840f
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Mon Nov 30 11:40:44 2009 +0200
Bump Standards-Version to 3.8.3.
diff --git a/debian/changelog b/debian/changelog
index 2fbf088..3d4c79f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xserver-xorg-input-acecad (1:1.4.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Bump Standards-Version to 3.8.3.
-- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 27 Nov 2009 17:13:19 +0200
diff --git a/debian/control b/debian/control
index 4dfd846..8ddeb3e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
automake,
libtool,
xutils-dev
-Standards-Version: 3.7.2
+Standards-Version: 3.8.3
XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-acecad
XS-Vcs-Browser:
http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-acecad.git
commit e148d709e19f2e15f72b5b37ce0de75c3bbd5f22
Author: Timo Aaltonen <tjaal...@cc.hut.fi>
Date: Fri Nov 27 17:17:16 2009 +0200
Update the changelogs.
diff --git a/ChangeLog b/ChangeLog
index 409ba60..adb5987 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,82 @@
+commit da1d7acc20a1b9ef4450b40781f1f207d9fa4e3d
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 9 12:44:10 2009 +1000
+
+ acecad 1.4.0
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit c51255043e97ff65adebb7527c6b5b68fa2ff038
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Fri Sep 11 11:54:31 2009 +1000
+
+ Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit f6d158802c2a3a0083d110428699027939276e44
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 9 12:33:41 2009 +1000
+
+ Remove redefinition of read()
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 26c7872b49674d40a8d6b74915257c90a9708dd0
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 9 12:32:08 2009 +1000
+
+ Remove unused code from TearDownProc
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit b54f57f070ae02d480857d0616b879809cc652df
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 9 12:30:30 2009 +1000
+
+ unifdef XFree86LOADER, this isn't optional anymore anyway.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 2bd6c562d123cbbe613ebbd90eb4af1d1525d347
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 9 12:28:28 2009 +1000
+
+ Remove RCS tags
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 1a9ad110aa6df430fbf9ded35d8dbb8a75ee1872
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Sep 9 12:27:32 2009 +1000
+
+ remove un-used _ACECAD_C_ define
+
+commit e7c779b05b92ae1fb4a2891727d85a309d53b832
+Author: Gaetan Nadon <mems...@videotron.ca>
+Date: Mon Sep 7 11:12:13 2009 -0400
+
+ xf86-input-acecad: Remove unused .cvsignore file #23776
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit a87f59f431c86272e45fdc3ed328fd30be1db2ae
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Mon Jun 22 13:36:54 2009 +1000
+
+ Cope with ABI_XINPUT_VERSION 7 - requires button/axes labels.
+
+ We don't have an atom for relative pressure, so if the device is set to
+ relative, we export the axis as REL_Z instead.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit 8da028291921a3948486c60ad8c7a52c4f431a56
+Author: Alan Coopersmith <alan.coopersm...@sun.com>
+Date: Mon May 11 19:25:11 2009 -0700
+
+ Fill in COPYING file, add SubmittingPatches URL to README
+
commit 1685d3b518cf5fe4cc6a8fb3e3c28beb9b3ddb82
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Tue Feb 24 13:22:46 2009 +1000
@@ -278,7 +357,7 @@ Date: Fri Apr 27 14:40:43 2007 +0200
the "Name" option.
commit 947aa75cf284b651c77ae1f0431cae0c3c3d3d05
-Merge: 581635e... 805ccfb...
+Merge: 581635e 805ccfb
Author: Giuseppe Bilotta <giuseppe.bilo...@gmail.com>
Date: Fri Apr 27 12:23:44 2007 +0200
diff --git a/debian/changelog b/debian/changelog
index 2f907f8..2fbf088 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-acecad (1:1.4.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Fri, 27 Nov 2009 17:13:19 +0200
+
xserver-xorg-input-acecad (1:1.3.0-2) unstable; urgency=low
* Allow parallel builds.
commit 2a1b4553fc2c5ba982e8bb8be4c504e28ce79ed1
Author: Julien Cristau <jcris...@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 <jcris...@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 <jcris...@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 da1d7acc20a1b9ef4450b40781f1f207d9fa4e3d
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Sep 9 12:44:10 2009 +1000
acecad 1.4.0
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 4be9c2b..900eed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-acecad],
- 1.3.0,
+ 1.4.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-acecad)
commit c51255043e97ff65adebb7527c6b5b68fa2ff038
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Fri Sep 11 11:54:31 2009 +1000
Require xorg-macros 1.3 for XORG_DEFAULT_OPTIONS
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/configure.ac b/configure.ac
index 1787cb4..4be9c2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,16 +32,16 @@ AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
-# 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"])
@@ -96,8 +96,4 @@ AM_CONDITIONAL(HAVE_LIBSYSFS, test x$HAVE_LIBSYSFS = xyes)
DRIVER_NAME=acecad
AC_SUBST([DRIVER_NAME])
-XORG_MANPAGE_SECTIONS
-XORG_RELEASE_VERSION
-XORG_CHANGELOG
-
AC_OUTPUT([Makefile src/Makefile man/Makefile])
commit f6d158802c2a3a0083d110428699027939276e44
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Sep 9 12:33:41 2009 +1000
Remove redefinition of read()
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 65b3088..61e4c21 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -100,9 +100,6 @@
* Local Variables
****************************************************************************/
-#undef read
-#define read(a,b,c) xf86ReadSerial((a),(b),(c))
-
/* max number of input events to read in one read call */
#define MAX_EVENTS 50
@@ -878,7 +875,7 @@ USBReadInput (LocalDevicePtr local)
/* Was the device available last time we checked? */
int avail = priv->flags & AVAIL_FLAG;
- SYSCALL(len = read(local->fd, eventbuf, sizeof(eventbuf)));
+ SYSCALL(len = xf86ReadSerial(local->fd, eventbuf, sizeof(eventbuf)));
if (len <= 0) {
if (avail) {
commit 26c7872b49674d40a8d6b74915257c90a9708dd0
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Sep 9 12:32:08 2009 +1000
Remove unused code from TearDownProc
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 9ab396b..65b3088 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -155,18 +155,6 @@ SetupProc( pointer module,
static void
TearDownProc( pointer p )
{
-#if 0
- LocalDevicePtr local = (LocalDevicePtr) p;
- AceCadPrivatePtr priv = (AceCadPrivatePtr) local->private;
-
- DeviceOff (local->dev);
-
- xf86CloseSerial (local->fd);
- XisbFree (priv->buffer);
- xfree (priv);
- xfree (local->name);
- xfree (local);
-#endif
}
static const char *default_options[] =
commit b54f57f070ae02d480857d0616b879809cc652df
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Sep 9 12:30:30 2009 +1000
unifdef XFree86LOADER, this isn't optional anymore anyway.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 9d735a1..9ab396b 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -117,7 +117,6 @@ _X_EXPORT InputDriverRec ACECAD =
0
};
-#ifdef XFree86LOADER
static XF86ModuleVersionInfo VersionRec =
{
"acecad",
@@ -169,7 +168,6 @@ TearDownProc( pointer p )
xfree (local);
#endif
}
-#endif
static const char *default_options[] =
{
commit 2bd6c562d123cbbe613ebbd90eb4af1d1525d347
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Sep 9 12:28:28 2009 +1000
Remove RCS tags
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 529436d..9d735a1 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -23,7 +23,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.c,v 1.4
2003/10/30 00:40:45 dawes Exp $ */
#include "config.h"
diff --git a/src/acecad.h b/src/acecad.h
index 9acfca2..c4befb9 100644
--- a/src/acecad.h
+++ b/src/acecad.h
@@ -23,7 +23,6 @@
*
*
*/
-/* $XFree86: xc/programs/Xserver/hw/xfree86/input/acecad/acecad.h,v 1.2tsi Exp
$ */
#ifndef _ACECAD_H_
#define _ACECAD_H_
commit 1a9ad110aa6df430fbf9ded35d8dbb8a75ee1872
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Wed Sep 9 12:27:32 2009 +1000
remove un-used _ACECAD_C_ define
diff --git a/src/acecad.c b/src/acecad.c
index 1dac489..529436d 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -35,7 +35,6 @@
#define XORG_BOTCHED_INPUT 0
#endif
-#define _ACECAD_C_
/*****************************************************************************
* Standard Headers
****************************************************************************/
commit e7c779b05b92ae1fb4a2891727d85a309d53b832
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Mon Sep 7 11:12:13 2009 -0400
xf86-input-acecad: Remove unused .cvsignore file #23776
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index fb1befd..0000000
--- a/.cvsignore
+++ /dev/null
@@ -1,19 +0,0 @@
-Makefile
-Makefile.in
-*.la
-*.lo
-aclocal.m4
-autom4te.cache
-config.guess
-config.h
-config.h.in
-config.log
-config.status
-config.sub
-configure
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-stamp-h1
diff --git a/man/.cvsignore b/man/.cvsignore
deleted file mode 100644
index 282522d..0000000
--- a/man/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-Makefile
-Makefile.in
diff --git a/src/.cvsignore b/src/.cvsignore
deleted file mode 100644
index 9730646..0000000
--- a/src/.cvsignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.deps
-.libs
-Makefile
-Makefile.in
-*.la
-*.lo
commit 5693792171d885769e58dcccc053c08b11acd12a
Author: Julien Cristau <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 <jcris...@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 a87f59f431c86272e45fdc3ed328fd30be1db2ae
Author: Peter Hutterer <peter.hutte...@who-t.net>
Date: Mon Jun 22 13:36:54 2009 +1000
Cope with ABI_XINPUT_VERSION 7 - requires button/axes labels.
We don't have an atom for relative pressure, so if the device is set to
relative, we export the axis as REL_Z instead.
Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
diff --git a/src/acecad.c b/src/acecad.c
index 63c5aaf..1dac489 100644
--- a/src/acecad.c
+++ b/src/acecad.c
@@ -78,6 +78,11 @@
#endif
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+#include <X11/Xatom.h>
+#include <xserver-properties.h>
+#endif
+
/* Previously found in xf86Xinput.h */
#ifdef DBG
#undef DBG
@@ -627,13 +632,36 @@ DeviceInit (DeviceIntPtr dev)
int rx, ry;
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
AceCadPrivatePtr priv = (AceCadPrivatePtr) (local->private);
- unsigned char map[] =
- {0, 1, 2, 3};
+ unsigned char map[] = {0, 1, 2, 3};
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ Atom btn_labels[3];
+ Atom axes_labels[3];
+
+ btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+ btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+ btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+
+ if ((priv->flags & ABSOLUTE_FLAG))
+ {
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_PRESSURE);
+ } else
+ {
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+ axes_labels[2] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Z);
+ }
+#endif
xf86MsgVerb(X_INFO, 4, "%s Init\n", local->name);
/* 3 boutons */
- if (InitButtonClassDeviceStruct (dev, 3, map) == FALSE)
+ if (InitButtonClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ btn_labels,
+#endif
+ map) == FALSE)
{
xf86Msg(X_ERROR, "%s: unable to allocate ButtonClassDeviceStruct\n",
local->name);
return !Success;
@@ -653,6 +681,9 @@ DeviceInit (DeviceIntPtr dev)
/* 3 axes */
if (InitValuatorClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axes_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
xf86GetMotionEvents,
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
