From 5076109c47cf47766001b3df3a0e9b1c55f4210b Mon Sep 17 00:00:00 2001
From: "Sergey V. Udaltsov" <svu@gnome.org>
Date: Fri, 19 Jun 2009 12:14:19 +0100
Subject: [PATCH] Extra layouts should also be used for evdev

---
 .gitignore                |  1 +
 po/POTFILES.skip          |  1 +
 rules/Makefile.am         |  9 ++++++---
 rules/evdev.extras.xml.in | 16 ++++++++++++++++
 4 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 rules/evdev.extras.xml.in

diff --git a/.gitignore b/.gitignore
index e15acf6..e73456e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -79,6 +79,7 @@ tests/mxkbledpanel/mxkbledpanel
 tests/mxkbledpanel/mxkbledpanel._man
 po/stamp-it
 rules/evdev
+rules/evdev.extras.xml
 rules/evdev.lst
 rules/evdev.xml
 rules/evdev.xml.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 78ff7e0..67c1092 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1 +1,2 @@
 rules/evdev.xml.in
+rules/evdev.extras.xml.in
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 8c72986..e5a9f9d 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -162,20 +162,23 @@ dist_files = xkb.dtd README
 
 rules_DATA = $(rules_files) $(lst_files) $(dist_files)
 
-xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in
+xml_in_files = base.xml.in evdev.xml.in base.extras.xml.in evdev.extras.xml.in
 xml_DATA = $(xml_in_files:.xml.in=.xml) 
 
 $(srcdir)/evdev.xml.in: base.xml.in
 	cp $< $@
 
+$(srcdir)/evdev.extras.xml.in: base.extras.xml.in
+	cp $< $@
+
 EXTRA_DIST= $(xml_in_files) xfree98 \
             $(base_parts_no_compat) \
             $(evdev_parts_no_compat) \
             $(base_parts_compat_dist) \
             xml2lst.pl merge.sh $(dist_files)
 
-CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml
-MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in
+CLEANFILES = base base.xml base.lst evdev evdev.xml evdev.lst base.extras.xml evdev.extras.xml
+MAINTAINERCLEANFILES = $(srcdir)/evdev.xml.in $(srcdir)/evdev.extras.xml.in
 
 rulesdir = $(xkb_base)/rules
 xmldir = $(rulesdir)
diff --git a/rules/evdev.extras.xml.in b/rules/evdev.extras.xml.in
new file mode 100644
index 0000000..73d2bbe
--- /dev/null
+++ b/rules/evdev.extras.xml.in
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE xkbConfigRegistry SYSTEM "xkb.dtd">
+<xkbConfigRegistry>
+  <modelList/>
+  <layoutList>
+    <layout>
+      <configItem>
+        <name>apl</name>
+        <_shortDescription>APL</_shortDescription>
+        <_description>APL</_description>
+      </configItem>
+      <variantList/>
+    </layout>
+  </layoutList>
+  <optionList/>
+</xkbConfigRegistry>
-- 
2.32.0.93.g670b81a890