merge of 44ef2a80f1407b2958e8f750892482362d9bb352

     and d6ed8bd922639d616c17c01d270e9edf2bc6b517

6 files changed, 20 insertions, 17 deletions

diff --git a/packages/lirc/files/lircd.init b/packages/lirc/files/lircd.init
index e549b7ede9..862575b924 100755
--- a/packages/lirc/files/lircd.init
+++ b/packages/lirc/files/lircd.init
@@ -6,28 +6,28 @@
 #
 
 
-test -f /usr/sbin/lircd || exit 0
+test -f /usr/ssbin/lircd || exit 0
 
 case "$1" in
   start)
     echo -n "Starting lirc daemon: lircd"
-    start-stop-daemon --start --quiet --exec /usr/bin/lircd -- --device=/dev/lirc
+    start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc
     echo "."
     ;;
   stop)
     echo -n "Stopping lirc daemon: lircd"
-    start-stop-daemon --stop --quiet --exec /usr/bin/lircd
+    start-stop-daemon --stop --quiet --exec /usr/sbin/lircd
     echo "."
     ;;
   reload|force-reload)
-    start-stop-daemon --stop --quiet --signal 1 --exec /usr/bin/lircd
+    start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircd
     ;;
   restart)
     echo -n "Stopping lirc daemon: lircd"
-    start-stop-daemon --stop --quiet --exec /usr/bin/lircd
+    start-stop-daemon --stop --quiet --exec /usr/sbin/lircd
     sleep 1
     echo -n "Starting lirc daemon: lircd"
-    start-stop-daemon --start --quiet --exec /usr/bin/lircd -- --device=/dev/lirc
+    start-stop-daemon --start --quiet --exec /usr/sbin/lircd -- --device=/dev/lirc
     echo "."
     ;;
   *)
diff --git a/packages/lirc/files/lircmd.init b/packages/lirc/files/lircmd.init
index 16296f41d9..1a96207dbb 100755
--- a/packages/lirc/files/lircmd.init
+++ b/packages/lirc/files/lircmd.init
@@ -6,28 +6,28 @@
 #
 
 
-test -f /usr/bin/lircmd || exit 0
+test -f /usr/sbin/lircmd || exit 0
 
 case "$1" in
   start)
     echo -n "Starting lirc daemon: lircmd"
-    start-stop-daemon --start --quiet --exec /usr/bin/lircmd
+    start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
     echo "."
     ;;
   stop)
     echo -n "Stopping lirc daemon: lircmd"
-    start-stop-daemon --stop --quiet --exec /usr/bin/lircmd
+    start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
     echo "."
     ;;
   reload|force-reload)
-    start-stop-daemon --stop --quiet --signal 1 --exec /usr/bin/lircmd
+    start-stop-daemon --stop --quiet --signal 1 --exec /usr/sbin/lircmd
     ;;
   restart)
     echo -n "Stopping lirc daemon: lircmd"
-    start-stop-daemon --stop --quiet --exec /usr/bin/lircmd
+    start-stop-daemon --stop --quiet --exec /usr/sbin/lircmd
     sleep 1
     echo -n "Starting lirc daemon: lircmd"
-    start-stop-daemon --start --quiet --exec /usr/bin/lircmd
+    start-stop-daemon --start --quiet --exec /usr/sbin/lircmd
     echo "."
     ;;
   *)
diff --git a/packages/lirc/lirc_0.6.6+cvs20040918.bb b/packages/lirc/lirc_0.6.6+cvs20040918.bb
index e4e9fad461..1bebdff849 100644
--- a/packages/lirc/lirc_0.6.6+cvs20040918.bb
+++ b/packages/lirc/lirc_0.6.6+cvs20040918.bb
@@ -5,7 +5,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 RDEPENDS = "kernel lirc-modules-${PV}"
 DEPENDS = "virtual/kernel"
-PR = "r7"
+PR = "r8"
 
 S = "${WORKDIR}/lirc"
 SRC_URI = "cvs://anonymous@cvs.sourceforge.net/cvsroot/lirc;module=lirc;date=20040918;method=pserver \
diff --git a/packages/lirc/lirc_0.6.6.bb b/packages/lirc/lirc_0.6.6.bb
index 0088c50b61..7b304837cd 100644
--- a/packages/lirc/lirc_0.6.6.bb
+++ b/packages/lirc/lirc_0.6.6.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz"
 S = "${WORKDIR}/lirc-${PV}"
diff --git a/packages/lirc/lirc_0.7.0.bb b/packages/lirc/lirc_0.7.0.bb
index b7b832422e..4d4f69f922 100644
--- a/packages/lirc/lirc_0.7.0.bb
+++ b/packages/lirc/lirc_0.7.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
 DEPENDS = "virtual/kernel"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
       file://split-hauppauge.patch;patch=1 \
diff --git a/packages/lirc/lirc_0.7.1.bb b/packages/lirc/lirc_0.7.1.bb
index c865002116..5b04f86e79 100644
--- a/packages/lirc/lirc_0.7.1.bb
+++ b/packages/lirc/lirc_0.7.1.bb
@@ -3,8 +3,8 @@ SECTION = "console/network"
 PRIORITY = "optional"
 MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
 LICENSE = "GPL"
-DEPENDS = "virtual/kernel"
-PR = "r2"
+DEPENDS = "virtual/kernel libx11 libxau libsm ice"
+PR = "r4"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
       file://lircd.init file://lircmd.init"
@@ -33,3 +33,6 @@ do_install_append() {
         cp -pPR ${S}/remotes ${D}${datadir}/lirc/
 }
 
+PACKAGES =+ "lirc-x"
+
+FILES_lirc-x = "${bindir}/irxevent ${bindir}/xmode2"