xkb-data: Changes to 'ubuntu'
debian/changelog | 14 ++++++++++++
debian/control | 2 -
debian/patches/100_abnt2_jp106.diff | 39 ++++++++++++++++++++++++++++++++++++
debian/patches/series | 1
debian/rules | 2 -
5 files changed, 56 insertions(+), 2 deletions(-)
New commits:
commit c2d5412c7958d904b6ebba6be1e4cd0c09d2547b
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 16 16:47:49 2008 +0300
Prepare changelog for upload.
diff --git a/debian/changelog b/debian/changelog
index 042b65d..38a6075 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xkeyboard-config (1.3-2ubuntu3) UNRELEASED; urgency=low
+xkeyboard-config (1.3-2ubuntu3) intrepid; urgency=low
- * 100_abnt2_jp106.diff: Fix keycodes/evdev to support ABNT2 and JP106
- better. (LP: #255372, #258595)
+ * 100_abnt2_jp106.diff: Fix keycodes/evdev to better support ABNT2 and
+ JP106. (LP: #255372, #258595)
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 16 Sep 2008 13:15:41 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 16 Sep 2008 16:47:08 +0300
xkeyboard-config (1.3-2ubuntu2) intrepid; urgency=low
commit 84580544143fd25ee32076af9d10af7a8381832b
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 16 16:46:16 2008 +0300
100_abnt2_jp106.diff: Fix keycodes/evdev to better support ABNT2 and JP106.
diff --git a/debian/changelog b/debian/changelog
index 8ad306f..042b65d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xkeyboard-config (1.3-2ubuntu3) UNRELEASED; urgency=low
+
+ * 100_abnt2_jp106.diff: Fix keycodes/evdev to support ABNT2 and JP106
+ better. (LP: #255372, #258595)
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 16 Sep 2008 13:15:41 +0300
+
xkeyboard-config (1.3-2ubuntu2) intrepid; urgency=low
* control: Add libglib2.0-dev, intltool to build-deps (FTBFS).
diff --git a/debian/patches/100_abnt2_jp106.diff b/debian/patches/100_abnt2_jp106.diff
new file mode 100644
index 0000000..a23ddb6
--- /dev/null
+++ b/debian/patches/100_abnt2_jp106.diff
@@ -0,0 +1,39 @@
+Index: xkb-data/keycodes/evdev
+===================================================================
+--- xkb-data.orig/keycodes/evdev 2008-09-15 17:39:25.000000000 +0300
++++ xkb-data/keycodes/evdev 2008-09-16 10:21:36.000000000 +0300
+@@ -147,14 +147,14 @@
+
+ <HZTG> = 93; // Hankaku/Zenkakau toggle
+ <HKTG> = 101; // Hiragana/Katakana toggle
+- <AB11> = 211; // backslash/underscore
++ <AB11> = 97; // backslash/underscore
+ <HENK> = 100; // Henkan
+ <MUHE> = 102; // Muhenkan
+ <AE13> = 132; // Yen
+ <KATA> = 98; // Katakana
+ <HIRA> = 99; // Hiragana
+ <JPCM> = 103; // KPJPComma
+- <RO> = 97; // Romaji
++ //<RO> = 97; // Romaji
+
+ // Keys that are generated on Korean keyboards
+
+@@ -235,7 +235,7 @@
+ <I208> = 208; // #define KEY_PLAYCD 200
+ <I209> = 209; // #define KEY_PAUSECD 201
+ <I210> = 210; // #define KEY_PROG3 202
+- //<I211> = 211; // #define KEY_PROG4 203 conflicts with AB11
++ <I211> = 211; // #define KEY_PROG4 203
+ <I213> = 213; // #define KEY_SUSPEND 205
+ <I214> = 214; // #define KEY_CLOSE 206
+ <I215> = 215; // #define KEY_PLAY 207
+@@ -304,6 +304,8 @@
+ // For japanese 106 keyboard.
+ xkb_keycodes "jp106" {
+ include "evdev(evdev)"
++ <HZTG> = 49;
++ <AC12> = 51;
+ };
+
+ // For brazilian ABNT2 keyboard.
diff --git a/debian/patches/series b/debian/patches/series
index 16bc5ac..2330b16 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ add_void_definition_pl-324647.diff
send-upstream/001_keypad_comma.diff
#resync_rules_base.diff
#send-upstream/002_add_asus6000.diff
+100_abnt2_jp106.diff
commit 874e1fd00704e24a0cf7a4643f932f151382ac89
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 9 20:03:59 2008 +0300
Update the changelog and release.
diff --git a/debian/changelog b/debian/changelog
index 505fe65..8ad306f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xkeyboard-config (1.3-2ubuntu2) UNRELEASED; urgency=low
+xkeyboard-config (1.3-2ubuntu2) intrepid; urgency=low
* control: Add libglib2.0-dev, intltool to build-deps (FTBFS).
* rules: remove an extra "rm -f".
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 09 Sep 2008 20:03:18 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 09 Sep 2008 20:03:54 +0300
xkeyboard-config (1.3-2ubuntu1) intrepid; urgency=low
commit 089f05b259807487770776c27d33a34f8f04e045
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 9 20:03:37 2008 +0300
rules: remove an extra "rm -f".
diff --git a/debian/changelog b/debian/changelog
index 0ad1961..505fe65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
xkeyboard-config (1.3-2ubuntu2) UNRELEASED; urgency=low
* control: Add libglib2.0-dev, intltool to build-deps (FTBFS).
+ * rules: remove an extra "rm -f".
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 09 Sep 2008 19:54:31 +0300
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 09 Sep 2008 20:03:18 +0300
xkeyboard-config (1.3-2ubuntu1) intrepid; urgency=low
diff --git a/debian/rules b/debian/rules
index 9385c0b..fe2a740 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,7 +53,7 @@ clean: xsfclean
rm -f conftest* */conftest*
rm -rf autom4te.cache */autom4te.cache
rm -rf obj-*
- rm -f $$(find -name Makefile.in) rm -f $$(find -name Makefile)
+ rm -f $$(find -name Makefile.in) $$(find -name Makefile)
rm -f compile config.guess config.sub configure depcomp install-sh
rm -f ltmain.sh missing INSTALL aclocal.m4 config.h.in mkinstalldirs
commit 0bb2f9eb8c97a0792af30e556f43730ed85159ad
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Tue Sep 9 20:02:31 2008 +0300
control: Add libglib2.0-dev, intltool to build-deps (FTBFS).
diff --git a/debian/changelog b/debian/changelog
index 04de259..0ad1961 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xkeyboard-config (1.3-2ubuntu2) UNRELEASED; urgency=low
+
+ * control: Add libglib2.0-dev, intltool to build-deps (FTBFS).
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 09 Sep 2008 19:54:31 +0300
+
xkeyboard-config (1.3-2ubuntu1) intrepid; urgency=low
* Pull from upstream/master, last commit 667a880a4f656fe3.
diff --git a/debian/control b/debian/control
index 0729812..70b39d6 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: extra
Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
XSBC-Original-Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Mohammed Adnène Trojette <adn+deb@diwi.org>
-Build-Depends: debhelper (>= 5.0.0), quilt, automake, libtool, xutils-dev
+Build-Depends: debhelper (>= 5.0.0), quilt, automake, libtool, xutils-dev, libglib2.0-dev, intltool
Build-Depends-Indep: libxml-parser-perl
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Reply to: