[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

xkb-data: Changes to 'debian-unstable'



 ChangeLog                 |    4 +++-
 debian/README.Debian      |    4 ++--
 debian/changelog          |   22 +++++++++++++---------
 debian/patches/clean.diff |   16 ++++++++--------
 debian/rules              |    5 +++++
 debian/xkb-data.postinst  |   28 ++++++++++++++++++++++++++++
 symbols/macintosh_vndr/fr |   12 ++++++++++++
 symbols/macintosh_vndr/us |    2 +-
 8 files changed, 72 insertions(+), 21 deletions(-)

New commits:
commit 464b6f88adfb41435db8f02d6348bf945e43ac21
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date:   Sat Jan 5 00:32:24 2008 +0100

    update debian/changelog accordingly

diff --git a/debian/changelog b/debian/changelog
index acff4ee..34b22c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low
     make /usr/share/X11/xkb/rules/base.xml a symlink to
     /etc/X11/xkb/base.xml configuration file.
     (Closes: #410628, #410903, #438940)
+  * Remove files left in /etc/X11/xkb/. (Closes: #366180)
   * New patch: add_void_definition_pl-324647.diff
      + don't use rules/latin's definitions for alt+{w,q,f}.
        (Closes: #324647)

commit afffbc967cda0f0a0cd14b70db016cb1510df28f
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date:   Sat Jan 5 00:30:31 2008 +0100

    remove what is in /etc/X11/xkb/

diff --git a/debian/xkb-data.postinst b/debian/xkb-data.postinst
new file mode 100644
index 0000000..5d2b358
--- /dev/null
+++ b/debian/xkb-data.postinst
@@ -0,0 +1,28 @@
+#!/bin/sh
+# postinst script for xkb-data
+#
+
+set -e
+
+case "$1" in
+    configure)
+    	find /etc/X11/xkb | grep -v '/^base.xml/' | xargs rm
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

commit 7437ea2662ea40a098b7caac8ba38bc3da6c4d8d
Author: Mohammed Adnene Trojette <adn@uracile.diwi.org>
Date:   Sat Jan 5 00:27:23 2008 +0100

    - put base.xml in /etc/X11/xkb and make a symlink in /usr/share/X11/xkb/
    - sync with upstream's CVS

diff --git a/ChangeLog b/ChangeLog
index 6379cb2..e431e98 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* symbols/inet, rules/base.lists.part, rules/base.xml.in: adding BTC
 	6301URF, https://bugs.freedesktop.org/show_bug.cgi?id=13913
+	* symbols/macintosh_vndr/fr: added nodeadkeys,
+	https://bugs.freedesktop.org/show_bug.cgi?id=13934
 
 2008-01-03  Sergey Udaltsov
 
@@ -1904,7 +1906,7 @@
 
 2004-09-13 22:39  svu
 
-	* symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.387 2008-01-04 21:07:52 svu Exp $
+	* symbols/tj: new local cvs keyword seems to be ok - no more $Id: ChangeLog,v 1.388 2008-01-04 22:34:04 svu Exp $
 
 2004-09-13 22:38  svu
 
diff --git a/debian/README.Debian b/debian/README.Debian
index c1f1006..7d74dfb 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -68,7 +68,7 @@ For instance, to create a French layout altering the 'a' key, create a
    |   };
 
 To have it appear in your desktop environment layout manager, add
-"my_fr" in /usr/share/X11/xkb/rules/base.xml as a new layout. For
+"my_fr" in /etc/X11/xkb/base.xml as a new layout. For
 example, insert the following lines (without the pipes):
 
     |    <layout>
@@ -80,6 +80,6 @@ example, insert the following lines (without the pipes):
     |      <variantList/>
     |    </layout>
 
-/usr/share/X11/xkb/rules/base.xml is a configuration file.
+/etc/X11/xkb/base.xml is a configuration file.
 
 Mohammed Adnène Trojette <adn+deb@diwi.org>  Sun, 23 Sep 2007 00:05:50 +0200
diff --git a/debian/changelog b/debian/changelog
index 585ef11..acff4ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,23 @@
 xkeyboard-config (1.1~cvs.20080104.1-1) UNRELEASED; urgency=low
 
   * New upstream CVS snapshot from January 4th 2008:
-     + fix Latin American layout. (Closes: #444035)
-     + fix Cherry CyMotion Master Linux layout. (Closes: #343929)
-     + fix HP Compaq nx9020 layout. (Closes: #395883)
-     + split Serbia and Montenegro. (Closes: #451622)
-  * Refresh resync_rules_base.diff. (Closes: #442942)
-  * Document the creation of a custom layout in README.Debian and
-    make /usr/share/X11/xkb/rules/base.xml a configuration file.
+     + fixed Latin American layout. (Closes: #444035)
+     + fixed Cherry CyMotion Master Linux layout. (Closes: #343929)
+     + fixed HP Compaq nx9020 layout. (Closes: #395883)
+     + splitted Serbia and Montenegro. (Closes: #451622)
+     + added fr(nodeadkeys) to mac. (Closes: #456942)
+     + fixed mapping for shift+backslash in "il" keyboard. (Closes: #457927)
+  * Refreshed resync_rules_base.diff. (Closes: #442942)
+  * Documented the creation of a custom layout in README.Debian and
+    make /usr/share/X11/xkb/rules/base.xml a symlink to
+    /etc/X11/xkb/base.xml configuration file.
     (Closes: #410628, #410903, #438940)
   * New patch: add_void_definition_pl-324647.diff
      + don't use rules/latin's definitions for alt+{w,q,f}.
        (Closes: #324647)
   * debian/control:
-     + bump Standards-Version to 3.7.3.
-     + use Vcs-Git and Vcs-Browser fields.
+     + bumped Standards-Version to 3.7.3.
+     + used Vcs-Git and Vcs-Browser fields.
 
  -- Mohammed Adnène Trojette <adn+deb@diwi.org>  Fri, 04 Jan 2008 22:47:11 +0100
 
diff --git a/debian/patches/clean.diff b/debian/patches/clean.diff
index 9437acb..972fecf 100644
--- a/debian/patches/clean.diff
+++ b/debian/patches/clean.diff
@@ -2,10 +2,10 @@ Let 'make clean' remove generated files.
 
 Not submitted upstream.
 
-Index: xkb-data-experimental/rules/compat/Makefile.am
+Index: xkb-data/rules/compat/Makefile.am
 ===================================================================
---- xkb-data-experimental.orig/rules/compat/Makefile.am
-+++ xkb-data-experimental/rules/compat/Makefile.am
+--- xkb-data.orig/rules/compat/Makefile.am	2008-01-05 00:22:37.000000000 +0100
++++ xkb-data/rules/compat/Makefile.am	2008-01-05 00:26:02.000000000 +0100
 @@ -7,15 +7,17 @@
  
  if USE_COMPAT_RULES
@@ -31,11 +31,11 @@ Index: xkb-data-experimental/rules/compat/Makefile.am
  
  EXTRA_DIST=base.lists.part $(transform_files) $(transform_scripts) $(dist_parts)
 +CLEANFILES=$(gen_parts)
-Index: xkb-data-experimental/rules/compat/Makefile.in
+Index: xkb-data/rules/compat/Makefile.in
 ===================================================================
---- xkb-data-experimental.orig/rules/compat/Makefile.in
-+++ xkb-data-experimental/rules/compat/Makefile.in
-@@ -164,14 +164,17 @@
+--- xkb-data.orig/rules/compat/Makefile.in	2008-01-05 00:22:37.000000000 +0100
++++ xkb-data/rules/compat/Makefile.in	2008-01-05 00:26:02.000000000 +0100
+@@ -191,14 +191,17 @@
  transform_files = layoutRename.lst variantRename.lst
  transform_scripts = ln_s.sh lnv_s.sh ml_s.sh mlv_s.sh ml1_s.sh ml1v_s.sh ml1v1_s.sh
  dist_parts = base.o_s.part
@@ -56,7 +56,7 @@ Index: xkb-data-experimental/rules/compat/Makefile.in
  all: all-am
  
  .SUFFIXES:
-@@ -260,6 +263,7 @@
+@@ -287,6 +290,7 @@
  mostlyclean-generic:
  
  clean-generic:
diff --git a/debian/rules b/debian/rules
index f2f1996..d1edbe4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -106,6 +106,11 @@ 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/usr/share/X11/xkb/rules/base.xml debian/etc/X11/xkb/
+	dh_link debian/etc/X11/xkb/base.xml debian/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/symbols/macintosh_vndr/fr b/symbols/macintosh_vndr/fr
index 4ae24ae..9a8f8de 100644
--- a/symbols/macintosh_vndr/fr
+++ b/symbols/macintosh_vndr/fr
@@ -26,6 +26,7 @@
 // Apple mark and the oe/OE character; others I may have simply not
 // found.)
 
+default
 xkb_symbols "extended" {
 
     name[Group1]= "France - Mac";
@@ -96,3 +97,14 @@ xkb_symbols "extended" {
 };
 
 
+
+xkb_symbols "nodeadkeys" {
+include "macintosh_vndr/fr(extended)"
+    name[Group1]= "France - Mac, eliminate dead keys";
+    
+    key <AE01> {	[   ampersand,	  1,	  	VoidSymbol,	  	acute	]	}; // MISSING: Apple
+    key <AD11> {	[asciicircum,diaeresis,ocircumflex, 		Ocircumflex	]	};
+    key <BKSL> {	[ grave,	sterling,	at,			numbersign	]	};
+
+    key <AB06> {	[	  n,	N,		asciitilde,		dead_tilde	]	};
+};
diff --git a/symbols/macintosh_vndr/us b/symbols/macintosh_vndr/us
index 7b54a85..fed3253 100644
--- a/symbols/macintosh_vndr/us
+++ b/symbols/macintosh_vndr/us
@@ -5,7 +5,7 @@
 
 xkb_symbols "extended" {
 
-    name[Group1]= "U.S. English";
+    name[Group1]= "USA";
     key <ESC>  {	[ Escape			]	};
 
     // Alphanumeric section


Reply to: