x11proto-kb: Changes to 'upstream-unstable'
.gitignore | 78 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
Makefile.am | 11 ++++----
README | 30 ++++++++++++++++++++++
XKB.h | 2 -
configure.ac | 9 +++---
5 files changed, 113 insertions(+), 17 deletions(-)
New commits:
commit f1a9902167607b32ce34adac4a62a07ac43a4041
Author: Adam Jackson <ajax@redhat.com>
Date: Tue Aug 10 10:04:15 2010 -0400
kbproto 1.0.5
Signed-off-by: Adam Jackson <ajax@redhat.com>
diff --git a/configure.ac b/configure.ac
index 829baea..1a7ab4a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.60])
-AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([KBProto], [1.0.5], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit 2306fcd4c511d41ae4b31b9cbd9f79cf69287730
Author: Dirk Wallenstein <halsmit@t-online.de>
Date: Fri Feb 5 20:42:43 2010 +0100
Use the correct value for XkbAllAccessXEventsMask
Signed-off-by: Dirk Wallenstein <halsmit@t-online.de>
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/XKB.h b/XKB.h
index a915317..a3b3bc0 100644
--- a/XKB.h
+++ b/XKB.h
@@ -139,7 +139,7 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#define XkbAXN_BKAcceptMask (1L << 4)
#define XkbAXN_BKRejectMask (1L << 5)
#define XkbAXN_AXKWarningMask (1L << 6)
-#define XkbAllAccessXEventsMask (0xf)
+#define XkbAllAccessXEventsMask (0x7f)
/*
* Miscellaneous event details:
commit 875e6f80e9ddcac010f6871214a92e4d50e8ee5e
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:25:52 2010 -0400
config: update AC_PREREQ statement to 2.60
Unrelated to the previous patches, the new value simply reflects
the reality that the minimum level for autoconf to configure
all x.org modules is 2.60 dated June 2006.
ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 0685a0f..829baea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_PREREQ([2.57])
+AC_PREREQ([2.60])
AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
commit f6b32127be4c800f73bf68c6ac7d79c630cae1fa
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Mar 28 19:00:31 2010 -0400
config: remove the pkgconfig pc.in file from EXTRA_DIST
Automake always includes it in the tarball.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/Makefile.am b/Makefile.am
index e1aacca..bbe8a1e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,6 @@ kb_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = kbproto.pc
-EXTRA_DIST = kbproto.pc.in
MAINTAINERCLEANFILES = ChangeLog INSTALL
commit cb489d131adb1d454e9f6196d7d766c0acde12e6
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 22 19:24:48 2009 -0500
Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
Now that the INSTALL file is generated.
Allows running make maintainer-clean.
diff --git a/Makefile.am b/Makefile.am
index 59c5809..e1aacca 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,6 +11,8 @@ pkgconfig_DATA = kbproto.pc
EXTRA_DIST = kbproto.pc.in
+MAINTAINERCLEANFILES = ChangeLog INSTALL
+
.PHONY: ChangeLog INSTALL
INSTALL:
commit 9a83b903ba2586f16e770d4911c4d7e42957abb7
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Mon Nov 16 11:13:30 2009 -0500
README: file created or updated #24206
Contains a set of URLs to freedesktop.org.
diff --git a/README b/README
new file mode 100644
index 0000000..49fa4f9
--- /dev/null
+++ b/README
@@ -0,0 +1,30 @@
+ X Keyboard Extension
+
+This extension defines a protcol to provide a number of new capabilities
+and controls for text keyboards.
+
+Extension name: XKEYBOARD
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ http://lists.freedesktop.org/mailman/listinfo/xorg
+
+Please submit bug reports to the Xorg bugzilla:
+
+ https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+The master development code repository can be found at:
+
+ git://anongit.freedesktop.org/git/xorg/proto/kbproto
+
+ http://cgit.freedesktop.org/xorg/proto/kbproto
+
+For patch submission instructions, see:
+
+ http://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
+For more information on the git code manager, see:
+
+ http://wiki.x.org/wiki/GitPage
+
commit 0a358e01f7fcb903077137c4d3ab51ce9eeabcce
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 19:45:27 2009 -0500
Makefile.am: ChangeLog not required: EXTRA_DIST or *CLEANFILES #24432
ChangeLog filename is known to Automake and requires no further
coding in the makefile.
diff --git a/Makefile.am b/Makefile.am
index b7a8c06..59c5809 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,9 +11,6 @@ pkgconfig_DATA = kbproto.pc
EXTRA_DIST = kbproto.pc.in
-EXTRA_DIST += ChangeLog
-MAINTAINERCLEANFILES = ChangeLog
-
.PHONY: ChangeLog INSTALL
INSTALL:
commit c8078878abaa2d2489a3778c89af043901582eac
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 18:31:28 2009 -0500
Makefile.am: INSTALL file is missing or incorrect #24206
The standard GNU file on building/installing tarball is copied
using the XORG_INSTALL macro contained in XORG_DEFAULT_OPTIONS
Add INSTALL target
diff --git a/Makefile.am b/Makefile.am
index bbb5f36..b7a8c06 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,9 +14,12 @@ EXTRA_DIST = kbproto.pc.in
EXTRA_DIST += ChangeLog
MAINTAINERCLEANFILES = ChangeLog
-.PHONY: ChangeLog
+.PHONY: ChangeLog INSTALL
+
+INSTALL:
+ $(INSTALL_CMD)
ChangeLog:
$(CHANGELOG_CMD)
-dist-hook: ChangeLog
+dist-hook: ChangeLog INSTALL
commit ab57a912460acb83302152bd91c6336d500bb9cd
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 18:11:36 2009 -0500
configure.ac: deploy the new XORG_DEFAULT_OPTIONS #24242
This macro aggregate a number of existing macros that sets commmon
X.Org components configuration options. It shields the configuration file from
future changes.
diff --git a/configure.ac b/configure.ac
index b14fd2e..0685a0f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,9 +3,9 @@ AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
+# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
- [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
+ [m4_fatal([must install xorg-macros 1.3 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.3)
XORG_DEFAULT_OPTIONS
commit 4ddefc3a86050e06056d79b78ae0a1be119c4131
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sun Nov 15 13:55:25 2009 -0500
configure.ac: AM_MAINTAINER_MODE missing #24238
This turns off maintainer mode build rules in tarballs.
Works in conjunction with autogen.sh --enable-maintainer-mode
diff --git a/configure.ac b/configure.ac
index 9537951..b14fd2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,7 @@
AC_PREREQ([2.57])
AC_INIT([KBProto], [1.0.4], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
+AM_MAINTAINER_MODE
# Require xorg-macros 1.3 or later: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
commit eb3d96018f4c2e20c23b837aa42f71ebb36661b1
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Sat Nov 14 18:26:47 2009 -0500
.gitignore: use common defaults with custom section # 24239
Using common defaults will reduce errors and maintenance.
Only the very small or inexistent custom section need periodic maintenance
when the structure of the component changes. Do not edit defaults.
diff --git a/.gitignore b/.gitignore
index cae696e..29b82f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,14 +1,78 @@
-Makefile
-Makefile.in
+#
+# X.Org module default exclusion patterns
+# The next section if for module specific patterns
+#
+# Do not edit the following section
+# GNU Build System (Autotools)
aclocal.m4
-autom4te.cache
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
config.log
+config-ml.in
+config.py
config.status
+config.status.lineno
+config.sub
configure
+configure.scan
+depcomp
+.deps/
+INSTALL
install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
missing
-kbproto.pc
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+# Do not edit the following section
+# Edit Compile Debug Document Distribute
*~
-kbproto-*.tar.*
-ChangeLog
-tags
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+# Add & Override patterns for kbproto
+#
+# Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+#
Reply to: