Moved install/uninstall scripts to /usr/share/libalpm/scripts

4 files changed, 19 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 523f37b38edc..11a340f9fef6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = xkb-qwerty-fr
 	pkgdesc = French qwerty keymap - provides a keymap for French users of qwerty keyboards. All French characters are directly accessible with AltGr and smartly mapped.
 	pkgver = 0.5
-	pkgrel = 3
+	pkgrel = 4
 	url = http://marin.jb.free.fr/qwerty-fr/
 	install = xkb-qwerty-fr.install
 	arch = any
@@ -11,9 +11,8 @@ pkgbase = xkb-qwerty-fr
 	source = http://marin.jb.free.fr/qwerty-fr/xkb-qwerty-fr_0.5_all.deb
 	source = xkb-qwerty-fr.hook
 	md5sums = cefc7f02f2a23633d1160c32caa6c132
-	md5sums = 7b16a0405f6fd5b308869b4b87abc7e7
+	md5sums = a48aeeed95e5309eb22399ec4455bfd3
 	sha256sums = 03fc6b72b62fb6661e5671bc3e500934ed9aa457159141ef02d989616276ef64
-	sha256sums = 38e7edfaa1eee4bc6e3a8e8b9fddd87e463372d81cc4e0c00429fb9c8c800f98
+	sha256sums = 093d2b1d27f77ac5d0cff9a6057ceff18ddc73901a9636ba6533a8e40a63e3cc
 
 pkgname = xkb-qwerty-fr
-
diff --git a/PKGBUILD b/PKGBUILD
index d068d9718aa3..2092b0d5fac8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=xkb-qwerty-fr
 pkgver=0.5
-pkgrel=3
+pkgrel=4
 pkgdesc="French qwerty keymap - provides a keymap for French users of qwerty keyboards. All French characters are directly accessible with AltGr and smartly mapped."
 arch=('any')
 url="http://marin.jb.free.fr/qwerty-fr/"
@@ -15,9 +15,9 @@ install=${pkgname}.install
 source=("http://marin.jb.free.fr/qwerty-fr/${pkgname}_${pkgver}_all.deb"
         "xkb-qwerty-fr.hook")
 md5sums=('cefc7f02f2a23633d1160c32caa6c132'
-         '7b16a0405f6fd5b308869b4b87abc7e7')
+         'a48aeeed95e5309eb22399ec4455bfd3')
 sha256sums=('03fc6b72b62fb6661e5671bc3e500934ed9aa457159141ef02d989616276ef64'
-            '38e7edfaa1eee4bc6e3a8e8b9fddd87e463372d81cc4e0c00429fb9c8c800f98')
+            '093d2b1d27f77ac5d0cff9a6057ceff18ddc73901a9636ba6533a8e40a63e3cc')
 
 build() {
   cd "$srcdir"
@@ -28,9 +28,8 @@ build() {
 package() {
   cd "$srcdir"
 
-  install -D -m 755 postinst ${pkgdir}/usr/bin/xkb-qwerty-fr.install
-  install -D -m 755 postrm ${pkgdir}/usr/bin/xkb-qwerty-fr.uninstall
-
+  install -D -m 755 postinst ${pkgdir}/usr/share/libalpm/scripts/xkb-qwerty-fr.install
+  install -D -m 755 postrm ${pkgdir}/usr/share/libalpm/scripts/xkb-qwerty-fr.uninstall
   install -D -m 644 xkb-qwerty-fr.hook ${pkgdir}/usr/share/libalpm/hooks/xkb-qwerty-fr.hook
 
   install -D -m 644 usr/share/X11/xkb/symbols/us_qwerty-fr ${pkgdir}/usr/share/X11/xkb/symbols/us_qwerty-fr
diff --git a/xkb-qwerty-fr.hook b/xkb-qwerty-fr.hook
index b1bc6386435b..b242875c3caa 100644
--- a/xkb-qwerty-fr.hook
+++ b/xkb-qwerty-fr.hook
@@ -6,6 +6,6 @@ Target = xkeyboard-config
 
 [Action]
 Description = Install qwerty-fr keyboard layout
-Exec = /usr/bin/xkb-qwerty-fr.install triggered
+Exec = /usr/share/libalpm/scripts/xkb-qwerty-fr.install triggered
 When = PostTransaction
 Depends = perl
diff --git a/xkb-qwerty-fr.install b/xkb-qwerty-fr.install
index cbe6aa71005d..7e0947523e8b 100644
--- a/xkb-qwerty-fr.install
+++ b/xkb-qwerty-fr.install
@@ -1,13 +1,17 @@
 post_install() {
     echo "==> Installing qwerty-fr keyboard layout"
-    /usr/bin/xkb-qwerty-fr.install triggered
-}
-
-post_upgrade() {
-    post_install
+    /usr/share/libalpm/scripts/xkb-qwerty-fr.install triggered
 }
 
 pre_remove() {
     echo "==> Removing qwerty-fr keyboard layout"
-    /usr/bin/xkb-qwerty-fr.uninstall triggered
+    /usr/share/libalpm/scripts/xkb-qwerty-fr.uninstall triggered
+}
+
+pre_upgrade() {
+    pre_remove
+}
+
+post_upgrade() {
+    post_install
 }