config.guess | 32 ++++++++++++++++++++++++--------
config.sub | 16 +++++++++++-----
debian/changelog | 11 +++++++++--
src/kbd.c | 2 +-
4 files changed, 45 insertions(+), 16 deletions(-)
New commits:
commit a5f054c3f4823b2bea4445f73fbe0f9bb2acd121
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Wed Jun 13 23:46:19 2007 +1000
Upload to unstable.
Also grab commit 36cf953910002a00a3694033d49c6c38319b0283, updating
the driver version.
diff --git a/debian/changelog b/debian/changelog
index 1d1e153..49a9f48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) unstable; urgency=low
[ Brice Goglin ]
* New upstream release.
@@ -17,8 +17,10 @@ xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) UNRELEASED;
urgency=low
[ Drew Parsons ]
* 1.2.1 not released upstream yet, so use 1.2.0 as the version and
put 1.2.1 into the Debian subversion.
+ * Include commit 36cf953910002a00a3694033d49c6c38319b0283, updating
+ the driver version.
- -- Drew Parsons <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:11:32 +1000
+ -- Drew Parsons <[EMAIL PROTECTED]> Wed, 13 Jun 2007 23:21:00 +1000
xserver-xorg-input-keyboard (1:1.1.1-1) experimental; urgency=low
commit 36cf953910002a00a3694033d49c6c38319b0283
Author: Julien Cristau <[EMAIL PROTECTED]>
Date: Wed Jun 13 23:02:58 2007 +1000
Keep module version up-to-date using PACKAGE_VERSION_*
diff --git a/src/kbd.c b/src/kbd.c
index 24fe6f6..c1daa4b 100644
--- a/src/kbd.c
+++ b/src/kbd.c
@@ -849,7 +849,7 @@ static XF86ModuleVersionInfo xf86KbdVersionRec =
MODINFOSTRING1,
MODINFOSTRING2,
XORG_VERSION_CURRENT,
- 1, 1, 0,
+ PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
commit c58f338e5f0592726d7355546f489eefe5d661d3
Author: Drew Parsons <[EMAIL PROTECTED]>
Date: Wed Jun 13 22:58:10 2007 +1000
autoreconf and use 1.2.0-1+1.2.1 as version
The upstream release is not consistent. The tarball uses 1.2.0 but
there is no 1.2.0 in git, which only has 1.2.1. Use Debian version
1.2.0-1+1.2.1 as a temporary compromise till the next upstream tarball
appears.
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 fab0aa3..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-09-20'
+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 \
@@ -324,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-* \
@@ -925,6 +925,9 @@ case $basic_machine in
basic_machine=sh-hitachi
os=-hms
;;
+ sh5el)
+ basic_machine=sh5le-unknown
+ ;;
sh64)
basic_machine=sh64-unknown
;;
@@ -1219,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*)
@@ -1414,6 +1417,9 @@ case $basic_machine in
m68*-cisco)
os=-aout
;;
+ mep-*)
+ os=-elf
+ ;;
mips*-cisco)
os=-elf
;;
diff --git a/debian/changelog b/debian/changelog
index a553e29..1d1e153 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-keyboard (1:1.2.0-1+1.2.1) UNRELEASED; urgency=low
+ [ Brice Goglin ]
* New upstream release.
* Add a NEWS entry about the old "keyboard" driver not being shipped
anymore and "kbd" replacing it.
@@ -13,7 +14,11 @@ xserver-xorg-input-keyboard (1:1.2.1-1) UNRELEASED;
urgency=low
* Add a link to www.X.org and a reference to the xf86-input-keyboard
module in the long description.
- -- Brice Goglin <[EMAIL PROTECTED]> Mon, 23 Apr 2007 23:06:10 +0200
+ [ Drew Parsons ]
+ * 1.2.1 not released upstream yet, so use 1.2.0 as the version and
+ put 1.2.1 into the Debian subversion.
+
+ -- Drew Parsons <[EMAIL PROTECTED]> Wed, 13 Jun 2007 22:11:32 +1000
xserver-xorg-input-keyboard (1:1.1.1-1) experimental; urgency=low
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
