libxi: Changes to 'debian-unstable'
.gitignore | 19
COPYING | 2
ChangeLog | 405 ++-
Makefile.am | 13
Makefile.in | 18
aclocal.m4 | 149 -
config.guess | 685 +++--
config.sub | 240 +
configure | 1299 ++--------
configure.ac | 4
debian/changelog | 28
debian/control | 3
debian/patches/00_upstream_000_XInput_find_display-XiGetExtensionVersion.diff | 66
debian/patches/00_upstream_001_XInput_find_display-XiCheckExtInit.diff | 418 ---
debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff | 45
debian/patches/10_manpage_section.diff | 492 ---
debian/patches/series | 4
debian/rules | 2
debian/xsfbs/xsfbs-autoreconf.mk | 150 +
debian/xsfbs/xsfbs.mk | 359 ++
debian/xsfbs/xsfbs.sh | 907 ++++++
ltmain.sh | 12
man/.gitignore | 3
man/Makefile.am | 4
man/Makefile.in | 18
man/XAllowDeviceEvents.man | 4
man/XChangeDeviceDontPropagateList.man | 2
man/XChangeKeyboardDevice.man | 2
man/XChangePointerDevice.man | 2
man/XDeviceBell.man | 6
man/XGetDeviceControl.man | 2
man/XGetDeviceKeyMapping.man | 6
man/XGetDeviceModifierMapping.man | 6
man/XGetDeviceMotionEvents.man | 2
man/XGetExtensionVersion.man | 2
man/XGetFeedbackControl.man | 2
man/XGrabDevice.man | 8
man/XGrabDeviceButton.man | 8
man/XGrabDeviceKey.man | 9
man/XListInputDevices.man | 2
man/XOpenDevice.man | 2
man/XQueryDeviceState.man | 2
man/XSelectExtensionEvent.man | 2
man/XSendExtensionEvent.man | 4
man/XSetDeviceButtonMapping.man | 8
man/XSetDeviceFocus.man | 2
man/XSetDeviceMode.man | 2
man/XSetDeviceValuators.man | 2
mkinstalldirs | 89
src/.gitignore | 10
src/Makefile.am | 2
src/Makefile.in | 2
src/XAllowDv.c | 2
src/XChgDCtl.c | 100
src/XChgFCtl.c | 2
src/XChgKMap.c | 2
src/XChgKbd.c | 2
src/XChgPnt.c | 2
src/XChgProp.c | 2
src/XCloseDev.c | 2
src/XDevBell.c | 2
src/XExtInt.c | 48
src/XGMotion.c | 9
src/XGetBMap.c | 2
src/XGetDCtl.c | 85
src/XGetFCtl.c | 14
src/XGetKMap.c | 2
src/XGetMMap.c | 11
src/XGetProp.c | 15
src/XGetVers.c | 8
src/XGrDvBut.c | 2
src/XGrDvKey.c | 2
src/XGrabDev.c | 2
src/XGtFocus.c | 2
src/XGtSelect.c | 2
src/XIint.h | 4
src/XListDev.c | 11
src/XOpenDev.c | 11
src/XQueryDv.c | 11
src/XSelect.c | 2
src/XSetBMap.c | 2
src/XSetDVal.c | 2
src/XSetMMap.c | 2
src/XSetMode.c | 2
src/XSndExEv.c | 2
src/XUngrDev.c | 2
src/XUngrDvB.c | 2
src/XUngrDvK.c | 2
src/config.h.in | 9
89 files changed, 3349 insertions(+), 2570 deletions(-)
New commits:
commit 90ed9742c45faa35e6f1897c75b4bc2e22596cf3
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Jul 6 03:54:57 2007 +0200
New upstream release.
diff --git a/ChangeLog b/ChangeLog
index a4aead8..94e3247 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+commit 9d0aa39742a0d1d4221ad4104708b0f8f60c14c7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jul 5 10:47:45 2007 +0930
+
+ Bump to version 1.1.1.
+
+commit ddc3b9cbbcc892a48dce2bd441e6d404cd44d943
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 13 15:36:01 2007 +0930
+
+ Bug 9657: Bad markup on XGrabDeviceKey.3x
+
+ <https://bugs.freedesktop.org/show_bug.cgi?id=9657>
+
commit c8696a5230c565f8999fea136a85a875b04e7b9a
Author: Daniel Stone <daniel@fooishbar.org>
Date: Wed Dec 6 18:56:56 2006 +0200
diff --git a/aclocal.m4 b/aclocal.m4
index 1c08a68..b7cad82 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6528,7 +6528,7 @@ path to pkg-config.
_PKG_TEXT
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
[$4])
else
$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
@@ -6585,7 +6585,7 @@ AC_DEFUN([XORG_MACROS_VERSION],[
XORG_MACROS_needed_major=`echo $XORG_MACROS_needed_version | sed 's/\..*$//'`
XORG_MACROS_needed_minor=`echo $XORG_MACROS_needed_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
AC_MSG_CHECKING([if xorg-macros used to generate configure is at least ${XORG_MACROS_needed_major}.${XORG_MACROS_needed_minor}])
- [XORG_MACROS_version=1.1.2
+ [XORG_MACROS_version=1.1.5
XORG_MACROS_major=`echo $XORG_MACROS_version | sed 's/\..*$//'`
XORG_MACROS_minor=`echo $XORG_MACROS_version | sed -e 's/^[0-9]*\.//' -e 's/\..*$//'`]
if test $XORG_MACROS_major -ne $XORG_MACROS_needed_major ; then
@@ -6989,7 +6989,8 @@ dnl
# --------------------
# Adds --with/without-release-string and changes the PACKAGE and
# PACKAGE_TARNAME to use "$PACKAGE{_TARNAME}-$RELEASE_VERSION". If
-# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged.
+# no option is given, PACKAGE and PACKAGE_TARNAME are unchanged. Also
+# defines PACKAGE_VERSION_{MAJOR,MINOR,PATCHLEVEL} for modules to use.
AC_DEFUN([XORG_RELEASE_VERSION],[
AC_ARG_WITH(release-version,
@@ -7002,6 +7003,23 @@ AC_DEFUN([XORG_RELEASE_VERSION],[
PACKAGE_TARNAME="$PACKAGE_TARNAME-$RELEASE_VERSION"
AC_MSG_NOTICE([Building with package name set to $PACKAGE])
fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MAJOR],
+ [`echo $PACKAGE_VERSION | cut -d . -f 1`],
+ [Major version of this package])
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_MINOR],
+ [$PVM],
+ [Minor version of this package])
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+ AC_DEFINE_UNQUOTED([PACKAGE_VERSION_PATCHLEVEL],
+ [$PVP],
+ [Patch version of this package])
])
# Copyright (C) 2002, 2003, 2005 Free Software Foundation, Inc.
diff --git a/config.guess b/config.guess
index 396482d..0f0fe71 100755
--- a/config.guess
+++ b/config.guess
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-03-06'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -161,6 +161,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
arm*) machine=arm-unknown ;;
sh3el) machine=shl-unknown ;;
sh3eb) machine=sh-unknown ;;
+ sh5el) machine=sh5le-unknown ;;
*) machine=${UNAME_MACHINE_ARCH}-unknown ;;
esac
# The Operating System including object format, if it has switched
@@ -780,7 +781,7 @@ EOF
i*:CYGWIN*:*)
echo ${UNAME_MACHINE}-pc-cygwin
exit ;;
- i*:MINGW*:*)
+ *:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
i*:windows32*:*)
@@ -790,12 +791,15 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[3456]*)
- echo i586-pc-interix${UNAME_RELEASE}
- exit ;;
- EM64T:Interix*:[3456]*)
- echo x86_64-unknown-interix${UNAME_RELEASE}
- exit ;;
+ *:Interix*:[3456]*)
+ case ${UNAME_MACHINE} in
+ x86)
+ echo i586-pc-interix${UNAME_RELEASE}
+ exit ;;
+ EM64T | authenticamd)
+ echo x86_64-unknown-interix${UNAME_RELEASE}
+ exit ;;
+ esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
exit ;;
@@ -950,6 +954,9 @@ EOF
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
+ xtensa:Linux:*:*)
+ echo xtensa-unknown-linux-gnu
+ exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
# first see if it will tell us. cd to the root directory to prevent
@@ -1208,6 +1215,15 @@ EOF
SX-6:SUPER-UX:*:*)
echo sx6-nec-superux${UNAME_RELEASE}
exit ;;
+ SX-7:SUPER-UX:*:*)
+ echo sx7-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8:SUPER-UX:*:*)
+ echo sx8-nec-superux${UNAME_RELEASE}
+ exit ;;
+ SX-8R:SUPER-UX:*:*)
+ echo sx8r-nec-superux${UNAME_RELEASE}
+ exit ;;
Power*:Rhapsody:*:*)
echo powerpc-apple-rhapsody${UNAME_RELEASE}
exit ;;
diff --git a/config.sub b/config.sub
index 387c18d..5defff6 100755
--- a/config.sub
+++ b/config.sub
@@ -4,7 +4,7 @@
# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
# Inc.
-timestamp='2006-07-02'
+timestamp='2007-01-18'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -245,12 +245,12 @@ case $basic_machine in
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
- | fr30 | frv \
+ | fido | fr30 | frv \
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
| m32c | m32r | m32rle | m68000 | m68k | m88k \
- | maxq | mb | microblaze | mcore \
+ | maxq | mb | microblaze | mcore | mep \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -276,6 +276,7 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
+ | score \
| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
@@ -284,7 +285,7 @@ case $basic_machine in
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
@@ -323,7 +324,7 @@ case $basic_machine in
| clipper-* | craynv-* | cydra-* \
| d10v-* | d30v-* | dlx-* \
| elxsi-* \
- | f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
+ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
| h8300-* | h8500-* \
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
@@ -367,7 +368,7 @@ case $basic_machine in
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
@@ -909,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -920,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1214,7 +1222,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos* | -toppers*)
+ | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1366,6 +1374,9 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
spu-*)
os=-elf
;;
@@ -1406,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/configure b/configure
index 282ab25..ac945c4 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 libXi 1.1.0.
+# Generated by GNU Autoconf 2.61 for libXi 1.1.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='libXi'
PACKAGE_TARNAME='libXi'
-PACKAGE_VERSION='1.1.0'
-PACKAGE_STRING='libXi 1.1.0'
+PACKAGE_VERSION='1.1.1'
+PACKAGE_STRING='libXi 1.1.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
# Factoring default headers for most tests.
@@ -1412,7 +1412,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 libXi 1.1.0 to adapt to many kinds of systems.
+\`configure' configures libXi 1.1.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1482,7 +1482,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libXi 1.1.0:";;
+ short | recursive ) echo "Configuration of libXi 1.1.1:";;
esac
cat <<\_ACEOF
@@ -1593,7 +1593,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libXi configure 1.1.0
+libXi configure 1.1.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1607,7 +1607,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 libXi $as_me 1.1.0, which was
+It was created by libXi $as_me 1.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2277,7 +2277,7 @@ fi
# Define the identity of the package.
PACKAGE='libXi'
- VERSION='1.1.0'
+ VERSION='1.1.1'
cat >>confdefs.h <<_ACEOF
@@ -19370,7 +19370,7 @@ Alternatively, you may set the environment variables XI_CFLAGS
and XI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&5
echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
is in your PATH or set the PKG_CONFIG environment variable to the full
@@ -19380,7 +19380,7 @@ Alternatively, you may set the environment variables XI_CFLAGS
and XI_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
@@ -19564,6 +19564,29 @@ fi
echo "$as_me: Building with package name set to $PACKAGE" >&6;}
fi
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MAJOR `echo $PACKAGE_VERSION | cut -d . -f 1`
+_ACEOF
+
+ PVM=`echo $PACKAGE_VERSION | cut -d . -f 2`
+ if test "x$PVM" = "x"; then
+ PVM="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_MINOR $PVM
+_ACEOF
+
+ PVP=`echo $PACKAGE_VERSION | cut -d . -f 3`
+ if test "x$PVP" = "x"; then
+ PVP="0"
+ fi
+
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE_VERSION_PATCHLEVEL $PVP
+_ACEOF
+
+
ac_config_files="$ac_config_files Makefile src/Makefile man/Makefile xi.pc"
@@ -19991,7 +20014,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 libXi $as_me 1.1.0, which was
+This file was extended by libXi $as_me 1.1.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -20044,7 +20067,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-libXi config.status 1.1.0
+libXi config.status 1.1.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/debian/changelog b/debian/changelog
index 8cfa5b4..4c8b045 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxi (2:1.1.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 06 Jul 2007 03:52:46 +0200
+
libxi (2:1.1.0-2) experimental; urgency=low
* Pull fixes from upstream git.
diff --git a/src/config.h.in b/src/config.h.in
index 6b4c3e4..d9e9ca4 100644
--- a/src/config.h.in
+++ b/src/config.h.in
@@ -48,6 +48,15 @@
/* Define to the version of this package. */
#undef PACKAGE_VERSION
+/* Major version of this package */
+#undef PACKAGE_VERSION_MAJOR
+
+/* Minor version of this package */
+#undef PACKAGE_VERSION_MINOR
+
+/* Patch version of this package */
+#undef PACKAGE_VERSION_PATCHLEVEL
+
/* Define to 1 if you have the ANSI C header files. */
#undef STDC_HEADERS
commit 9d0aa39742a0d1d4221ad4104708b0f8f60c14c7
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Jul 5 10:47:45 2007 +0930
Bump to version 1.1.1.
diff --git a/configure.ac b/configure.ac
index d443194..1044ec2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,7 +4,7 @@ dnl Process this file with autoconf to create configure.
AC_PREREQ([2.57])
-AC_INIT(libXi, 1.1.0, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
+AC_INIT(libXi, 1.1.1, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], libXi)
AM_INIT_AUTOMAKE([dist-bzip2])
AM_MAINTAINER_MODE
commit ddc3b9cbbcc892a48dce2bd441e6d404cd44d943
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Wed Jun 13 15:36:01 2007 +0930
Bug 9657: Bad markup on XGrabDeviceKey.3x
<https://bugs.freedesktop.org/show_bug.cgi?id=9657>
diff --git a/man/XGrabDeviceKey.man b/man/XGrabDeviceKey.man
index 1284f37..0475c29 100644
--- a/man/XGrabDeviceKey.man
+++ b/man/XGrabDeviceKey.man
@@ -17,7 +17,6 @@
.SH NAME
XGrabDeviceKey, XUngrabDeviceKey \- grab/ungrab extension input device Keys
.SH SYNTAX
-.SP
.HP
int XGrabDeviceKey\^(\^Display *\fIdisplay\fP\^, XDevice *\fIdevice\fP\^,
unsigned int \fIKey\fP\^, unsigned int \fImodifiers\fP\^, XDevice
commit 8c2aed06c066ed6500714fad8252babc9b5d12c3
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 5 17:26:19 2007 +0100
* Bump epoch to 2 so ubuntu can sync this package.
diff --git a/debian/changelog b/debian/changelog
index dbb3915..8cfa5b4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,11 @@
-libxi (1:1.1.0-2) experimental; urgency=low
+libxi (2:1.1.0-2) experimental; urgency=low
* Pull fixes from upstream git.
+ remove patch 00_upstream_002_XiCheckExtInit_unlockdisplay.diff applied
upstream.
+ * Bump epoch to 2 so ubuntu can sync this package.
- -- Julien Cristau <jcristau@debian.org> Mon, 5 Mar 2007 16:59:33 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 5 Mar 2007 17:24:20 +0100
libxi (1:1.1.0-1) experimental; urgency=low
commit 1609b6fa7008472348ab257ed0952f9caec2c781
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 5 17:01:36 2007 +0100
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 70bef32..dbb3915 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-libxi (1:1.1.0-2) UNRELEASED; urgency=low
+libxi (1:1.1.0-2) experimental; urgency=low
* Pull fixes from upstream git.
+ remove patch 00_upstream_002_XiCheckExtInit_unlockdisplay.diff applied
upstream.
- -- Julien Cristau <jcristau@debian.org> Fri, 9 Feb 2007 16:45:03 +0100
+ -- Julien Cristau <jcristau@debian.org> Mon, 5 Mar 2007 16:59:33 +0100
libxi (1:1.1.0-1) experimental; urgency=low
commit 9c69ba323c369ab8c8e56d54045e2c7196832978
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Mar 5 16:55:43 2007 +0100
Update upstream changelog.
diff --git a/ChangeLog b/ChangeLog
index 32a92df..a4aead8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,25 @@
+commit c8696a5230c565f8999fea136a85a875b04e7b9a
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Dec 6 18:56:56 2006 +0200
+
+ Makefile.am: make ChangeLog hook safer
+
+ Make ChangeLog hook as safe as possible.
+
+commit 60dccd9a7be95e35b4b8c90934888efedfde84cc
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Nov 19 01:04:26 2006 -0800
+
+ Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
+
+commit 41710257257939b181a1615937610550b40621b9
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Wed Nov 8 16:19:58 2006 +0200
+
+ DevicePresenceNotify: remove verbosity, fill out all fields
+ Don't throw a printf every time we get a DPN, and fill in all the fields
+ when copying the structure.
+
commit eeebae55766bd4c0121479a7b7188d6a0545f66c
Author: Daniel Stone <daniel@fooishbar.org>
Date: Sat Oct 21 12:08:21 2006 +0300
commit 9578c2898933aa4d8462a81cea7c4967d9dfdc49
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 9 16:51:21 2007 +0100
autoreconf
diff --git a/Makefile.in b/Makefile.in
index eecad18..b1de719 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -660,7 +660,7 @@ uninstall-info: uninstall-info-recursive
.PHONY: ChangeLog
ChangeLog:
- GIT_DIR=${srcdir}/.git git-log > ChangeLog
+ (GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
dist-hook: ChangeLog
# Tell versions [3.59,3.63) of GNU make to not export all variables.
commit 7a65f974ab066b8177eac93950c3829e8006962c
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 9 16:46:06 2007 +0100
Delete patch applied upstream.
diff --git a/debian/changelog b/debian/changelog
index cb14d72..70bef32 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libxi (1:1.1.0-2) UNRELEASED; urgency=low
+
+ * Pull fixes from upstream git.
+ + remove patch 00_upstream_002_XiCheckExtInit_unlockdisplay.diff applied
+ upstream.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 9 Feb 2007 16:45:03 +0100
+
libxi (1:1.1.0-1) experimental; urgency=low
* Adjust Section values to what the override says.
diff --git a/debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff b/debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff
deleted file mode 100644
index 515ccb8..0000000
--- a/debian/patches/00_upstream_002_XiCheckExtInit_unlockdisplay.diff
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Jamey Sharp <jamey@minilop.net>
-Date: Sun, 19 Nov 2006 09:04:26 +0000 (-0800)
-Subject: Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
-X-Git-Url: http://gitweb.freedesktop.org/?p=xorg/lib/libXi.git;a=commitdiff;h=60dccd9a7be95e35b4b8c90934888efedfde84cc
-
-Bug #8663: _XiCheckExtInit must drop the Display lock in all error cases.
----
-
---- a/src/XExtInt.c
-+++ b/src/XExtInt.c
-@@ -80,9 +80,6 @@ typedef struct _XInputData
- XExtensionVersion *vers;
- } XInputData;
-
--#define XInputCheckExtension(dpy,i,val) \
-- XextCheckExtension (dpy, i, xinput_extension_name, val)
--
- static /* const */ XExtensionHooks xinput_extension_hooks = {
- NULL, /* create_gc */
- NULL, /* copy_gc */
-@@ -183,6 +180,12 @@ _xidevicebusy(dpy, error)
- *error = info->codes->first_error + XI_DeviceBusy;
- }
-
-+static int XInputCheckExtension(Display *dpy, XExtDisplayInfo *info)
-+{
-+ XextCheckExtension (dpy, info, xinput_extension_name, 0);
-+ return 1;
-+}
-+
- /***********************************************************************
- *
- * Check to see if the input extension is installed in the server.
-@@ -198,7 +201,10 @@ _XiCheckExtInit(dpy, version_index, info
- {
- XExtensionVersion *ext;
-
-- XInputCheckExtension(dpy, info, -1);
-+ if (!XInputCheckExtension(dpy, info)) {
-+ UnlockDisplay(dpy);
-+ return (-1);
-+ }
-
- if (info->data == NULL) {
- info->data = (XPointer) Xmalloc(sizeof(XInputData));
diff --git a/debian/patches/series b/debian/patches/series
index 552bdfc..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-00_upstream_002_XiCheckExtInit_unlockdisplay.diff
commit c7d7135db44cb78fbb7fd4d3b749c048314a0758
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Feb 9 12:37:49 2007 +0100
Prepare changelog for upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 55d8d3e..cb14d72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libxi (1:1.1.0-1) UNRELEASED; urgency=low
+libxi (1:1.1.0-1) experimental; urgency=low
* Adjust Section values to what the override says.
* Update location of upstream repository from CVS to git in the long
@@ -9,7 +9,7 @@ libxi (1:1.1.0-1) UNRELEASED; urgency=low
* Install the upstream changelog.
* Add XS-Vcs-Git header in debian/control.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 3 Feb 2007 21:20:49 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 9 Feb 2007 12:34:51 +0100
libxi (1:1.0.1-4) unstable; urgency=low
commit b422e54151c24cecc0a6611607e479988a8eee0a
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Feb 3 21:23:19 2007 +0100
libxi-dev doesn't actually need a newer version of the protocol headers.
Revert libxi-dev dependency on x11proto-input-dev to an unversioned
dependency, since the headers and pkg-config file didn't change.
diff --git a/debian/changelog b/debian/changelog
index 6cf9186..55d8d3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,11 +5,11 @@ libxi (1:1.1.0-1) UNRELEASED; urgency=low
descriptions.
* New upstream release.
+ Drop patches applied upstream
- + Bump (build-)dependency on x11proto-input-dev to >= 1.4.
+ + Bump build-dependency on x11proto-input-dev to >= 1.4.
* Install the upstream changelog.
* Add XS-Vcs-Git header in debian/control.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 31 Jan 2007 09:21:46 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Sat, 3 Feb 2007 21:20:49 +0100
libxi (1:1.0.1-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d34e22e..17942f7 100644
--- a/debian/control
+++ b/debian/control
@@ -52,7 +52,7 @@ Description: X11 Input extension library (debug package)
Package: libxi-dev
Section: libdevel
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${Source-Version}), libx11-dev, libxext-dev, x11proto-input-dev (>= 1.4)
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxi6 (= ${Source-Version}), libx11-dev, libxext-dev, x11proto-input-dev
Pre-Depends: x11-common (>= 1:7.0.0)
Description: X11 Input extension library (development headers)
libXi provides an X Window System client interface to the XINPUT
commit 40027990f055c2a2677059f56e258c55991ed47e
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 31 09:22:09 2007 +0100
* Add XS-Vcs-Git header in debian/control.
diff --git a/debian/changelog b/debian/changelog
index 6bbdd04..6cf9186 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ libxi (1:1.1.0-1) UNRELEASED; urgency=low
+ Drop patches applied upstream
+ Bump (build-)dependency on x11proto-input-dev to >= 1.4.
* Install the upstream changelog.
+ * Add XS-Vcs-Git header in debian/control.
- -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 31 Jan 2007 09:19:16 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Wed, 31 Jan 2007 09:21:46 +0100
libxi (1:1.0.1-4) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 90c66bb..d34e22e 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>, Jamey Sharp <sharpone@debian.org>, Josh Triplett <josh@freedesktop.org>
Build-Depends: debhelper (>= 5.0.0), libx11-dev (>= 1:0.99.2-1), libxext-dev (>= 1:0.99.1-1), x11proto-input-dev (>= 1.4), pkg-config, quilt, xutils-dev
Standards-Version: 3.7.2
+XS-Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxi
Package: libxi6
Section: libs
commit 7b8056d00ef4b70ac24ad15687a875ceeb953371
Author: Julien Cristau <jcristau@debian.org>
Date: Wed Jan 31 09:20:05 2007 +0100
Add and install the upstream changelog.
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..32a92df
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,342 @@
+commit eeebae55766bd4c0121479a7b7188d6a0545f66c
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sat Oct 21 12:08:21 2006 +0300
+
+ re-enable iscore in DEVICE_CORE, re-enable DEVICE_ENABLE
+
+commit 50c88082ba2ee4785f4beaa351f2b772f1a381ad
+Author: Zephaniah E. Hull <warp@agamemnon.b5>
+Date: Sat Oct 21 04:01:46 2006 -0400
+
+ Comment out DEVICE_ENABLE, and use of iscore in the DEVICE_CORE control.
+ (We now compile again.)
+
+ Track the DEVICE_TOUCHSCREEN -> DEVICE_ABS_CALIB and new DEVICE_ABS_AREA
+ changes to the input protocol.
+
+commit 2a3f042241bb63601f5745f397bb1b66ecc5a592
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Fri Oct 20 00:39:50 2006 +0300
+
+ add DEVICE_ENABLE control, add iscore to DEVICE_CORE
+
+ Add DEVICE_ENABLE for enabling/disabling devices, and an 'iscore'
+ flag to DEVICE_CORE that specifies whether or not the device is a
+ virtual core device.
+
+commit c27e00ceceed3fea011c98c0e70ab568bf0687c6
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Oct 15 00:26:21 2006 -0700
+
+ Don't call XInput_find_display in _XiCheckExtInit, while the Display lock is held.
+
+ All callers of _XiCheckExtInit have already called XInput_find_display
+ first outside the lock, so just pass their copy of the XExtDisplayInfo
+ structure down. Besides being more correct, this should be slightly
+ faster. :-)
+
+ Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for identifying
+ the bug and proposing a workaround.
+
+commit 5dda1e1509d40ef64ebc816ce538cef462a4fa51
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sun Oct 15 00:03:57 2006 -0700
+
+ Don't call XInput_find_display in _XiGetExtensionVersion, while the Display lock is held.
+
+ _XiGetExtensionVersion has two callers. One had already called
+ XInput_find_display, and the other could easily do so outside the
+ Display lock. So I change the _XiGetExtensionVersion interface to
+ accept a previously-computed XExtDisplayInfo from the caller.
+ Besides being more correct, this should be slightly faster. :-)
+
+ Thanks to Magnus Kessler <Magnus.Kessler@gmx.net> for identifying
+ the bug and proposing a workaround.
+
+commit 8e317d390d1ef8f2c072957355b5d71db3b89c43
+Author: Jamey Sharp <jamey@minilop.net>
+Date: Sat Oct 14 23:56:20 2006 -0700
+
+ Add *.o to .gitignore.
+
+commit 6e08a76fd8e356f98d2d6913f0c1b1401090768d
+Merge: ba84e84... 360ceac...
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Sep 24 20:02:24 2006 +0300
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/lib/libXi
+
+commit ba84e84575b4167b0c6298e86a860b0741e2d2a3
+Merge: 93d3c2c... 576c579...
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Sun Sep 24 19:58:56 2006 +0300
+
+ Merge branch 'input-hotplug'
+
+commit 360ceacb2a3cbad1652d1b02d79b24469db2980a
+Author: Drew Parsons <dparsons@debian.org>
+Date: Mon Aug 14 14:10:52 2006 -0700
+
+ Bug 7855/Patch 6530: incorrect manpage section suffix
+
+ Bug 7855 <https://bugs.freedesktop.org/show_bug.cgi?id=7855>
+ Patch 6530 <https://bugs.freedesktop.org/attachment.cgi?id=6530>
+ Based on patch by Fabio M. Di Nitto c/- Colin Watson, Debian Bug#377204.
+
+commit 576c5794cf4b786dfc183c9b6f0a387cad4a5460
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 18 11:46:02 2006 -0400
+
+ bump version to 1.1.0, require inputproto 1.4
+ Bump the version to 1.1.0, and make sure we build with inputproto 1.4,
+ for the DEVICE_{TOUCHSCREEN,CORE} controls, and DevicePresenceNotify.
+
+commit b22d8d0e1519d3f86474f4a79f3c4b27b46c662a
+Author: Daniel Stone <krh@redhat.com>
+Date: Tue Jul 18 11:45:07 2006 -0400
+
+ add DevicePresenceNotify event
+ Add a DevicePresenceNotify event, which notes that something about the
+ device list changed.
+
+commit 878d9e76764d27f5af861817b46b2caf2d89d7c4
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 18 11:43:24 2006 -0400
+
+ add sensible DEVICE_TOUCHSCREEN and DEVICE_CORE controls
+ Add a more sensible DEVICE_TOUCHSCREEN control, which allows you to
+ clip the x and y values.
+ Add a DEVICE_CORE control, which toggles the sending of core events
+ by extended devices.
+
+commit 93d3c2c45ccd9a806342746c4df33c684a284dd6
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 18 11:39:16 2006 -0400
+
+ remove ChangeLog, add dist hook
+ Remove ChangeLog from the tree, and add a git dist hook to generate
+ it automatically.
+
+commit 8f0d3c6d1f64fdc3b20d0beb831fa457214d5188
+Author: Daniel Stone <daniel@fooishbar.org>
+Date: Tue Jul 18 11:28:58 2006 -0400
+
+ fix indentation on function declarations
+ Another brief run with indent.
Reply to: