x11proto-input: Changes to 'debian-unstable'
XI.h | 6 ++++++
XIproto.h | 2 +-
aclocal.m4 | 20 +++++++++++++++++++-
configure | 43 +++++++++++++++++++++++++++++++++----------
configure.ac | 2 +-
debian/changelog | 6 ++++++
6 files changed, 66 insertions(+), 13 deletions(-)
New commits:
commit ad2a2798892762d2c6939db3185fc38227ce6949
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Apr 30 20:08:34 2007 -0400
Actually bump changelog for 1.4.2. Prepare for upload
diff --git a/debian/changelog b/debian/changelog
index 000b455..6e3a599 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-input (1.4.2-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- David Nusinow <dnusinow@debian.org> Mon, 30 Apr 2007 20:07:45 -0400
+
x11proto-input (1.4.1-2) unstable; urgency=low
* Add XS-Vcs-* to debian/control.
commit c6f02d5bb7229aa53c58bb4d70ab33c1dc290218
Author: David Nusinow <dnusinow@debian.org>
Date: Mon Apr 30 20:07:03 2007 -0400
Autoreconf and bump changelog for 1.4.2
diff --git a/aclocal.m4 b/aclocal.m4
index c089ec3..46b46fc 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -40,7 +40,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,
@@ -53,6 +54,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/configure b/configure
index 71679b1..ae0f2e5 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 InputProto 1.4.1.
+# Generated by GNU Autoconf 2.61 for InputProto 1.4.2.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -574,8 +574,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='InputProto'
PACKAGE_TARNAME='inputproto'
-PACKAGE_VERSION='1.4.1'
-PACKAGE_STRING='InputProto 1.4.1'
+PACKAGE_VERSION='1.4.2'
+PACKAGE_STRING='InputProto 1.4.2'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_subst_vars='SHELL
@@ -1144,7 +1144,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 InputProto 1.4.1 to adapt to many kinds of systems.
+\`configure' configures InputProto 1.4.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1210,7 +1210,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of InputProto 1.4.1:";;
+ short | recursive ) echo "Configuration of InputProto 1.4.2:";;
esac
cat <<\_ACEOF
@@ -1281,7 +1281,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-InputProto configure 1.4.1
+InputProto configure 1.4.2
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1295,7 +1295,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 InputProto $as_me 1.4.1, which was
+It was created by InputProto $as_me 1.4.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1965,7 +1965,7 @@ fi
# Define the identity of the package.
PACKAGE='inputproto'
- VERSION='1.4.1'
+ VERSION='1.4.2'
cat >>confdefs.h <<_ACEOF
@@ -2128,6 +2128,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 inputproto.pc"
@@ -2557,7 +2580,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 InputProto $as_me 1.4.1, which was
+This file was extended by InputProto $as_me 1.4.2, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -2600,7 +2623,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-InputProto config.status 1.4.1
+InputProto config.status 1.4.2
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
commit 310a93f8e194aa070b0f1d40c8fd5ae941908dbe
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Thu Apr 26 11:06:18 2007 +0930
bump to 1.4.2
diff --git a/configure.ac b/configure.ac
index 057e1c5..72f9882 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([InputProto], [1.4.1], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([InputProto], [1.4.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
XORG_RELEASE_VERSION
commit c9bed7d4750c314002c16430a4dd75f95cc2f78d
Author: Peter Hutterer <peter@cs.unisa.edu.au>
Date: Tue Apr 24 22:53:27 2007 +0930
Add flags to be used for DevicePrensence's devchange field.
diff --git a/XI.h b/XI.h
index fbecd80..ae52292 100644
--- a/XI.h
+++ b/XI.h
@@ -250,6 +250,12 @@ SOFTWARE.
#define _devicePresence 0
+#define DeviceAdded 0
+#define DeviceRemoved 1
+#define DeviceEnabled 2
+#define DeviceDisabled 3
+#define DeviceUnrecoverable 4
+
#define XI_BadDevice 0
#define XI_BadEvent 1
#define XI_BadMode 2
diff --git a/XIproto.h b/XIproto.h
index 36b5a49..4f46f4f 100644
--- a/XIproto.h
+++ b/XIproto.h
@@ -1600,7 +1600,7 @@ typedef struct
BYTE pad00;
CARD16 sequenceNumber B16;
Time time B32;
- BYTE devchange;
+ BYTE devchange; /* Device{Added|Removed|Enabled|Disabled} */
BYTE deviceid;
CARD16 control B16;
CARD32 pad02 B32;
Reply to: