xserver-xorg-input-elographics: Changes to 'debian-unstable'
.cvsignore | 19
.gitignore | 20
COPYING | 26
ChangeLog | 367 +++++++
Makefile.in | 152 +--
aclocal.m4 | 911 ++++++++++++-------
config.guess | 60 -
config.sub | 66 +
configure | 1837 ++++++++++++++++++++++++++-------------
configure.ac | 4
debian/changelog | 12
debian/control | 8
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---
debian/xsfbs/xsfbs.mk | 80 -
depcomp | 93 +
install-sh | 514 +++++++---
ltmain.sh | 277 +++--
man/.cvsignore | 2
man/.gitignore | 2
man/Makefile.am | 1
man/Makefile.in | 95 +-
missing | 61 -
mkinstalldirs | 5
src/.cvsignore | 6
src/.gitignore | 6
src/Makefile.in | 140 +-
src/xf86Elo.c | 148 +--
28 files changed, 3304 insertions(+), 1760 deletions(-)
New commits:
commit befa3d5e2040b8826ea8a220a00b5a0c5382a480
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 20:30:45 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index f499fa2..3777b05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-elographics (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-elographics (1:1.2.1-1) unstable; urgency=low
* New upstream release.
* Bump Standards-Version to 3.7.3.
@@ -8,7 +8,7 @@ xserver-xorg-input-elographics (1:1.2.1-1) UNRELEASED; urgency=low
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
- -- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 19:02:11 +0100
+ -- Julien Cristau <jcristau@debian.org> Thu, 22 May 2008 20:30:40 +0200
xserver-xorg-input-elographics (1:1.1.0-3) unstable; urgency=low
commit 77071bbdf5c4f321321f0c3eafe65b1bd70d5196
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 20:11:37 2008 +0200
Revert gratuitous differences with upstream git
They seem to have been introduced in cvs for elographics 1.1.0,
and never imported to git (or something).
diff --git a/configure.ac b/configure.ac
index 62089a9..24ab647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,7 @@ 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)
+PKG_CHECK_MODULES(XORG, xorg-server xproto $REQUIRED_MODULES)
sdkdir=$(pkg-config --variable=sdkdir xorg-server)
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index 5da490e..2a76849 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -57,9 +57,10 @@
#ifdef XFREE86_V4
+#ifndef XFree86LOADER
#include <unistd.h>
#include <errno.h>
-#include <string.h>
+#endif
#include "misc.h"
#include "xf86.h"
commit 86831175fdd02f9a596ebeeaf18c29c910d49cef
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 19:54:19 2008 +0200
Run dpkg-shlibdeps with --warnings=6.
Drivers reference symbols from /usr/bin/Xorg and other modules,
and that's not a bug, so we want dpkg-shlibdeps to shut up about
symbols it can't find.
Build-depend on dpkg-dev >= 1.14.17.
diff --git a/debian/changelog b/debian/changelog
index 296520f..f499fa2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,10 @@ xserver-xorg-input-elographics (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
+ * Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
+ /usr/bin/Xorg and other modules, and that's not a bug, so we want
+ dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
+ dpkg-dev >= 1.14.17.
-- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 19:02:11 +0100
diff --git a/debian/control b/debian/control
index c8c00ac..37699ba 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git
diff --git a/debian/rules b/debian/rules
index 824df49..d0c1be4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -79,7 +79,7 @@ binary-arch: build install serverabi
dh_compress
dh_fixperms
dh_installdeb
- dh_shlibdeps
+ dh_shlibdeps -- --warnings=6
dh_gencontrol
dh_md5sums
dh_builddeb
commit 4f0d649873fc90eb93b9d82f789114b81af5e5c7
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 19:52:08 2008 +0200
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index b801b5e..554991c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+commit 174a043bbad20de2959cc08736f894ef56536ece
+Author: Adam Jackson <ajax@redhat.com>
+Date: Wed May 21 15:00:44 2008 -0400
+
+ elographics 1.2.1
+
+commit 0133d754c10341ca5b572beeee72488b8f5ae8a8
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu May 1 12:03:44 2008 +0930
+
+ Don't divide by zero. #14902
+
+ X.Org Bug 14902 <http://bugs.freedesktop.org/show_bug.cgi?id=14902>
+
commit d639f87a52aac179ef9d0908c012e79baf5fa245
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 15:30:00 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index a1843c6..296520f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-elographics (1:1.2.0-1) UNRELEASED; urgency=low
+xserver-xorg-input-elographics (1:1.2.1-1) UNRELEASED; urgency=low
* New upstream release.
* Bump Standards-Version to 3.7.3.
commit 5124215d3fe0a1119a57cd1e84c92a04467a3096
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 19:51:37 2008 +0200
autoreconf
diff --git a/aclocal.m4 b/aclocal.m4
index ef947f1..62b902b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -21,7 +21,7 @@ To do so, use the procedure documented by the package, typically `autoreconf'.])
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-# serial 52 Debian 1.5.26-1 AC_PROG_LIBTOOL
+# serial 52 Debian 1.5.26-4 AC_PROG_LIBTOOL
# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
diff --git a/configure b/configure
index aad114a..cb72041 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-elographics 1.2.0.
+# Generated by GNU Autoconf 2.61 for xf86-input-elographics 1.2.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-elographics'
PACKAGE_TARNAME='xf86-input-elographics'
-PACKAGE_VERSION='1.2.0'
-PACKAGE_STRING='xf86-input-elographics 1.2.0'
+PACKAGE_VERSION='1.2.1'
+PACKAGE_STRING='xf86-input-elographics 1.2.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1416,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-elographics 1.2.0 to adapt to many kinds of systems.
+\`configure' configures xf86-input-elographics 1.2.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1486,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-elographics 1.2.0:";;
+ short | recursive ) echo "Configuration of xf86-input-elographics 1.2.1:";;
esac
cat <<\_ACEOF
@@ -1598,7 +1598,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-elographics configure 1.2.0
+xf86-input-elographics configure 1.2.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1612,7 +1612,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-elographics $as_me 1.2.0, which was
+It was created by xf86-input-elographics $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2304,7 +2304,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-elographics'
- VERSION='1.2.0'
+ VERSION='1.2.1'
cat >>confdefs.h <<_ACEOF
@@ -21712,7 +21712,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-elographics $as_me 1.2.0, which was
+This file was extended by xf86-input-elographics $as_me 1.2.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21765,7 +21765,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-elographics config.status 1.2.0
+xf86-input-elographics config.status 1.2.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/ltmain.sh b/ltmain.sh
index 5def351..0bf3848 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -43,7 +43,7 @@ EXIT_FAILURE=1
PROGRAM=ltmain.sh
PACKAGE=libtool
-VERSION="1.5.26 Debian 1.5.26-1"
+VERSION="1.5.26 Debian 1.5.26-4"
TIMESTAMP=" (1.1220.2.493 2008/02/01 16:58:18)"
# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
commit bfb7a15e02bbb886bb6ed04005c62adbe6250315
Author: Julien Cristau <jcristau@debian.org>
Date: Thu May 22 19:48:36 2008 +0200
Build against xserver 1.4
diff --git a/debian/changelog b/debian/changelog
index 6a929d3..a1843c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,6 @@
xserver-xorg-input-elographics (1:1.2.0-1) UNRELEASED; urgency=low
* New upstream release.
- * Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/control b/debian/control
index 120d07d..c8c00ac 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git
commit 174a043bbad20de2959cc08736f894ef56536ece
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 15:00:44 2008 -0400
elographics 1.2.1
diff --git a/configure.ac b/configure.ac
index 8f5d602..24ab647 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-elographics],
- 1.2.0,
+ 1.2.1,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-elographics)
commit 0133d754c10341ca5b572beeee72488b8f5ae8a8
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu May 1 12:03:44 2008 +0930
Don't divide by zero. #14902
X.Org Bug 14902 <http://bugs.freedesktop.org/show_bug.cgi?id=14902>
diff --git a/src/xf86Elo.c b/src/xf86Elo.c
index d52c712..2a76849 100644
--- a/src/xf86Elo.c
+++ b/src/xf86Elo.c
@@ -723,6 +723,9 @@ xf86EloConvert(LocalDevicePtr local,
DBG(3, ErrorF("EloConvert: Screen(%d) - v0(%d), v1(%d)\n", priv->screen_no, v0, v1));
+ if (width == 0) width = 1;
+ if (height == 0) height = 1;
+
if (priv->swap_axes) {
input_x = v1;
input_y = v0;
commit c87ea43906787791a87a659c0a9d6312945ffb32
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Apr 13 03:12:18 2008 +0200
Remove xsfbs-autoreconf.mk
It has never been used, and that doesn't look likely to change.
diff --git a/debian/xsfbs/xsfbs-autoreconf.mk b/debian/xsfbs/xsfbs-autoreconf.mk
deleted file mode 100644
index dce8fc8..0000000
--- a/debian/xsfbs/xsfbs-autoreconf.mk
+++ /dev/null
@@ -1,150 +0,0 @@
-#!/usr/bin/make -f
-# $Id$
-
-# Automagical conversion of autoreconf results into quilt patches.
-
-# Copyright 2006 Eugene Konev
-#
-# Licensed under the GNU General Public License, version 2. See the file
-# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
-
-# The idea behind this is storing changes produced by autoreconf as a
-# separate patch on quilt stack (on top of stack actually).
-# The only usable target here is 'autoreconf`. Other targets are not
-# supposed to be called directly. DO NOT invoke them, unless you know what
-# you are doing.
-# The autoreconf target will check if files with names in $(RECONF_CHECKFILES)
-# were changed during patching (from upstream version or from previously
-# autoreconfed version) and call actual autoreconfing if they were.
-# The actual autoreconfing target (doautoreconf) WILL FAIL after
-# calling autoreconf and pushing changes into quilt stack by design. It
-# should never be invoked by automatic build process.
-# The proposed use is adding autoreconf into clean's prerequisites before
-# xsfclean like:
-# - clean: xsfclean
-# + clean: autoreconf xsfclean
-# This will ensure it is called when you build package with dpkg-buildpackage.
-
-# This dir will be used for producing diff of autoreconfed tree
-RECONF_DIR := xsfautoreconf
-
-# This files will be checked for changes
-RECONF_CHECKFILES += configure.ac Makefile.am
-
-# This files will not be hardlinked but copied
-RECONF_NOLINKFILES += aclocal.m4
-
-# This files/dirs will be pruned after autoreconf run
-RECONF_PRUNEFILES += autom4te.cache config.h.in~ aclocal.m4~
-
-# Internal target. Never invoke directly.
-stampdir_target+=check.md5sum
-$(STAMP_DIR)/check.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules prepare
- for F in $(RECONF_CHECKFILES); do \
- find . -wholename ./$(STAMP_DIR) -prune -o -name $$F -print | \
- LC_ALL=C sort | xargs --no-run-if-empty md5sum >>$@; \
- done
-
-# Internal target. Never invoke directly.
-$(STAMP_DIR)/clean.md5sum:
- dh_testdir
- $(MAKE) -f debian/rules unpatch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- mv $(STAMP_DIR)/check.md5sum $@
-
-# Internal target. Never invoke directly.
-debian/patches/patched.md5sum:
- dh_testdir
- [ -f $(STAMP_DIR)/clean.md5sum ] || \
- $(MAKE) -f debian/rules $(STAMP_DIR)/clean.md5sum
-
- $(MAKE) -f debian/rules patch
- rm -f $(STAMP_DIR)/check.md5sum
- $(MAKE) -f debian/rules $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/clean.md5sum \
- $(STAMP_DIR)/check.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- else \
- mv $(STAMP_DIR)/check.md5sum $@; \
- fi
-
-# Internal target. Never invoke directly.
-,PHONY: doautoreconf
-doautoreconf: patch
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1 || true
- if quilt applied | grep ^autoreconf.diff$$ > /dev/null; then \
- quilt pop -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt rename -p autoreconf.diff autoreconf-old.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt delete autoreconf-old.diff >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- quilt push -a >>$(STAMP_DIR)/log/autoreconf 2>&1; \
- fi
-
- if [ -e $(RECONF_DIR) ]; then \
- echo "ERROR: $(RECONF_DIR) already exists. Cleanup by hand"; \
- exit 1; \
- fi
-
- mkdir -p $(RECONF_DIR)/before
- find . -maxdepth 1 -mindepth 1 ! -wholename ./$(RECONF_DIR) \
- -a ! -wholename ./debian -a ! -wholename ./patches \
- -a ! -wholename ./.pc -a ! -wholename ./$(STAMP_DIR) | \
- xargs -i{} cp -al {} $(RECONF_DIR)/before/
-
- for F in $(RECONF_PRUNEFILES); do \
- find $(RECONF_DIR)/before -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cp -al $(RECONF_DIR)/before $(RECONF_DIR)/after
-
- for F in $(RECONF_NOLINKFILES); do \
- find . -wholename ./$(RECONF_DIR) -prune -o -wholename ./debian \
- -prune -o -wholename ./$(STAMP_DIR) -prune -o -name $$F \
- -print | \
- xargs --no-run-if-empty -i{} cp --remove-destination {} \
- $(RECONF_DIR)/after/{}; \
- done
-
- cd $(RECONF_DIR)/after && autoreconf -v --install && \
- for F in $(RECONF_PRUNEFILES); do \
- find . -name $$F -print | \
- xargs --no-run-if-empty rm -r; \
- done
-
- cd $(RECONF_DIR) && diff -Nru before after > autoreconf.diff || true
-
- quilt import $(RECONF_DIR)/autoreconf.diff \
- >>$(STAMP_DIR)/log/autoreconf 2>&1
-
- mv $(STAMP_DIR)/check.md5sum debian/patches/patched.md5sum
-
- rm -r $(RECONF_DIR) && rm -f patches/autoreconf-old.diff
-
- @echo
- @echo "****************************************************************"
- @echo " This target is made to fail INTENTIONALLY. It should NEVER "
- @echo " be invoked during automatic builds. "
- @echo
- @echo " This target was invoked because you added/removed/changed "
- @echo " patches which modify either configure.ac or Makefile.am and, "
- @echo " thus, require autoreconf run. And all autoreconfing should "
- @echo " happen before uploading. "
- @echo
- @echo " (See also debian/xsfbs/xsfbs-autoreconf.mk) "
- @echo
- @echo " If you see this message, autoreconfing actually SUCCEEDED, "
- @echo " and your build should finish successfully, when rerun. "
- @echo "****************************************************************"
- @echo
- exit 1;
-
-.PHONY: autoreconf
-autoreconf: debian/patches/patched.md5sum patch $(STAMP_DIR)/check.md5sum
- if ! diff $(STAMP_DIR)/check.md5sum \
- debian/patches/patched.md5sum > /dev/null; then \
- $(MAKE) -f debian/rules doautoreconf; \
- fi
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 51fa145..6582a42 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -307,6 +307,4 @@ else
echo "xinpdriver:Provides=$(INPDRIVER_PROVIDES)" >> debian/$(PACKAGE).substvars
endif
-include debian/xsfbs/xsfbs-autoreconf.mk
-
# vim:set noet ai sts=8 sw=8 tw=0:
commit 5b399b43ac46d889bdeb0589cc71a501018f5f55
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 19:04:44 2008 +0100
Build against xserver 1.5 rc1 and minor debian/control updates
* Build against xserver 1.5 rc1.
* Bump Standards-Version to 3.7.3.
* Drop the XS- prefix from Vcs-* control fields.
diff --git a/debian/changelog b/debian/changelog
index 2d4a584..6a929d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
xserver-xorg-input-elographics (1:1.2.0-1) UNRELEASED; urgency=low
* New upstream release.
+ * Build against xserver 1.5 rc1.
+ * Bump Standards-Version to 3.7.3.
+ * Drop the XS- prefix from Vcs-* control fields.
-- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 19:02:11 +0100
diff --git a/debian/control b/debian/control
index df4324f..120d07d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,10 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
-Standards-Version: 3.7.2
-XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics
-XS-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.4.99.901), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
+Standards-Version: 3.7.3
+Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-elographics
+Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-elographics.git
Package: xserver-xorg-input-elographics
Architecture: any
commit 1f8d9cfc3bd28c5944b1af78a0b1acc7fddb2fe5
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 21 19:02:24 2008 +0100
Update changelogs
diff --git a/ChangeLog b/ChangeLog
index 3c6aa1d..b801b5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,45 +1,342 @@
-2006-04-06 Adam Jackson <ajax@freedesktop.org>
+commit d639f87a52aac179ef9d0908c012e79baf5fa245
+Author: Adam Jackson <ajax@redhat.com>
+Date: Thu Mar 20 15:30:00 2008 -0400
- * configure.ac:
- * src/xf86Elo.c:
- Unlibcwrap. Bump server version requirement. Bump to 1.1.0.
+ elographics 1.2.0
-2005-12-20 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 6726525b14d1ad222e16e30deffc37404dc196b4
+Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
+Date: Sat Mar 8 22:55:12 2008 +0100
- * configure.ac:
- Update package version for X11R7 release.
+ Makefile.am: nuke RCS Id
-2005-12-14 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 72408c2404246b9cb4698bd45be439be8ced3c23
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Feb 28 09:30:24 2008 +1030
- * configure.ac:
- Update package version number for final X11R7 release candidate.
+ Wrap the content of ReadInput into a loop. Bug #14109
+
+ There may be more than one packet waiting for us at a time, so loop until we
+ don't get one anymore.
+
+ This patch is untested for lack of a device, but should fix
+ X.Org Bug 14109 <http:/bugs.freedesktop.org/show_bug.cgi?id=14109>
-2005-12-06 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit ed8626d307bb49ced738ac4a5b1d469cef030596
+Author: Benjamin Close <Benjamin.Close@clearchain.com>
+Date: Wed Jan 9 09:58:11 2008 +1030
- * man/Makefile.am:
- Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+ Remove reliance on xf86_ansic.h
+
+ xf86_ansic.h is no longer part of the xorg hence this causes
+ compilations failures on some architectures
+
+ Found by: Tinderbox
-2005-12-03 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 79a2199b8c753aeca6cc9cbbf69e568558a61853
+Author: Jaroslaw Siebert <y0g1@poczta.wp.pl>
+Date: Fri Dec 28 16:16:01 2007 +1030
- * configure.ac:
- Update package version number for X11R7 RC3 release.
+ Bug #13248: use -1, -1 as min/max value for valuators.
+
+ If we specify a min/max value for our valuators, the X server will clip any
+ coordinates at these values.
+
+ This fixes the second issue reported in #13248
+
+ X.Org Bugzilla #13248 <https://bugs.freedesktop.org/show_bug.cgi?id=13248>
-2005-12-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 0e04b7142a04fa5e4af57a8056c6010ba49c1359
+Author: Jaroslaw Siebert <y0g1@poczta.wp.pl>
+Date: Fri Dec 28 16:13:09 2007 +1030
- * configure.ac:
- Remove extraneous AC_MSG_RESULT.
+ Bug #13248: pass the correct coordinates to the DDX.
+
+ cur_x and cur_y are the packets we get from the deviec, but after scaling the
+ actual coordinates we need to only deal with x and y.
+
+ This fixes one issue reported Bug #13248.
+
+ X.Org Bugzilla #13248 <https://bugs.freedesktop.org/attachment.cgi?id=13248>
-2005-11-29 Adam Jackson <ajax@freedesktop.org>
+commit e4071358e3047127fe0476cab3e9fb63e180e940
+Author: Daniel Drake <d.drake@mmm.com>
+Date: Fri Dec 28 16:04:11 2007 +1030
- * configure.ac:
- Only build dlloader modules by default.
+ Bug #9803: Don't allow zero-sized width/height.
+
+ A bad configuration can result in height or width being zero. This potentially
+ causes a divide-by-zero error in xf86EloConvert().
+ Detect the bad configuration early on and produce a meaningful error message.
+
+ X.Org Bugzilla #9803 <https://bugs.freedesktop.org/show_bug.cgi?id=9803>
-2005-11-09 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 768c17328041e2f3e59d25251772cb3be164ba71
+Author: Daniel Drake <ddrake@brontes3d.com>
+Date: Tue May 29 11:58:00 2007 -0800
- * configure.ac:
- Update package version number for X11R7 RC2 release.
+ Bug #11087: xf86-input-elographics COPYING file
+
+ X.Org Bugzilla #11087 <https://bugs.freedesktop.org/show_bug.cgi?id=11087>
-2005-11-01 Kevin E. Martin <kem-at-freedesktop-dot-org>
+commit 24aa22caacb99d6bb0b1187e3ad618ce3fba70c2
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Sep 3 05:52:07 2007 -0400
- * configure.ac:
- Update pkgcheck dependencies to work with separate build roots.
+ Add *~ to .gitignore to skip patch/emacs droppings
+
+commit 6c08d0ebdedfabccf8aa5883757baefe68d66881
+Author: James Cloos <cloos@jhcloos.com>
+Date: Thu Aug 23 19:25:25 2007 -0400
+
+ Rename .cvsignore to .gitignore
+
+commit 9770760ddcbe14b0631ad1a6e25626c5560e4b81
+Author: Brice Goglin <bgoglin@debian.org>
+Date: Mon Aug 6 23:12:51 2007 +0200
+
+ Use PACKAGE_VERSION_MAJOR/MINOR/PATCHLEVEL in version_rec
+
+commit b81e0064d99dd22d2bea8eaf65a9331da9166ab0
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Dec 21 02:29:56 2005 +0000
+
+ Update package version for X11R7 release.
+
+commit 8317c2502e8cafb82b61754bbfe9e3c101a7699f
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Dec 19 16:25:50 2005 +0000
+
+ Stub COPYING files
+
+commit 2d672e739310333da2bc480acc7afe6b09400d0b
+Author: Kevin E Martin <kem@kem.org>
+Date: Thu Dec 15 00:24:14 2005 +0000
+
+ Update package version number for final X11R7 release candidate.
+
+commit 1870d409267f67b8e1a7497deea8721a26ce9cb9
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Dec 6 22:48:29 2005 +0000
+
+ Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
+
+commit ffe759062efc75f69bc254ddbd595322f88fd1ad
+Author: Kevin E Martin <kem@kem.org>
+Date: Sat Dec 3 05:49:30 2005 +0000
+
+ Update package version number for X11R7 RC3 release.
+
+commit 15ec88033a6020f442746ff178bf87406fc2555d
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Dec 2 02:16:05 2005 +0000
+
+ Remove extraneous AC_MSG_RESULT.
+
+commit d882f2f5febc0bae5cd8fe5bbfeb37f756fa4eb7
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Nov 29 23:29:55 2005 +0000
+
+ Only build dlloader modules by default.
+
+commit 4f8ade63683986e30ffd9281b0e58bc990b4d05c
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Nov 28 22:04:06 2005 +0000
+
+ Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
+ update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
+
+commit 46f8d88b896cb0415dd85640ae454640e82c2742
+Author: Eric Anholt <anholt@freebsd.org>
+Date: Mon Nov 21 10:49:03 2005 +0000
+
+ Add .cvsignores for drivers.
+
+commit 970d941ec49ff81012a77f4f33ddc21f318626e5
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Nov 9 21:15:11 2005 +0000
+
+ Update package version number for X11R7 RC2 release.
+
+commit b471db40377061af89f87634e31ced3d5ba8c98e
+Author: Kevin E Martin <kem@kem.org>
+Date: Tue Nov 1 15:08:49 2005 +0000
+
+ Update pkgcheck depedencies to work with separate build roots.
+
+commit d371e549a4989280187a7394c64abe20c403b0db
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Oct 19 02:48:00 2005 +0000
+
+ Update package version number for RC1 release.
+
+commit b4809879c5b3697321cd5816ef2d0e0355c1064d
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Tue Oct 18 00:01:51 2005 +0000
+
+ Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
+ substitutions to work better with BSD make
+
+commit 1845452d66d56b059504c746062b5713fa4dc16c
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Oct 17 22:57:27 2005 +0000
+
+ More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
+ of indirectly
+
+commit aafac4990d3b5a84a4417fd3695ab9491cd061ff
+Author: Alan Coopersmith <Alan.Coopersmith@sun.com>
+Date: Mon Oct 17 00:08:55 2005 +0000
+
+ Use sed & cpp to substitute variables in driver man pages
+
+commit 3d1ff1b859ab45975dcbeb22b4f313e5aed21849
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Aug 26 07:02:21 2005 +0000
+
+ Update elographics manpage to list supported options. (Debian #075)
+
+commit 6d7d6af9ac22ba89bdd48cbe3901fb47eab89b6e
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Thu Aug 18 09:03:38 2005 +0000
+
+ Update autogen.sh to one that does objdir != srcdir.
+
+commit 5410d26cb4a8df005a1ee9cb7f4ec05d5371b0e0
+Author: Søren Sandmann Pedersen <sandmann@daimi.au.dk>
+Date: Wed Aug 10 14:07:22 2005 +0000
+
+ Don\'t lose existing CFLAGS in all the input drivers and some of the video
+ drivers
+
+commit f61c90d5044b256497ea55fe032e3e67866cd27f
+Author: Kevin E Martin <kem@kem.org>
+Date: Fri Jul 29 21:22:40 2005 +0000
+
+ Various changes preparing packages for RC0:
+ - Verify and update package version numbers as needed
+ - Implement versioning scheme
+ - Change bug address to point to bugzilla bug entry form
+ - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
+ reenable it)
+ - Fix makedepend to use pkgconfig and pass distcheck
+ - Update build script to build macros first
+ - Update modular Xorg version
+
+commit c81438a87f7848219d1a5755f02a784dfda92601
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 20:03:21 2005 +0000
+
+ Make the module dir configurable
+
+commit 9bf5e9b174d7c1e9c0633f0e170e5c15ba39c80f
+Author: Kevin E Martin <kem@kem.org>
+Date: Wed Jul 13 02:20:59 2005 +0000
+
+ Update all input drivers to pass distcheck
+
+commit 7a0b4563a7adcd55248385201cf3753c1b41015a
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Tue Jul 12 06:15:08 2005 +0000
+
+ Build skeletons for input drivers. Should basically work.
+
+commit f431f54c20f49bf7b97d4f2372c4e67539302fa8
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jul 11 02:37:59 2005 +0000
+
+ Prep input drivers for modularizing by adding guarded #include "config.h"
+
+commit cd258fd520d115a605affda749b4fd5f416c05e5
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Jul 3 08:53:45 2005 +0000
+
+ Change <X11/misc.h> and <X11/os.h> to "misc.h" and "os.h".
+
+commit 32567780acdea6626cb15ba5e38da1414c99ed68
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Jul 1 22:43:22 2005 +0000
+
+ Change all misc.h and os.h references to <X11/foo.h>.
+
+commit fe9ef3971d71d3a0433248bc410f8c2583971c77
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Mon Jun 27 18:32:54 2005 +0000
+
+ Various input drivers set their InputDriverRec to be static when doing a
+ loadable build, and the same symbol can't be both static and _X_EXPORT.
+ Pointed out by Alan Coopersmith.
+
+commit 281313f638e1f06a961c940b814b428e21f415de
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Sat Jun 25 21:17:01 2005 +0000
+
+ Bug #3626: _X_EXPORT tags for video and input drivers.
+
+commit 349fefb716abd06a7f83c516b941b791d86d6f13
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Apr 20 12:25:33 2005 +0000
+
+ Fix includes right throughout the Xserver tree:
+ change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
+ change "foo.h", "extensions/foo.h" and "X11/foo.h" to
+ <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
+ change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
+
+commit 01dc1c093d816ed484b91c0497666bd8a440e3b4
+Author: Adam Jackson <ajax@nwnk.net>
+Date: Wed Sep 22 04:59:31 2004 +0000
+
+ Bug #506: Fix pointer behaviour when using multiple Elographics
+ touchscreens, from Miroslav Halas.
+
+commit 9a0f97bdde8102e82b51ea77bc03175008d9df77
+Author: Matthieu Herrb <matthieu.herrb@laas.fr>
+Date: Mon Jul 26 22:52:31 2004 +0000
+
+ - Use xf86RemoveEnabledDevice() in the DEVICE_OFF case too. Fixes a lock-up
+ after server reset.
+ - Call InitPtrFeedbackClassDeviceStruct() during DEVICE_INIT phase, in
+ order to avoid a segfault in the X server caused by 'xset q'.
+
+commit 1935b4e30e802f262a83e8f54bbd79495c91105d
+Author: Egbert Eich <eich@suse.de>
+Date: Fri Apr 23 19:54:03 2004 +0000
+
+ Merging XORG-CURRENT into trunk
+
+commit 7802f66b7de5f23346db1375e6ed05798090b5c3
+Author: Egbert Eich <eich@suse.de>
+Date: Sun Mar 14 08:33:51 2004 +0000
+
+ Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
+
+commit d32fb56460dc7964a0b71bcad09109e9a35a3f51
+Author: Egbert Eich <eich@suse.de>
+Date: Wed Mar 3 12:12:33 2004 +0000
+
+ Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
+
+commit 79d5c25f6b29453b61783967180ce6fd94c67f84
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 13:36:00 2004 +0000
+
+ readding XFree86's cvs IDs
+
+commit 9a9dded704fc947f9a7d7a070e6a472739c6bb08
+Author: Egbert Eich <eich@suse.de>
+Date: Thu Feb 26 09:23:34 2004 +0000
+
+ Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
+
+commit 9ca79d831761a0c9e6e115c4885f3dd8a11786f4
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ XFree86 4.3.0.1
+
+commit 04636ebbd2f9ee1f360f8d731d00b2665e010e57
+Author: Kaleb Keithley <kaleb@freedesktop.org>
+Date: Fri Nov 14 16:48:56 2003 +0000
+
+ Initial revision
diff --git a/debian/changelog b/debian/changelog
index 6651fd1..2d4a584 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-elographics (1:1.2.0-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 21 Mar 2008 19:02:11 +0100
+
xserver-xorg-input-elographics (1:1.1.0-3) unstable; urgency=low
* Upload to unstable
commit 652aecf4e55845069182cfabc0e1b26273d39be8
Author: Julien Cristau <jcristau@debian.org>
Reply to: