x11proto-core: Changes to 'debian-unstable'
.gitignore | 3 +
ChangeLog | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
Makefile.am | 4 +-
XF86keysym.h | 3 +
configure.ac | 7 +++
debian/changelog | 6 +++
keysymdef.h | 18 +++++++++
7 files changed, 139 insertions(+), 3 deletions(-)
New commits:
commit ecddcb8aee14f1d28d240461d8fd36661ff6fe15
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 13 11:06:39 2009 +0100
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index b08f58b..ffc5695 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-x11proto-core (7.0.15-1) UNRELEASED; urgency=low
+x11proto-core (7.0.15-1) unstable; urgency=low
* New upstream release.
- -- Julien Cristau <jcristau@debian.org> Fri, 13 Mar 2009 11:03:51 +0100
+ -- Julien Cristau <jcristau@debian.org> Fri, 13 Mar 2009 11:06:28 +0100
x11proto-core (7.0.14-2) unstable; urgency=low
commit 43292d389497c42d67bc82d28baf63457727010b
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Mar 13 11:06:24 2009 +0100
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 5b791fb..4c217aa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,104 @@
+commit 034319189648eaaa483f9546c62451edb7be0c28
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Mar 2 12:54:41 2009 -0500
+
+ Bump to 7.0.15.
+
+commit 391f302a7d71b9169ce4c18794251ea3ccc95904
+Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
+Date: Tue Jan 27 20:06:28 2009 -0200
+
+ Janitor: Correct make distcheck and dont distribute autogen.sh
+
+commit 1e33337d4dd151da4f0898a86608a1ee67588163
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 27 16:36:34 2008 +1030
+
+ Add XF86XK_Suspend and XF86XK_Hibernate keysym defs.
+
+ At the moment, we have the following keysyms defined to put a computer into a
+ sleep state:
+
+ XF86XK_Standby 0x1008FF10 /* System into standby mode */
+ XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */
+ XF86XK_Sleep 0x1008FF2F /* Put system to sleep */
+
+ Proposed change by Richard Hughes:
+ "The nomenclature I've been trying to make stick
+ (most projects now use this) for a few years now is:
+
+ standby: high sleep state, nobody uses this any more
+ hibernate: sleep to disk - slow, but can remove power
+ suspend: sleep to ram - fast, but can't remove power
+ hybrid sleep: sleep to both, slow, and can remove power, but quick to
+ resume if you don't - most users don't use this"
+
+ This patch adds XF86XK_Suspend and XF86XK_Hibernate. The behaviour of
+ XF86XK_Sleep can then be configured on a per-session basis.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
+
+commit 2563153ed69d3d6f052ba275ff79df3cbe54b76d
+Author: James Cloos <cloos@jhcloos.com>
+Date: Tue Nov 11 16:26:28 2008 -0500
+
+ [keysymdef.h] Add dead_currency symbol.
+
+ As requested for the Bépo keyboard layout (http://clavier-dvorak.org/wiki/).
+
+ Cf. bugs:
+
+ http://bugs.freedesktop.org/show_bug.cgi?id=17821
+ http://bugs.freedesktop.org/show_bug.cgi?id=17822
+
+commit 735d745e17a6180f569f24f9792513b44e100aef
+Author: James Cloos <cloos@jhcloos.com>
+Date: Mon Oct 13 03:11:33 2008 -0400
+
+ Add a dead_belowcomma keysym
+
+ Requested by the Bépo group.
+
+ The belowcomma is only used for:
+
+ U+0218 [Ș] LATIN CAPITAL LETTER S WITH COMMA BELOW
+ U+0219 [ș] LATIN SMALL LETTER S WITH COMMA BELOW
+ U+021A [Ț] LATIN CAPITAL LETTER T WITH COMMA BELOW
+ U+021B [ț] LATIN SMALL LETTER T WITH COMMA BELOW
+
+ (aka 0xAA, 0xBA, 0xDE and 0xFE from iso-8859-16).
+
+ Cf: http://bugs.freedesktop.org/show_bug.cgi?id=17822
+ http://bugs.freedesktop.org/show_bug.cgi?id=17821
+ http://clavier-dvorak.org/wiki/
+
+commit 935dd37be409bd616ef46a4d3b62c44327b3f710
+Author: Sayamindu Dasgupta <sayamindu@gmail.com>
+Date: Mon Oct 13 03:00:53 2008 -0400
+
+ Add dead vowels in keysymdef.h
+
+ At OLPC, we are using an XKB based Amharic keyboard layout, which requires the
+ use of dead vowels to generate the various consonant + vowel combinations (see
+ http://en.wikipedia.org/wiki/Ge%27ez_alphabet#Syllable_signs for a detailed
+ explanation).
+
+ [Patch modified to use available keysym codes. -JimC]
+
+ Cf: http://bugs.freedesktop.org/show_bug.cgi?id=17437
+
+ Signed-off-by: James Cloos <cloos@jhcloos.com>
+
+commit c43f804f44ba3d751f343c2e27d9b491a1ebb458
+Author: James Cloos <cloos@jhcloos.com>
+Date: Wed Sep 17 04:09:39 2008 -0400
+
+ Add dead keysyms for DOUBLE GRAVE and INVERTED BREVE accents
+
+ Several COMBINING characters are used in libX11's Compose tables
+ where dead keys should be used; these are the two most-used which
+ so far have not had equivalent dead keys.
+
commit 33a7de5cdacb59503b26c6523ffb33dba118faed
Author: Peter Hutterer <peter.hutterer@redhat.com>
Date: Thu Oct 23 22:41:01 2008 +1030
diff --git a/debian/changelog b/debian/changelog
index 4d90209..b08f58b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x11proto-core (7.0.15-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 13 Mar 2009 11:03:51 +0100
+
x11proto-core (7.0.14-2) unstable; urgency=low
* Run autoreconf on build. Add build-deps on automake and xutils-dev.
commit 034319189648eaaa483f9546c62451edb7be0c28
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Mar 2 12:54:41 2009 -0500
Bump to 7.0.15.
diff --git a/configure.ac b/configure.ac
index d958ffc..eff39c3 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ([2.57])
-AC_INIT([Xproto], [7.0.14], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
+AC_INIT([Xproto], [7.0.15], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
commit 391f302a7d71b9169ce4c18794251ea3ccc95904
Author: Paulo Cesar Pereira de Andrade <pcpa@mandriva.com.br>
Date: Tue Jan 27 20:06:28 2009 -0200
Janitor: Correct make distcheck and dont distribute autogen.sh
diff --git a/.gitignore b/.gitignore
index b6bb852..3bcd1e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ stamp-h1
stamp-h2
xproto.pc
*~
+xproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 533d281..96c6b26 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,14 +32,14 @@ nodist_xproto_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = xproto.pc
-EXTRA_DIST = autogen.sh xproto.pc.in ChangeLog
+EXTRA_DIST = xproto.pc.in ChangeLog
CLEANFILES=ChangeLog
.PHONY: ChangeLog
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)
+ $(CHANGELOG_CMD)
dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 5bcf3ef..d958ffc 100755
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,10 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2])
AC_CONFIG_HEADER([do-not-use-config.h])
AC_CONFIG_HEADER([Xfuncproto.h])
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
+
AC_CANONICAL_HOST
m4_ifdef([AS_HELP_STRING], , [m4_define([AS_HELP_STRING], m4_defn([AC_HELP_STRING]))])
@@ -197,6 +201,7 @@ if test "x$WIDEPROTO" = xno; then
fi
XORG_RELEASE_VERSION
+XORG_CHANGELOG
AC_OUTPUT([Makefile
Xpoll.h
commit 1e33337d4dd151da4f0898a86608a1ee67588163
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 27 16:36:34 2008 +1030
Add XF86XK_Suspend and XF86XK_Hibernate keysym defs.
At the moment, we have the following keysyms defined to put a computer into a
sleep state:
XF86XK_Standby 0x1008FF10 /* System into standby mode */
XF86XK_PowerDown 0x1008FF21 /* Deep sleep the system */
XF86XK_Sleep 0x1008FF2F /* Put system to sleep */
Proposed change by Richard Hughes:
"The nomenclature I've been trying to make stick
(most projects now use this) for a few years now is:
standby: high sleep state, nobody uses this any more
hibernate: sleep to disk - slow, but can remove power
suspend: sleep to ram - fast, but can't remove power
hybrid sleep: sleep to both, slow, and can remove power, but quick to
resume if you don't - most users don't use this"
This patch adds XF86XK_Suspend and XF86XK_Hibernate. The behaviour of
XF86XK_Sleep can then be configured on a per-session basis.
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
diff --git a/XF86keysym.h b/XF86keysym.h
index 2a39f4e..072807e 100644
--- a/XF86keysym.h
+++ b/XF86keysym.h
@@ -206,6 +206,9 @@
#define XF86XK_Yellow 0x1008FFA5 /* Yellow button */
#define XF86XK_Blue 0x1008FFA6 /* Blue button */
+#define XF86XK_Suspend 0x1008FFA7 /* Sleep to RAM */
+#define XF86XK_Hibernate 0x1008FFA8 /* Sleep to disk */
+
/* Keys for special action keys (hot keys) */
/* Virtual terminals on some operating systems */
#define XF86XK_Switch_VT_1 0x1008FE01
commit 2563153ed69d3d6f052ba275ff79df3cbe54b76d
Author: James Cloos <cloos@jhcloos.com>
Date: Tue Nov 11 16:26:28 2008 -0500
[keysymdef.h] Add dead_currency symbol.
As requested for the Bépo keyboard layout (http://clavier-dvorak.org/wiki/).
Cf. bugs:
http://bugs.freedesktop.org/show_bug.cgi?id=17821
http://bugs.freedesktop.org/show_bug.cgi?id=17822
diff --git a/keysymdef.h b/keysymdef.h
index 57e735e..2da4ec7 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -415,6 +415,7 @@ SOFTWARE.
#define XK_dead_belowdiaeresis 0xfe6c
#define XK_dead_invertedbreve 0xfe6d
#define XK_dead_belowcomma 0xfe6e
+#define XK_dead_currency 0xfe6f
/* dead vowels for universal syllable entry */
#define XK_dead_a 0xfe80
commit 735d745e17a6180f569f24f9792513b44e100aef
Author: James Cloos <cloos@jhcloos.com>
Date: Mon Oct 13 03:11:33 2008 -0400
Add a dead_belowcomma keysym
Requested by the Bépo group.
The belowcomma is only used for:
U+0218 [Ș] LATIN CAPITAL LETTER S WITH COMMA BELOW
U+0219 [ș] LATIN SMALL LETTER S WITH COMMA BELOW
U+021A [Ț] LATIN CAPITAL LETTER T WITH COMMA BELOW
U+021B [ț] LATIN SMALL LETTER T WITH COMMA BELOW
(aka 0xAA, 0xBA, 0xDE and 0xFE from iso-8859-16).
Cf: http://bugs.freedesktop.org/show_bug.cgi?id=17822
http://bugs.freedesktop.org/show_bug.cgi?id=17821
http://clavier-dvorak.org/wiki/
diff --git a/keysymdef.h b/keysymdef.h
index 8f4614d..57e735e 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -414,6 +414,7 @@ SOFTWARE.
#define XK_dead_belowbreve 0xfe6b
#define XK_dead_belowdiaeresis 0xfe6c
#define XK_dead_invertedbreve 0xfe6d
+#define XK_dead_belowcomma 0xfe6e
/* dead vowels for universal syllable entry */
#define XK_dead_a 0xfe80
commit 935dd37be409bd616ef46a4d3b62c44327b3f710
Author: Sayamindu Dasgupta <sayamindu@gmail.com>
Date: Mon Oct 13 03:00:53 2008 -0400
Add dead vowels in keysymdef.h
At OLPC, we are using an XKB based Amharic keyboard layout, which requires the
use of dead vowels to generate the various consonant + vowel combinations (see
http://en.wikipedia.org/wiki/Ge%27ez_alphabet#Syllable_signs for a detailed
explanation).
[Patch modified to use available keysym codes. -JimC]
Cf: http://bugs.freedesktop.org/show_bug.cgi?id=17437
Signed-off-by: James Cloos <cloos@jhcloos.com>
diff --git a/keysymdef.h b/keysymdef.h
index 85da68c..8f4614d 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -415,6 +415,20 @@ SOFTWARE.
#define XK_dead_belowdiaeresis 0xfe6c
#define XK_dead_invertedbreve 0xfe6d
+/* dead vowels for universal syllable entry */
+#define XK_dead_a 0xfe80
+#define XK_dead_A 0xfe81
+#define XK_dead_e 0xfe82
+#define XK_dead_E 0xfe83
+#define XK_dead_i 0xfe84
+#define XK_dead_I 0xfe85
+#define XK_dead_o 0xfe86
+#define XK_dead_O 0xfe87
+#define XK_dead_u 0xfe88
+#define XK_dead_U 0xfe89
+#define XK_dead_small_schwa 0xfe8a
+#define XK_dead_capital_schwa 0xfe8b
+
#define XK_First_Virtual_Screen 0xfed0
#define XK_Prev_Virtual_Screen 0xfed1
#define XK_Next_Virtual_Screen 0xfed2
commit c43f804f44ba3d751f343c2e27d9b491a1ebb458
Author: James Cloos <cloos@jhcloos.com>
Date: Wed Sep 17 04:09:39 2008 -0400
Add dead keysyms for DOUBLE GRAVE and INVERTED BREVE accents
Several COMBINING characters are used in libX11's Compose tables
where dead keys should be used; these are the two most-used which
so far have not had equivalent dead keys.
diff --git a/keysymdef.h b/keysymdef.h
index 2e49082..85da68c 100644
--- a/keysymdef.h
+++ b/keysymdef.h
@@ -406,12 +406,14 @@ SOFTWARE.
#define XK_dead_psili 0xfe64 /* alias for dead_abovecomma */
#define XK_dead_abovereversedcomma 0xfe65
#define XK_dead_dasia 0xfe65 /* alias for dead_abovereversedcomma */
+#define XK_dead_doublegrave 0xfe66
#define XK_dead_belowring 0xfe67
#define XK_dead_belowmacron 0xfe68
#define XK_dead_belowcircumflex 0xfe69
#define XK_dead_belowtilde 0xfe6a
#define XK_dead_belowbreve 0xfe6b
#define XK_dead_belowdiaeresis 0xfe6c
+#define XK_dead_invertedbreve 0xfe6d
#define XK_First_Virtual_Screen 0xfed0
#define XK_Prev_Virtual_Screen 0xfed1
Reply to: