.gitignore | 2
ChangeLog | 9795 +++++++++++++++++++++++++++----------
Makefile.am | 15
NEWS | 5
compat/Makefile.am | 2
compat/caps | 12
compat/complete | 1
compat/default | 1
compat/level5 | 12
compat/misc | 12
configure.in | 14
debian/README.source | 2
debian/changelog | 42
debian/control | 16
debian/rules | 32
debian/watch | 2
debian/xsfbs/xsfbs.mk | 35
docs/iso3166-3.csv | 246
geometry/Makefile.am | 2
geometry/macintosh | 877 +++
geometry/pc | 28
geometry/sanwa | 151
keycodes/Makefile.am | 1
keycodes/empty | 4
keycodes/macintosh | 24
po/bg.po | 1926 ++++---
po/ca.po | 1981 ++++---
po/crh.po | 1265 ++--
po/cs.po | 1908 ++++---
po/da.po | 1974 ++++---
po/de.po | 1940 ++++---
po/el.po | 2627 +++++++--
po/eo.po | 2016 ++++---
po/es.po | 2735 +++++++---
po/fi.po | 1889 ++++---
po/gl.po | 3023 +++++++++++
po/hu.po | 1931 ++++---
po/id.po | 2005 ++++---
po/it.po | 2259 ++++----
po/ko.po | 2325 ++++----
po/lt.po | 1965 ++++---
po/pl.po | 1878 ++++---
po/ro.po | 3079 +++++++++++
po/ru.po | 2167 ++++----
po/uk.po | 2044 ++++---
po/vi.po | 1806 +++---
rules/HDR | 17
rules/Makefile.am | 74
rules/base.extras.xml.in | 33
rules/base.l2_s.part | 1
rules/base.l3_s.part | 1
rules/base.l4_s.part | 1
rules/base.lists.part | 14
rules/base.m_g.part | 2
rules/base.m_k.part | 5
rules/base.m_s.part | 2
rules/base.m_t.part | 1
rules/base.ml1_s.part | 3
rules/base.ml2_s.part | 3
rules/base.ml3_s.part | 3
rules/base.ml4_s.part | 3
rules/base.ml_s.part | 22
rules/base.o_c.part | 1
rules/base.o_s.part | 31
rules/base.xml.in | 763 ++
rules/bin/Makefile.am | 4
rules/bin/ln_s.sh | 20
rules/bin/lnv_s.sh | 12
rules/bin/mln_s.sh | 20
rules/bin/mlnvn_s.sh | 12
rules/compat/.gitignore | 6
rules/compat/Makefile.am | 31
rules/compat/base.l1v1_c.part | 1
rules/compat/base.l2v2_c.part | 1
rules/compat/base.l3v3_c.part | 1
rules/compat/base.l4v4_c.part | 1
rules/compat/base.lv_c.part | 1
rules/evdev.m_k.part | 1
rules/evdev.m_s.part | 1
rules/extras/.gitignore | 6
rules/extras/Makefile.am | 24
rules/extras/variantsMapping.lst | 2
rules/xfree98 | 1
symbols/Makefile.am | 22
symbols/af | 15
symbols/ara | 14
symbols/at | 38
symbols/be | 20
symbols/br | 8
symbols/bw | 19
symbols/ch | 12
symbols/cn | 68
symbols/compose | 18
symbols/ctrl | 12
symbols/cz | 32
symbols/de | 345 -
symbols/empty | 6
symbols/es | 4
symbols/eurosign | 8
symbols/extras/Makefile.am | 3
symbols/extras/ir | 63
symbols/extras/ru | 59
symbols/fi | 333 -
symbols/fr | 34
symbols/gb | 37
symbols/gh | 59
symbols/gr | 3
symbols/hu | 13
symbols/il | 9
symbols/in | 22
symbols/inet | 45
symbols/ir | 56
symbols/is | 23
symbols/it | 44
symbols/jp | 37
symbols/ke | 44
symbols/keypad | 56
symbols/latam | 4
symbols/latin | 6
symbols/level3 | 54
symbols/level5 | 133
symbols/lk | 2
symbols/lt | 461 -
symbols/ma | 10
symbols/macintosh_vndr/Makefile.am | 2
symbols/macintosh_vndr/apple | 88
symbols/macintosh_vndr/jp | 35
symbols/ml | 85
symbols/nbsp | 132
symbols/pc | 2
symbols/ph | 999 +++
symbols/pk | 61
symbols/pt | 12
symbols/rs | 27
symbols/ru | 47
symbols/rupeesign | 7
symbols/shift | 67
symbols/sun_vndr/Makefile.am | 13
symbols/sun_vndr/ara | 117
symbols/sun_vndr/be | 99
symbols/sun_vndr/br | 102
symbols/sun_vndr/ca | 98
symbols/sun_vndr/ch | 134
symbols/sun_vndr/cs | 53
symbols/sun_vndr/cz | 149
symbols/sun_vndr/de | 178
symbols/sun_vndr/dk | 187
symbols/sun_vndr/ee | 118
symbols/sun_vndr/es | 189
symbols/sun_vndr/fi | 114
symbols/sun_vndr/fr | 145
symbols/sun_vndr/gb | 124
symbols/sun_vndr/gr | 141
symbols/sun_vndr/hu | 88
symbols/sun_vndr/it | 178
symbols/sun_vndr/jp | 67
symbols/sun_vndr/ko | 57
symbols/sun_vndr/kr | 98
symbols/sun_vndr/lt | 168
symbols/sun_vndr/lv | 161
symbols/sun_vndr/nl | 197
symbols/sun_vndr/no | 180
symbols/sun_vndr/pl | 143
symbols/sun_vndr/pt | 189
symbols/sun_vndr/ro | 118
symbols/sun_vndr/ru | 140
symbols/sun_vndr/se | 327 +
symbols/sun_vndr/sk | 110
symbols/sun_vndr/solaris | 98
symbols/sun_vndr/sw | 167
symbols/sun_vndr/tr | 170
symbols/sun_vndr/tuv | 73
symbols/sun_vndr/tw | 86
symbols/sun_vndr/ua | 118
symbols/sun_vndr/us | 343 -
symbols/sun_vndr/usb | 26
symbols/sy | 3
symbols/tm | 1
symbols/tz | 63
symbols/us | 153
tests/testShortDescriptions | 6
tests/xkbTestFunc.pm | 15
types/level5 | 122
xkbrules.am | 2
xkeyboard-config.pc.in | 8
185 files changed, 45315 insertions(+), 21337 deletions(-)
New commits:
commit 82f1d26b28fab8bada362ada4ba6a5fa581ae70d
Author: Cyril Brulebois <k...@debian.org>
Date: Wed Apr 6 01:01:31 2011 +0200
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 23f079b..ea57040 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-xkeyboard-config (2.1-2) UNRELEASED; urgency=low
+xkeyboard-config (2.1-2) unstable; urgency=low
* Remove Mohammed Adnène Trojette from Uploaders. Thanks for your work!
* Wrap build dependencies.
* Drop Breaks on libx11-6 (<< 2:1.1), that was before lenny.
* Bump Standards-Version to 3.9.1 (no changes needed).
+ * Upload to unstable.
- -- Cyril Brulebois <k...@debian.org> Fri, 28 Jan 2011 03:11:08 +0100
+ -- Cyril Brulebois <k...@debian.org> Wed, 06 Apr 2011 01:01:12 +0200
xkeyboard-config (2.1-1) experimental; urgency=low
commit da97e682b1fccc600ae76368c5d4d8eccf845e83
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 03:20:09 2011 +0100
Bump Standards-Version to 3.9.1 (no changes needed).
diff --git a/debian/changelog b/debian/changelog
index efdbbe5..23f079b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xkeyboard-config (2.1-2) UNRELEASED; urgency=low
* Remove Mohammed Adnène Trojette from Uploaders. Thanks for your work!
* Wrap build dependencies.
* Drop Breaks on libx11-6 (<< 2:1.1), that was before lenny.
+ * Bump Standards-Version to 3.9.1 (no changes needed).
-- Cyril Brulebois <k...@debian.org> Fri, 28 Jan 2011 03:11:08 +0100
diff --git a/debian/control b/debian/control
index 2c7b9da..fd24e75 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends-Indep:
automake,
intltool,
libglib2.0-dev,
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
commit a498844890331352dfefd544ecaf3c6feac8e412
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 03:13:50 2011 +0100
Drop Breaks on libx11-6 (<< 2:1.1), that was before lenny.
diff --git a/debian/changelog b/debian/changelog
index fe6b2b8..efdbbe5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xkeyboard-config (2.1-2) UNRELEASED; urgency=low
* Remove Mohammed Adnène Trojette from Uploaders. Thanks for your work!
* Wrap build dependencies.
+ * Drop Breaks on libx11-6 (<< 2:1.1), that was before lenny.
-- Cyril Brulebois <k...@debian.org> Fri, 28 Jan 2011 03:11:08 +0100
diff --git a/debian/control b/debian/control
index f76e50d..2c7b9da 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,6 @@ Homepage: http://www.freedesktop.org/Software/XKeyboardConfig
Package: xkb-data
Depends: ${misc:Depends}
-Breaks: libx11-6 (<< 2:1.1)
Architecture: all
Description: X Keyboard Extension (XKB) configuration data
This package contains configuration data used by the X Keyboard
commit 133ac166251dd104916e71fee22c3f305a67fad1
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 03:13:10 2011 +0100
Wrap build dependencies.
diff --git a/debian/changelog b/debian/changelog
index a189ad3..fe6b2b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
xkeyboard-config (2.1-2) UNRELEASED; urgency=low
* Remove Mohammed Adnène Trojette from Uploaders. Thanks for your work!
+ * Wrap build dependencies.
-- Cyril Brulebois <k...@debian.org> Fri, 28 Jan 2011 03:11:08 +0100
diff --git a/debian/control b/debian/control
index b1bfdf8..f76e50d 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,15 @@ Section: x11
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <k...@debian.org>
-Build-Depends: debhelper (>= 7.0.0), quilt
-Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool,
libglib2.0-dev
+Build-Depends:
+ debhelper (>= 7.0.0),
+ quilt,
+Build-Depends-Indep:
+ libxml-parser-perl,
+ x11-xkb-utils,
+ automake,
+ intltool,
+ libglib2.0-dev,
Standards-Version: 3.8.4
Vcs-Git: git://git.debian.org/git/pkg-xorg/data/xkb-data
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/data/xkb-data.git
commit 8b4c9e254d28b1e1ac8953d76b6a40d5cbda4e86
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 03:11:42 2011 +0100
Remove Mohammed Adnène Trojette from Uploaders. Thanks for your work!
diff --git a/debian/changelog b/debian/changelog
index 3fd0a46..a189ad3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xkeyboard-config (2.1-2) UNRELEASED; urgency=low
+
+ * Remove Mohammed Adnène Trojette from Uploaders. Thanks for your work!
+
+ -- Cyril Brulebois <k...@debian.org> Fri, 28 Jan 2011 03:11:08 +0100
+
xkeyboard-config (2.1-1) experimental; urgency=low
* New upstream release:
diff --git a/debian/control b/debian/control
index 7cb0dbf..b1bfdf8 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xkeyboard-config
Section: x11
Priority: extra
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: Mohammed Adnène Trojette <adn+...@diwi.org>, Cyril Brulebois
<k...@debian.org>
+Uploaders: Cyril Brulebois <k...@debian.org>
Build-Depends: debhelper (>= 7.0.0), quilt
Build-Depends-Indep: libxml-parser-perl, x11-xkb-utils, automake, intltool,
libglib2.0-dev
Standards-Version: 3.8.4
commit 3bd35a736090033b5d15e6d5aaf47ff875986aad
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 00:12:02 2011 +0100
Upload to experimental.
diff --git a/debian/changelog b/debian/changelog
index 81a7e8b..3fd0a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+xkeyboard-config (2.1-1) experimental; urgency=low
* New upstream release:
+ Beware of the possible regressions, we're going 3 releases forward
@@ -29,7 +29,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
* Merge xsfbs/debian-unstable, which helps avoiding rebuilds.
* Update download URL in watch file.
- -- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
+ -- Cyril Brulebois <k...@debian.org> Fri, 28 Jan 2011 00:11:58 +0100
xkeyboard-config (1.8-2) unstable; urgency=low
commit ad881f8671d4402288395c8d15ee99b7baf76d71
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 00:11:40 2011 +0100
Update download URL in watch file.
diff --git a/debian/changelog b/debian/changelog
index 3b44302..81a7e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -27,6 +27,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+ Stop removing $(xkb_base)/compiled, it's no longer created.
+ Stop passing --disable-xkbcomp-symlink to configure, it's gone.
* Merge xsfbs/debian-unstable, which helps avoiding rebuilds.
+ * Update download URL in watch file.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/watch b/debian/watch
index 9f48762..7a647e3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
#git=git://anongit.freedesktop.org/xkeyboard-config
version=3
-http://xlibs.freedesktop.org/xkbdesc/ xkeyboard-config-(.*)\.tar\.gz
+http://www.x.org/releases/individual/data/xkeyboard-config/xkeyboard-config-(.*)\.tar\.gz
commit 4ed03b6b35685e3d73508a14adf48ab9a19d3a69
Author: Cyril Brulebois <k...@debian.org>
Date: Fri Jan 28 00:05:05 2011 +0100
rules: Additionally, remove comments starting with “//”. Down to 2.6MB, yay.
diff --git a/debian/changelog b/debian/changelog
index 56ab373..3b44302 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+ Try and keep the udeb's size low: Replace multiple spaces with a
single space character. For this version, installed size goes down
from 3.5MB to 3.0MB.
+ + Additionally, remove comments starting with “//”. Down to 2.6MB, yay.
+ Also don't ship the newly-added pkg-config file in the udeb.
+ Stop removing $(xkb_base)/compiled, it's no longer created.
+ Stop passing --disable-xkbcomp-symlink to configure, it's gone.
diff --git a/debian/rules b/debian/rules
index abf78cb..bdb7e68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,7 +66,10 @@ install: build
rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/locale
rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/pkgconfig
- # Now try and save some space, by getting rid of multiple spaces:
+ # Now try and save some space, by getting rid of comments (in
+ # non-XML files, let's be cautious), then of multiple spaces:
+ find $(CURDIR)/debian/xkb-data-udeb/ ! -name '*.xml' -type f -print0 \
+ | xargs -0 perl -i -pe 's,//.*$$,,'
find $(CURDIR)/debian/xkb-data-udeb/usr/share/X11 -type f -print0 \
| xargs -0 perl -i -pe 's/[ \t]+/ /g'
commit 9fd71fe12e45b8388c7ca64ab04072ff70bdabf2
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 23:19:01 2011 +0100
Document the merge.
diff --git a/debian/changelog b/debian/changelog
index 7b66320..56ab373 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+ Also don't ship the newly-added pkg-config file in the udeb.
+ Stop removing $(xkb_base)/compiled, it's no longer created.
+ Stop passing --disable-xkbcomp-symlink to configure, it's gone.
+ * Merge xsfbs/debian-unstable, which helps avoiding rebuilds.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
commit 9f0f5b1762c508d869d1b7fc87466840cb53dddb
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 22:59:25 2011 +0100
rules: Remove deb target.
dpkg-buildpackage's -i does the right thing, and “-rfakeroot” has been
the default for a while.
diff --git a/debian/changelog b/debian/changelog
index d8386b5..7b66320 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
* Point to /usr/share/X11/xkb/rules/base.lst in README.Debian, thanks to
Riku Saikkonen for the suggestion (Closes: #487951).
* Great debian/rules cleanup:
+ + Remove deb target, dpkg-buildpackage's -i does the right thing, and
+ “-rfakeroot” has been the default for a while.
+ Remove dir target, no longer used.
+ Stop removing rules/compat/base.l[2-4]*.part, they are no longer
generated automatically.
diff --git a/debian/rules b/debian/rules
index b07146e..abf78cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -53,9 +53,6 @@ clean: xsfclean
# Work around quilt's removing empty files:
touch rules/base.o_k.part
-deb:
- dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
-
install: build
dh_testdir
dh_testroot
commit 13af4e2dcc6a9b028ffb0e636582aa1dee373042
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 22:57:34 2011 +0100
rules: Stop passing --disable-xkbcomp-symlink to configure, it's gone.
diff --git a/debian/changelog b/debian/changelog
index 46cccd8..d8386b5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
from 3.5MB to 3.0MB.
+ Also don't ship the newly-added pkg-config file in the udeb.
+ Stop removing $(xkb_base)/compiled, it's no longer created.
+ + Stop passing --disable-xkbcomp-symlink to configure, it's gone.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index 5cf2c53..b07146e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,7 +25,7 @@ config.status: configure
dh_testdir
./configure $(confflags) \
--prefix=/usr \
- --disable-xkbcomp-symlink --with-xkb-rules-symlink=xfree86,xorg \
+ --with-xkb-rules-symlink=xfree86,xorg \
--with-xkb-base=$(xkb_base)
>$@
commit 02a334fda2e2fd4c6959e43e6d7775b94fb07ffe
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 22:55:02 2011 +0100
rules: Stop removing $(xkb_base)/compiled, it's no longer created.
diff --git a/debian/changelog b/debian/changelog
index 8382065..46cccd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
single space character. For this version, installed size goes down
from 3.5MB to 3.0MB.
+ Also don't ship the newly-added pkg-config file in the udeb.
+ + Stop removing $(xkb_base)/compiled, it's no longer created.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index a9d968f..5cf2c53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,8 +63,6 @@ install: build
dh_installdirs
$(MAKE) install DESTDIR=$(CURDIR)/debian/xkb-data
- # Remove this symlink, it is no more needed
- rm -f $(CURDIR)/debian/xkb-data/$(xkb_base)/compiled
# Treat the udeb as an exact copy, but remove messages/pkg-config:
cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb
commit df33581239aefa6cfd1bf3a5a41deb859c3ca769
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 22:49:15 2011 +0100
Also don't ship the newly-added pkg-config file in the udeb.
diff --git a/debian/changelog b/debian/changelog
index 75d87eb..8382065 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+ Try and keep the udeb's size low: Replace multiple spaces with a
single space character. For this version, installed size goes down
from 3.5MB to 3.0MB.
+ + Also don't ship the newly-added pkg-config file in the udeb.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index 4333073..a9d968f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -66,9 +66,10 @@ install: build
# Remove this symlink, it is no more needed
rm -f $(CURDIR)/debian/xkb-data/$(xkb_base)/compiled
- # Treat the udeb as an exact copy, but remove messages:
+ # Treat the udeb as an exact copy, but remove messages/pkg-config:
cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb
rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/locale
+ rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/pkgconfig
# Now try and save some space, by getting rid of multiple spaces:
find $(CURDIR)/debian/xkb-data-udeb/usr/share/X11 -type f -print0 \
commit c3cb25645df3b8fc7903c01b7cb8f9e5cc1e276c
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 22:45:04 2011 +0100
Try and keep the udeb's size low.
Replace multiple spaces with a single space character. For this version,
installed size goes down from 3.5MB to 3.0MB.
diff --git a/debian/changelog b/debian/changelog
index 9c0081e..75d87eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+ Call touch in clean to restore the empty file which gets deleted by
quilt when unpatching rules/base.o_k.part; this avoid its showing up
as “deleted” in “git status”.
+ + Try and keep the udeb's size low: Replace multiple spaces with a
+ single space character. For this version, installed size goes down
+ from 3.5MB to 3.0MB.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index a868dcd..4333073 100755
--- a/debian/rules
+++ b/debian/rules
@@ -70,6 +70,10 @@ install: build
cp -r $(CURDIR)/debian/xkb-data/* $(CURDIR)/debian/xkb-data-udeb
rm -rf $(CURDIR)/debian/xkb-data-udeb/usr/share/locale
+ # Now try and save some space, by getting rid of multiple spaces:
+ find $(CURDIR)/debian/xkb-data-udeb/usr/share/X11 -type f -print0 \
+ | xargs -0 perl -i -pe 's/[ \t]+/ /g'
+
# Build architecture-dependent files here.
binary-arch: build install
# We have nothing to do by default.
commit 53e948c5233f1c24b77d2e2f5cb2295081d7f505
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 22:03:03 2011 +0100
rules: Work around quilt's removing empty files.
diff --git a/debian/changelog b/debian/changelog
index 0a42ccd..9c0081e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,9 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
generated automatically.
+ More generically, stop removing files which weren't cleaned, that's
been fixed.
+ + Call touch in clean to restore the empty file which gets deleted by
+ quilt when unpatching rules/base.o_k.part; this avoid its showing up
+ as “deleted” in “git status”.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index ddf06e1..a868dcd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,6 +50,8 @@ clean: xsfclean
-rm -f rules/base.xml
-rm -f po/.intltool-merge-cache config.status.lineno
dh_clean
+ # Work around quilt's removing empty files:
+ touch rules/base.o_k.part
deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
commit bd7eabc52b4929fd7e8439071000c2b4d33ae716
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 21:59:14 2011 +0100
rules: More generically, stop removing files which weren't cleaned.
That's been fixed.
diff --git a/debian/changelog b/debian/changelog
index 0d87e60..0a42ccd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
+ Remove dir target, no longer used.
+ Stop removing rules/compat/base.l[2-4]*.part, they are no longer
generated automatically.
+ + More generically, stop removing files which weren't cleaned, that's
+ been fixed.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index 9fdd84d..ddf06e1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,9 +50,6 @@ clean: xsfclean
-rm -f rules/base.xml
-rm -f po/.intltool-merge-cache config.status.lineno
dh_clean
- rm -f compat/compat.dir geometry/geometry.dir keycodes/keycodes.dir
- rm -f keymap/keymap.dir symbols/symbols.dir types/types.dir rules/base
- rm -f rules/compat/base.m*.part
deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
commit 48bb7d4479ff3340dda560a6c74a5c2257de5ce3
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 21:50:22 2011 +0100
rules: Stop removing rules/compat/base.l[2-4]*.part
They are no longer generated automatically.
diff --git a/debian/changelog b/debian/changelog
index 8084958..0d87e60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
Riku Saikkonen for the suggestion (Closes: #487951).
* Great debian/rules cleanup:
+ Remove dir target, no longer used.
+ + Stop removing rules/compat/base.l[2-4]*.part, they are no longer
+ generated automatically.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index 3bf1b0f..9fdd84d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ clean: xsfclean
dh_clean
rm -f compat/compat.dir geometry/geometry.dir keycodes/keycodes.dir
rm -f keymap/keymap.dir symbols/symbols.dir types/types.dir rules/base
- rm -f rules/compat/base.l[2-4]*.part rules/compat/base.m*.part
+ rm -f rules/compat/base.m*.part
deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
commit fecd304d0011e1bd568463e145e345d298bf94a3
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 21:15:13 2011 +0100
rules: Remove dir target, no longer used.
diff --git a/debian/changelog b/debian/changelog
index 77aa1b5..8084958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ xkeyboard-config (2.1-1) UNRELEASED; urgency=low
/usr/share/doc/xkb-data/changelog.gz
* Point to /usr/share/X11/xkb/rules/base.lst in README.Debian, thanks to
Riku Saikkonen for the suggestion (Closes: #487951).
+ * Great debian/rules cleanup:
+ + Remove dir target, no longer used.
-- Cyril Brulebois <k...@debian.org> Thu, 27 Jan 2011 19:56:52 +0100
diff --git a/debian/rules b/debian/rules
index 7c64bb2..3bf1b0f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -57,16 +57,6 @@ clean: xsfclean
deb:
dpkg-buildpackage -rfakeroot -i'/\.git|/\.svn'
-dir:
- set -e; for f in compat geometry keycodes keymap semantics symbols
types; do \
- rm -f $$f/$$f.dir; \
- cd $$f; \
- make $$f.dir XKBCOMP=xkbcomp; \
- LC_ALL=C sort -k3 $$f.dir > $$f.new && mv $$f.new $$f.dir; \
- cd ..; \
- cp $$f/$$f.dir debian/; \
- done
-
install: build
dh_testdir
dh_testroot
commit 501c01ab7a925d6258029307124d52007c64acba
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Jan 27 20:44:14 2011 +0100
Do the ChangeLog* dance.
ChangeLog.old is an old copy of the Changelog, when upstream decided to
replace it with a stub telling people to use “git log”. Introduce
ChangeLog back using this command, as it's done for many other X.Org
packages, keeping our users informed.
diff --git a/ChangeLog b/ChangeLog
index 28c8115..3276a6c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1 +1,8394 @@
-ChangeLog file is not used. Use "git log" instead
+commit 1b045f02e0fa84f1c469254414bed64005de51ec
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Jan 25 20:51:48 2011 +0000
+
+ Preparing 2.1
+
+commit d56d53d1be8cf52b1fa875091baa2c08c68b477f
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Jan 25 20:48:13 2011 +0000
+
+ Updated translations, thanks to TP
+
+commit b9c425e93c12cff984ce68f1c21264d8939955e3
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Wed Jan 12 00:14:51 2011 +0000
+
+ Latam layout to be indicated as Spanish, for clarity
+
+commit 1371636923fc2dce373cdbc9bee30287ebfddf51
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Tue Jan 11 13:39:54 2011 +0000
+
+ fixing "both shifts together"
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=30898
+
+commit 8cc4dd7aac9c386507052071d748f9d7b6b342e8
+Author: Stephan Hilb <step...@ecshi.net>
+Date: Sun Jan 2 17:22:30 2011 +0100
+
+ assign action for keysym Shift_L by default
+
+ The keysym action was up until now not explicitly defined.
+ Shift did always work by binding the whole key to a real modifier.
+ But you don't always want to (as in shift:both_capslock)
+ For some reason assigning an action to Shift_L prevents the <LFSH>
+ key from getting bound to the Lock modifier when using
+ shift:both_capslock.
+
+ This fixes the misbehavior of shift not shifting due to multiple
+ mod-mapping (Shift and Lock) when using shift:both_capslock.
+
+commit f63135343532bb6dca7d57d4bd922d361eadfb8e
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Jan 10 20:38:28 2011 +0000
+
+ removed dupes
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=32975
+
+commit 74f8321e352b78a0063cf8032b1027dfad37a79d
+Author: Stephan Hilb <step...@ecshi.net>
+Date: Tue Dec 28 19:42:01 2010 +0100
+
+ de_neo: use type “EIGHT_LEVEL_SEMIALPHABETIC” instead of
“EIGHT_LEVEL_ALPHABETIC”
+
+ This is a better workaround for some lock-behaviour issues.
+ (Sadly the neo-layout cannot use its own type for this, as bug #27988
isn't fixed yet)
+
+commit ea0a5fc4d5d6cf39085b648b23df03171e8b2aea
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Jan 8 23:18:02 2011 +0000
+
+ Some useful mappings enabled in evdev section
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=32653
+
+commit 547ae8589afb208d7b44ffe1e0ff7aba466c2ee3
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sun Dec 26 23:54:26 2010 +0000
+
+ support Uyghur Arabic keyboard layout
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=32576
+
+commit 3d382bfda97c6b267820fe26b2abcf1e9176f7a0
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Dec 20 22:02:09 2010 +0000
+
+ fixed sequence of nbsp includes
+
+commit 4d3aba6500dd3da6ea679d44b6170dc04a709a01
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Dec 20 21:56:05 2010 +0000
+
+ Added nbsp(level4)
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=12764
+
+commit f5d82f14b954308d17d9520db8e082b6b17af647
+Author: Avram Lyon <ajl...@gmail.com>
+Date: Mon Dec 20 23:35:01 2010 +0300
+
+ Changes for Mari keyboard layout (chm)
+
+commit 81db81e860653925effd67b618a37b727de304db
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Dec 4 23:26:03 2010 +0000
+
+ Serbian layout for US keyboards is in fact Serbo-Croation
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=32009
+
+commit 314d0f5ec549c4bdd02aea2ea855c6e538e15f3f
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Nov 15 22:33:32 2010 +0000
+
+ Explicitly not using 4rd level for Euro
+
+ Sometimes 4th level is already used by something meaningful
+ https://bugs.freedesktop.org/show_bug.cgi?id=29964
+
+commit 85157ad78fd4075d91bbd9bb6fc4ed65de8fb2fe
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Mon Nov 15 22:23:28 2010 +0000
+
+ Fixed "both shifts as caps" behavior,
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=30898
+
+commit bd0da89d22179c3eefe6a198cf05c02ddd606c4a
+Author: Aaron Culich <acul...@gmail.com>
+Date: Tue Oct 12 10:50:12 2010 -0700
+
+ Added ctrl:lctrl_meta
+
+commit 8fbb7408d1ffa35685ea07675f14e7a9fa823114
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Nov 13 01:12:26 2010 +0000
+
+ Fixedi Church Slavonic
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=29429
+
+commit e4f22685e5a508839154c867513587efa79c43d0
+Author: Denis 'GNUtoo' Carikli <gnu...@no-log.org>
+Date: Fri Oct 15 22:22:46 2010 +0200
+
+ Add htcdream keyboard model, with US,IT,DE keyboard variants
+
+ The IT and DE keyboard were mapped looking at real hardware that I have,
+ but the US one was done looking at:
+
http://upload.wikimedia.org/wikipedia/commons/1/18/T-Mobile_G1_launch_event_2.jpg
+
+ Signed-off-by: Denis 'GNUtoo' Carikli <gnu...@no-log.org>
+
+commit 017e1e1d89171c845d025f04e886b48ef6fd18b0
+Author: Denis 'GNUtoo' Carikli <gnu...@no-log.org>
+Date: Fri Oct 15 22:22:46 2010 +0200
+
+ Add htcdream keyboard model, with US,IT,DE keyboard variants
+
+ The IT and DE keyboard were mapped looking at real hardware that I have,
+ but the US one was done looking at:
+
http://upload.wikimedia.org/wikipedia/commons/1/18/T-Mobile_G1_launch_event_2.jpg
+
+ Signed-off-by: Denis 'GNUtoo' Carikli <gnu...@no-log.org>
+
+commit 673a5b5cf14c2c95f4bfdc5fbe0eef8a7e56ab3b
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Nov 13 00:41:42 2010 +0000
+
+ Added Philippines
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=31073
+
+commit fe6ee4319113ca4a720f90270eec5a8620b4cf4a
+Author: Bastien Nocera <had...@hadess.net>
+Date: Tue Nov 2 18:32:15 2010 +0000
+
+ Clean up touchpad key definitions
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=31333
+
+commit 240a40cbd3c2dea858e84868d423b3d826efa2dc
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Sat Nov 13 00:22:45 2010 +0000
+
+ Added sanwa kbd model, jp(kana86) variant
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=31340
+
+commit 1bc01a5eaa1180c026ebf8fc75e9bc3cb6876c66
+Author: Peter Hutterer <peter.hutte...@who-t.net>
+Date: Wed Nov 10 11:12:33 2010 +1000
+
+ Remove Pointer_EnableKeys from default layout, move to option instead.
+
+ Pointer_EnableKeys allows the use of the keypad to move the pointer around.
+ This is a rarely used feature but can be enabled by default with
+ Shift+NumLock. No desktop or keyboard has a visualisation that the feature
+ is enabled, leading to user confusion when erroneous mouse clicks or
+ movements are emitted.
+
+ Remove Pointer_EnableKeys from the default keymap and move it to option
+ "keypad:pointerkeys" instead.
+
+ Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net>
+
+commit e5c77e30a9457a301e0a3857db450310584dae1a
+Author: Sergey V. Udaltsov <s...@gnome.org>
+Date: Fri Oct 1 22:29:21 2010 +0100
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1q7irg-0000qy...@alioth.debian.org
