debian/NEWS | 2 +-
debian/README.Debian | 37 -------------------------------------
debian/changelog | 5 +++++
debian/rules | 5 -----
debian/xkb-data.postinst.in | 21 +++++++++++++++++++++
debian/xkb-data.postrm.in | 20 ++++++++++++++++++++
debian/xkb-data.preinst.in | 20 ++++++++++++++++++++
7 files changed, 67 insertions(+), 43 deletions(-)
New commits:
commit a408304ac7f121446d3a58bfd947d58e1734789f
Author: Julien Cristau <jcris...@debian.org>
Date: Tue Aug 25 20:12:53 2009 +0200
Typo fix in NEWS entry
diff --git a/debian/NEWS b/debian/NEWS
index eb9994f..77d7814 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -5,6 +5,6 @@ xkeyboard-config (1.6-2) unstable; urgency=low
would like to re-enable this feature, you may do so in your
desktop's Keyboard Preferences application. You may also enable it
for the current session using the command
- "setxkbmap -option terminate:ctrl_alt_bkspc".
+ "setxkbmap -option terminate:ctrl_alt_bksp".
-- David Nusinow <dnusi...@debian.org> Tue, 25 Aug 2009 12:52:38 -0400
commit f1176f5b23cd7ffb2327e68644e89121beccbe74
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Jun 22 15:49:55 2009 +0200
Don't install base.xml in /etc/X11/xkb.
Modifying this creates more problems than it solves (closes: #497341).
diff --git a/debian/README.Debian b/debian/README.Debian
index 43f2b95..627c85b 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -54,43 +54,6 @@ Since 0.8-3, all the files in /etc/X11/xkb/ were moved to
/usr/share/X11/xkb/symbols. If you want to clean /etc/X11/xkb/, you need
to run dpkg -P xlibs.
-Customised layouts
-------------------
-
-Since 0.8-1, layouts are read from /usr/share/X11/xkb/symbols and no
-more from /etc/X11/xkb/symbols. Thus, layouts are no more conffiles.
-The good way to have a custom layout is to create one's own layout that
-includes other layouts and customises some keys you want to modify.
-
-Do not modify directly files /usr/share/X11/xkb/symbols.
-
-For instance, to create a French layout altering the 'a' key, create a
-/usr/share/X11/xkb/symbols/my_fr file containing the following lines
-(without the pipes):
-
- | partial alphanumeric_keys
- | xkb_symbols "my_fr" {
- | include "fr"
- | key <AD01> { [ a, A, oe, OE ] };
- | };
-
-To have it appear in your desktop environment layout manager, add
-"my_fr" in /etc/X11/xkb/base.xml as a new layout. For
-example, insert the following lines (without the pipes):
-
- | <layout>
- | <configItem>
- | <name>my_fr</name>
- | <shortDescription>MyFr</shortDescription>
- | <description>French (customized)</description>
- | </configItem>
- | <variantList/>
- | </layout>
-
-/etc/X11/xkb/base.xml is a configuration file.
-
-Mohammed Adnène Trojette <adn+...@diwi.org> Sun, 23 Sep 2007 00:05:50 +0200
-
Your 'Fn' key is not working
----------------------------
diff --git a/debian/changelog b/debian/changelog
index d22f70b..38437c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,12 @@
xkeyboard-config (1.6-2) UNRELEASED; urgency=low
+ [ David Nusinow ]
* Add a note about re-enabling ctrl-alt-backspace killing to NEWS.Debian.
+ [ Julien Cristau ]
+ * Don't install base.xml in /etc/X11/xkb. Modifying this creates more
+ problems than it solves (closes: #497341).
+
-- David Nusinow <dnusi...@debian.org> Tue, 25 Aug 2009 12:56:16 -0400
xkeyboard-config (1.6-1) unstable; urgency=low
diff --git a/debian/rules b/debian/rules
index 176a9fc..d237d45 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,11 +77,6 @@ install: build
# Remove this symlink, it is no more needed
rm -f $(CURDIR)/debian/xkb-data/$(xkb_base)/compiled
- # Move base.xml to /etc/X11/xkb/ and make
- # /usr/share/X11/xkb/rules/base.xml links to it
- mv debian/xkb-data/usr/share/X11/xkb/rules/base.xml
debian/xkb-data/etc/X11/xkb/
- dh_link etc/X11/xkb/base.xml usr/share/X11/xkb/rules/base.xml
-
# Build architecture-dependent files here.
binary-arch: build install
# We have nothing to do by default.
diff --git a/debian/xkb-data.postinst.in b/debian/xkb-data.postinst.in
new file mode 100644
index 0000000..e643383
--- /dev/null
+++ b/debian/xkb-data.postinst.in
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xkb-data
+THIS_SCRIPT=postinst
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+ configure)
+ if dpkg --compare-versions "$2" lt-nl 1.6-2; then
+ remove_conffile_commit /etc/X11/xkb/base.xml
+ rmdir /etc/X11/xkb 2>/dev/null
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xkb-data.postrm.in b/debian/xkb-data.postrm.in
new file mode 100644
index 0000000..5b776ac
--- /dev/null
+++ b/debian/xkb-data.postrm.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xkb-data
+THIS_SCRIPT=postrm
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+ abort-install|abort-upgrade)
+ if dpkg --compare-versions "$2" lt-nl 1.6-2; then
+ remove_conffile_rollback /etc/X11/xkb/base.xml
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
diff --git a/debian/xkb-data.preinst.in b/debian/xkb-data.preinst.in
new file mode 100644
index 0000000..942b272
--- /dev/null
+++ b/debian/xkb-data.preinst.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+set -e
+
+THIS_PACKAGE=xkb-data
+THIS_SCRIPT=preinst
+
+#INCLUDE_SHELL_LIB#
+
+case $1 in
+ upgrade|install)
+ if dpkg --compare-versions "$2" lt-nl 1.6-2; then
+ remove_conffile_lookup $THIS_PACKAGE /etc/X11/xkb/base.xml
+ fi
+ ;;
+esac
+
+#DEBHELPER#
+
+# vim:set ai et sw=2 ts=2 tw=80:
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
