From e86615d5e9828ed2215d5d3b7d3b0993bd340cd1 Mon Sep 17 00:00:00 2001
From: langfingaz <daniel@systemli.org>
Date: Fri, 7 May 2021 20:24:39 +0200
Subject: [PATCH] p1st-keyboard-x11-de provides p1st-keyboard-x11

---
 pkg/de-p1st-keyboard-de/PKGBUILD               |  5 ++++-
 .../00-keyboard.conf                           |  6 +++++-
 .../PKGBUILD                                   | 18 +++++++-----------
 .../README.md                                  |  0
 4 files changed, 16 insertions(+), 13 deletions(-)
 rename pkg/{de-p1st-keyboard-x11 => de-p1st-keyboard-x11-de}/00-keyboard.conf (74%)
 rename pkg/{de-p1st-keyboard-x11 => de-p1st-keyboard-x11-de}/PKGBUILD (71%)
 rename pkg/{de-p1st-keyboard-x11 => de-p1st-keyboard-x11-de}/README.md (100%)

diff --git a/pkg/de-p1st-keyboard-de/PKGBUILD b/pkg/de-p1st-keyboard-de/PKGBUILD
index 153703d..80fb71c 100644
--- a/pkg/de-p1st-keyboard-de/PKGBUILD
+++ b/pkg/de-p1st-keyboard-de/PKGBUILD
@@ -3,7 +3,7 @@ _pkgname=keyboard-de
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=1
+pkgrel=2
 pkgdesc="vconsole (virtual console) keyboard configuration: de-latin1-nodeadkeys"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
@@ -11,7 +11,10 @@ license=('MIT')
 groups=()
 depends=()
 makedepends=('git')
+
 provides=('de-p1st-keyboard')
+conflicts=('de-p1st-keyboard')
+
 source=("git+${url}.git")
 noextract=()
 sha256sums=('SKIP')
diff --git a/pkg/de-p1st-keyboard-x11/00-keyboard.conf b/pkg/de-p1st-keyboard-x11-de/00-keyboard.conf
similarity index 74%
rename from pkg/de-p1st-keyboard-x11/00-keyboard.conf
rename to pkg/de-p1st-keyboard-x11-de/00-keyboard.conf
index e9ad6ba..6e02f26 100644
--- a/pkg/de-p1st-keyboard-x11/00-keyboard.conf
+++ b/pkg/de-p1st-keyboard-x11-de/00-keyboard.conf
@@ -1,8 +1,12 @@
 Section "InputClass"
         Identifier "system-keyboard"
         MatchIsKeyboard "on"
+
+        # German only
+        Option "XkbLayout" "de"
         # German and Norwegian
-        Option "XkbLayout" "de,no"
+        # Option "XkbLayout" "de,no"
+
         Option "XkbVariant" "nodeadkeys"
         # toggle between layouts with: ALT + CAPS-LOCK
         Option "XkbOptions" "grp:alt_caps_toggle"
diff --git a/pkg/de-p1st-keyboard-x11/PKGBUILD b/pkg/de-p1st-keyboard-x11-de/PKGBUILD
similarity index 71%
rename from pkg/de-p1st-keyboard-x11/PKGBUILD
rename to pkg/de-p1st-keyboard-x11-de/PKGBUILD
index 4bd97ba..42e6b16 100644
--- a/pkg/de-p1st-keyboard-x11/PKGBUILD
+++ b/pkg/de-p1st-keyboard-x11-de/PKGBUILD
@@ -1,24 +1,20 @@
 # Maintainer: Daniel Langbein <daniel@systemli.org>
-_pkgname=keyboard-x11
+_pkgname=keyboard-x11-de
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
 pkgver=0.0.1
-pkgrel=2
-pkgdesc="xorg (X11) keyboard configuration"
+pkgrel=1
+pkgdesc="xorg (X11) keyboard configuration: de nodeadkeys"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 groups=()
 depends=()
 makedepends=('git')
-optdepends=()
-provides=()
-conflicts=()
-replaces=()
-backup=()
-options=()
-install=
-changelog=
+
+provides=('de-p1st-keyboard-x11')
+conflicts=('de-p1st-keyboard-x11')
+
 source=("git+${url}.git")
 noextract=()
 sha256sums=('SKIP')
diff --git a/pkg/de-p1st-keyboard-x11/README.md b/pkg/de-p1st-keyboard-x11-de/README.md
similarity index 100%
rename from pkg/de-p1st-keyboard-x11/README.md
rename to pkg/de-p1st-keyboard-x11-de/README.md