upgpkg: programmers-dvorak 1.2.1-1

upstream release

3 files changed, 26 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ada260994c6..9f81d0a05af2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = programmers-dvorak
 	pkgdesc = Variant of the Dvorak keyboard layout designed for programmers
-	pkgver = 1.2
-	pkgrel = 6
+	pkgver = 1.2.1
+	pkgrel = 1
 	url = http://www.kaufmann.no/roland/dvorak/
 	install = programmers-dvorak.install
 	arch = any
@@ -10,10 +10,9 @@ pkgbase = programmers-dvorak
 	noextract = dvp-1_2_1.map.gz
 	source = http://www.kaufmann.no/downloads/linux/kbddvp-1_2_1-src-linux.tgz
 	source = http://www.kaufmann.no/downloads/linux/dvp-1_2_1.map.gz
-	source = LICENSE
+	source = http://www.kaufmann.no/roland/dvorak//license.html
 	sha256sums = 0f56b55432d63a6d81c08ff5f722cf48c6d9a15c34c304f594d02eb2223fc4fa
 	sha256sums = 0e859211cfe16a18a3b9cbf2ca3e280a23a79b4e40b60d8d01d0fde7336b6d50
-	sha256sums = 123675c594fe0349a7c27b124cf03715d293af60047d1916c657ac25d0f86ce8
+	sha256sums = 19185beec2780c609495676bc3c77db7ffe14c6a9aa4b7a8c3670982d2f7f2f5
 
 pkgname = programmers-dvorak
-
diff --git a/PKGBUILD b/PKGBUILD
index 9da60eae6ff6..906557d88fde 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,40 +4,38 @@
 # Contributor: Mark Taylor <skymt0@gmail.com>
 
 pkgname=programmers-dvorak
-pkgver=1.2
-_linuxrel=1
-_pkgver=${pkgver//./_}_$_linuxrel
-pkgrel=6
+pkgver=1.2.1
+_pkgver=${pkgver//./_}
+pkgrel=1
 pkgdesc='Variant of the Dvorak keyboard layout designed for programmers'
 arch=(any)
-url='http://www.kaufmann.no/roland/dvorak/'
-license=('custom')
+url=http://www.kaufmann.no/roland/dvorak/
+license=(custom)
 install=programmers-dvorak.install
-depends=('libxslt')
+depends=(libxslt)
 source=("http://www.kaufmann.no/downloads/linux/kbddvp-$_pkgver-src-linux.tgz"
         "http://www.kaufmann.no/downloads/linux/dvp-$_pkgver.map.gz"
-        'LICENSE')
+        "$url/license.html")
 noextract=("${source[1]##*/}")
 sha256sums=('0f56b55432d63a6d81c08ff5f722cf48c6d9a15c34c304f594d02eb2223fc4fa'
             '0e859211cfe16a18a3b9cbf2ca3e280a23a79b4e40b60d8d01d0fde7336b6d50'
-            '123675c594fe0349a7c27b124cf03715d293af60047d1916c657ac25d0f86ce8')
+            '19185beec2780c609495676bc3c77db7ffe14c6a9aa4b7a8c3670982d2f7f2f5')
 
 prepare() {
-  cd "kbddvp-$pkgver"
-  # Upstream install script makes too many assumptions about the host system:
-  # directories existing, being root, etc. We'll make our own way...
-  rm dvp.install.sh
+	cd "kbddvp-${pkgver%.*}"
+	# Upstream install script makes too many assumptions about the host system:
+	# directories existing, being root, etc. We'll make our own way...
+	rm dvp.install.sh
 }
 
 package() {
-  cd "kbddvp-$pkgver"
-  install -Dm755 -t "$pkgdir/usr/share/$pkgname/" dvp.*.sh
-  install -Dm644 "../${source[1]##*/}" "$pkgdir/usr/share/kbd/keymaps/i386/dvorak/dvp.map.gz"
-  install -Dm644 -t "$pkgdir/usr/share/licenses/$pkgname/" "../${source[2]}"
-  # Adapt relevant system installation bits from dvp.install.sh...
-  for f in dvp hex atm 102 ops semi; do
-    install -Dm644 $f.xkb "$pkgdir/usr/share/X11/xkb/symbols/$f"
-  done
-  install -Dm644 shift3.xkb "$pkgdir/usr/share/X11/xkb/types/shift3"
+	cd "kbddvp-${pkgver%.*}"
+	install -Dm0755 -t "$pkgdir/usr/share/$pkgname/" dvp.*.sh
+	install -Dm0644 "../${source[1]##*/}" "$pkgdir/usr/share/kbd/keymaps/i386/dvorak/dvp.map.gz"
+	# Adapt relevant system installation bits from dvp.install.sh...
+	for f in dvp hex atm 102 ops semi; do
+		install -Dm0644 "$f.xkb" "$pkgdir/usr/share/X11/xkb/symbols/$f"
+	done
+	install -Dm0644 shift3.xkb "$pkgdir/usr/share/X11/xkb/types/shift3"
+	install -Dm0644 -t "$pkgdir/usr/share/licenses/$pkgname/" "../license.html"
 }
-
diff --git a/programmers-dvorak.install b/programmers-dvorak.install
index b4950b5c510f..dcd5a0ae2c3d 100644
--- a/programmers-dvorak.install
+++ b/programmers-dvorak.install
@@ -1,15 +1,5 @@
-# arg 1: the new package version
 post_install() {
-    /usr/share/programmers-dvorak/dvp.postinst.sh || return 1
-    echo "PROGRAMMER'S DVORAK SETUP"
-    echo "-------------------------"
-    echo "To use the Programmer's Dvorak layout in X, edit"
-    echo "/etc/X11/xorg.conf, find the line with the string"
-    echo "'XkbLayout', and change your current layout to 'dvp'."
-    echo "-------------------------"
-    echo "To use the layout at a virtual terminal, edit"
-    echo "/etc/vconsole.conf and change KEYMAP from your current"
-    echo "layout to 'dvp'."
+    /usr/share/programmers-dvorak/dvp.postinst.sh
 }
 
 pre_upgrade() {
@@ -25,8 +15,3 @@ pre_remove() {
     /usr/share/programmers-dvorak/dvp.prerm.sh
     /usr/share/programmers-dvorak/dvp.remove.sh
 }
-
-op=$1
-shift
-
-$op $*