From: Paul Sokolovsky Date: Sun, 25 Nov 2007 22:43:28 +0000 (+0000) Subject: keylaunch 2.0.10: Separate a keylaunch, a generic X key binding utility, X-Git-Tag: Release-2010-05/1~8243^2~9 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b56ea8960f47f11fd7923abeb938fc57c84942e;p=openembedded.git keylaunch 2.0.10: Separate a keylaunch, a generic X key binding utility, from random crap aka device-specific (mis)configs and hacks. --- diff --git a/packages/keylaunch/files/akita/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/akita/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/.mtn2git_empty diff --git a/packages/keylaunch/files/80chvt-SUID b/packages/keylaunch/keylaunch-conf/80chvt-SUID similarity index 100% rename from packages/keylaunch/files/80chvt-SUID rename to packages/keylaunch/keylaunch-conf/80chvt-SUID diff --git a/packages/keylaunch/files/c7x0/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/c7x0/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/akita/.mtn2git_empty diff --git a/packages/keylaunch/files/akita/keylaunchrc b/packages/keylaunch/keylaunch-conf/akita/keylaunchrc similarity index 100% rename from packages/keylaunch/files/akita/keylaunchrc rename to packages/keylaunch/keylaunch-conf/akita/keylaunchrc diff --git a/packages/keylaunch/files/collie/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/collie/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/c7x0/.mtn2git_empty diff --git a/packages/keylaunch/files/c7x0/keylaunchrc b/packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc similarity index 100% rename from packages/keylaunch/files/c7x0/keylaunchrc rename to packages/keylaunch/keylaunch-conf/c7x0/keylaunchrc diff --git a/packages/keylaunch/files/corgie/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/corgie/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/collie/.mtn2git_empty diff --git a/packages/keylaunch/files/collie/keylaunchrc b/packages/keylaunch/keylaunch-conf/collie/keylaunchrc similarity index 100% rename from packages/keylaunch/files/collie/keylaunchrc rename to packages/keylaunch/keylaunch-conf/collie/keylaunchrc diff --git a/packages/keylaunch/files/husky/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/husky/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/corgie/.mtn2git_empty diff --git a/packages/keylaunch/files/corgie/keylaunchrc b/packages/keylaunch/keylaunch-conf/corgie/keylaunchrc similarity index 100% rename from packages/keylaunch/files/corgie/keylaunchrc rename to packages/keylaunch/keylaunch-conf/corgie/keylaunchrc diff --git a/packages/keylaunch/files/shepherd/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/shepherd/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/husky/.mtn2git_empty diff --git a/packages/keylaunch/files/husky/keylaunchrc b/packages/keylaunch/keylaunch-conf/husky/keylaunchrc similarity index 100% rename from packages/keylaunch/files/husky/keylaunchrc rename to packages/keylaunch/keylaunch-conf/husky/keylaunchrc diff --git a/packages/keylaunch/files/keylaunchrc b/packages/keylaunch/keylaunch-conf/keylaunchrc similarity index 100% rename from packages/keylaunch/files/keylaunchrc rename to packages/keylaunch/keylaunch-conf/keylaunchrc diff --git a/packages/keylaunch/files/spitz/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty similarity index 100% rename from packages/keylaunch/files/spitz/.mtn2git_empty rename to packages/keylaunch/keylaunch-conf/shepherd/.mtn2git_empty diff --git a/packages/keylaunch/files/shepherd/keylaunchrc b/packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc similarity index 100% rename from packages/keylaunch/files/shepherd/keylaunchrc rename to packages/keylaunch/keylaunch-conf/shepherd/keylaunchrc diff --git a/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty b/packages/keylaunch/keylaunch-conf/spitz/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/keylaunch/files/spitz/keylaunchrc b/packages/keylaunch/keylaunch-conf/spitz/keylaunchrc similarity index 100% rename from packages/keylaunch/files/spitz/keylaunchrc rename to packages/keylaunch/keylaunch-conf/spitz/keylaunchrc diff --git a/packages/keylaunch/keylaunch-conf_2.0.10.bb b/packages/keylaunch/keylaunch-conf_2.0.10.bb new file mode 100644 index 0000000000..f9748d29f7 --- /dev/null +++ b/packages/keylaunch/keylaunch-conf_2.0.10.bb @@ -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 +} diff --git a/packages/keylaunch/keylaunch_2.0.10.bb b/packages/keylaunch/keylaunch_2.0.10.bb index f7d63968ac..d267dbac30 100644 --- a/packages/keylaunch/keylaunch_2.0.10.bb +++ b/packages/keylaunch/keylaunch_2.0.10.bb @@ -1,10 +1,7 @@ inherit gpe -DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch display-brightness" - -RDEPENDS_append_spitz = " display-brightness" -RDEPENDS_append_akita = " display-brightness" -RDEPENDS_append_c7x0 = " display-brightness" +DEPENDS = "virtual/xserver libxtst libxau libxpm libgpelaunch keylaunch-conf" +RDEPENDS = "keylaunch-conf" SECTION = "gpe" LICENSE = "GPL" @@ -14,31 +11,14 @@ DESCRIPTION = "A small utility for binding commands to a hot key.\ 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 -} - -do_install_append() { - # yeah I know...this is less than ideal - mv ${D}/etc/keylaunchrc ${D}/etc/keylaunchrc.matchbox -} 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 +do_install_append() { + # Remove random crap + rm ${D}/etc/keylaunchrc + rm -rf ${D}/etc/X11/Xinit.d/ }