[oe-commits] org.oe.dev keylaunch 2.0.10: Separate a keylaunch, a generic X key binding utility,

[pfalcon commit]

keylaunch 2.0.10: Separate a keylaunch, a generic X key binding utility,
from random crap aka device-specific (mis)configs and hacks.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: f1e1a1539f0d83e657f301428e76c7762a9db4b6
ViewMTN: http://monotone.openembedded.org/revision/info/f1e1a1539f0d83e657f301428e76c7762a9db4b6
Files:
1
packages/keylaunch/files/80chvt-SUID
packages/keylaunch/keylaunch-conf/80chvt-SUID
packages/keylaunch/files/akita
packages/keylaunch/keylaunch-conf/akita
packages/keylaunch/files/c7x0
packages/keylaunch/keylaunch-conf/c7x0
packages/keylaunch/files/collie
packages/keylaunch/keylaunch-conf/collie
packages/keylaunch/files/corgie
packages/keylaunch/keylaunch-conf/corgie
packages/keylaunch/files/husky
packages/keylaunch/keylaunch-conf/husky
packages/keylaunch/files/keylaunchrc
packages/keylaunch/keylaunch-conf/keylaunchrc
packages/keylaunch/files/shepherd
packages/keylaunch/keylaunch-conf/shepherd
packages/keylaunch/files/spitz
packages/keylaunch/keylaunch-conf/spitz
packages/keylaunch/keylaunch-conf
packages/keylaunch/keylaunch-conf_2.0.10.bb
packages/keylaunch/keylaunch_2.0.10.bb
Diffs:

#
# mt diff -rb90bee8f0cbca4c4a35f40f0b77c263edc3fb1c7 -rf1e1a1539f0d83e657f301428e76c7762a9db4b6
#
# 
# 
# rename "packages/keylaunch/files/80chvt-SUID"
#     to "packages/keylaunch/keylaunch-conf/80chvt-SUID"
# 
# rename "packages/keylaunch/files/akita"
#     to "packages/keylaunch/keylaunch-conf/akita"
# 
# rename "packages/keylaunch/files/c7x0"
#     to "packages/keylaunch/keylaunch-conf/c7x0"
# 
# rename "packages/keylaunch/files/collie"
#     to "packages/keylaunch/keylaunch-conf/collie"
# 
# rename "packages/keylaunch/files/corgie"
#     to "packages/keylaunch/keylaunch-conf/corgie"
# 
# rename "packages/keylaunch/files/husky"
#     to "packages/keylaunch/keylaunch-conf/husky"
# 
# rename "packages/keylaunch/files/keylaunchrc"
#     to "packages/keylaunch/keylaunch-conf/keylaunchrc"
# 
# rename "packages/keylaunch/files/shepherd"
#     to "packages/keylaunch/keylaunch-conf/shepherd"
# 
# rename "packages/keylaunch/files/spitz"
#     to "packages/keylaunch/keylaunch-conf/spitz"
# 
# add_dir "packages/keylaunch/keylaunch-conf"
# 
# add_file "packages/keylaunch/keylaunch-conf_2.0.10.bb"
#  content [d5db9c21858ad4e7ffa7adf0e6f5f286ccd7b7da]
# 
# patch "packages/keylaunch/keylaunch_2.0.10.bb"
#  from [a826322be029da6f070361e625bdf06ea694f78d]
#    to [8d0d0cc40c9ad3221060e92951a9255a81ffeabb]
# 
============================================================
--- packages/keylaunch/keylaunch-conf_2.0.10.bb	d5db9c21858ad4e7ffa7adf0e6f5f286ccd7b7da
+++ packages/keylaunch/keylaunch-conf_2.0.10.bb	d5db9c21858ad4e7ffa7adf0e6f5f286ccd7b7da
@@ -0,0 +1,27 @@
+RDEPENDS_append_spitz = " display-brightness"
+RDEPENDS_append_akita = " display-brightness"
+RDEPENDS_append_c7x0 = " display-brightness"
+
+SECTION = "gpe"
+LICENSE = "GPL"
+DESCRIPTION = "Device-specific keylaunch configuration"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+PR = "r1"
+
+SRC_URI = " file://keylaunchrc"
+SRC_URI += " file://80chvt-SUID"
+
+do_install () {
+	install -d ${D}${sysconfdir}
+	install -d ${D}${sysconfdir}/X11/Xinit.d
+	install ${WORKDIR}/keylaunchrc ${D}${sysconfdir}/keylaunchrc.matchbox
+	install ${WORKDIR}/80chvt-SUID ${D}${sysconfdir}/X11/Xinit.d
+}
+
+pkg_postinst_${PN}() {
+	update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10
+}
+
+pkg_postrm_${PN}() {
+       update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox
+}
============================================================
--- packages/keylaunch/keylaunch_2.0.10.bb	a826322be029da6f070361e625bdf06ea694f78d
+++ packages/keylaunch/keylaunch_2.0.10.bb	8d0d0cc40c9ad3221060e92951a9255a81ffeabb
@@ -1,11 +1,8 @@ inherit gpe
 inherit gpe
 
-DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch display-brightness"
+DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch keylaunch-conf"
+RDEPENDS = "keylaunch-conf"
 
-RDEPENDS_append_spitz = " display-brightness"
-RDEPENDS_append_akita = " display-brightness"
-RDEPENDS_append_c7x0 = " display-brightness"
-
 SECTION = "gpe"
 LICENSE = "GPL"
 DESCRIPTION = "A small utility for binding commands to a hot key.\
@@ -14,31 +11,14 @@ DESCRIPTION = "A small utility for bindi
  computers. You can connect each key to a program of your choice; if the\
  program is already running, keylaunch can bring its window to the front\
  rather than just running another copy."
-PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r12"
+PR = "r13.5"
 
-SRC_URI += " file://keylaunchrc"
 SRC_URI += " file://makefile-fix.patch;patch=1"
-SRC_URI += " file://80chvt-SUID"
 
-do_install_prepend () {
-	install ${WORKDIR}/keylaunchrc ${S}/keylaunchrc
-	
-	install -d ${D}/etc/X11/Xinit.d
-	install ${WORKDIR}/80chvt-SUID ${D}/etc/X11/Xinit.d
-}
+export CVSBUILD="no"
 
 do_install_append() {
-	# yeah I know...this is less than ideal
-	mv ${D}/etc/keylaunchrc ${D}/etc/keylaunchrc.matchbox
+	# Remove random crap
+	rm ${D}/etc/keylaunchrc
+	rm -rf ${D}/etc/X11/Xinit.d/
 }
-
-export CVSBUILD="no"
-
-pkg_postinst_${PN}() {
-	update-alternatives --install /etc/keylaunchrc keylaunchrc /etc/keylaunchrc.matchbox 10
-}
-
-pkg_postrm_${PN}() {
-       update-alternatives --remove keylaunchrc /etc/keylaunchrc.matchbox
-}