hal: revert PIDFILE hunk

diff --git a/packages/hal/files/20hal b/packages/hal/files/20hal
index 5b97c4f9e6675ff0527246add3560b3ad7f781b7..926bd893e2f64954a1069150c8e8c9d51c4f03e5 100644 (file)
--- a/packages/hal/files/20hal
+++ b/packages/hal/files/20hal
@@ -12,7 +12,7 @@
 PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
 DAEMON=/usr/sbin/hald
 PIDDIR=/var/run/hald
-PIDFILE=$PIDDIR/hald.pid
+PIDFILE=$PIDDIR/pid
 NAME=hald
 DAEMONUSER=haldaemon
 DESC="Hardware abstraction layer"

diff --git a/packages/hal/hal_0.5.9.1.bb b/packages/hal/hal_0.5.9.1.bb
index 8e4ad239379d377175db1b9c27b1b441387136d9..f9dbdc6039bb0840e271c5df50fd0bba57fe9ad1 100644 (file)
--- a/packages/hal/hal_0.5.9.1.bb
+++ b/packages/hal/hal_0.5.9.1.bb
@@ -7,7 +7,7 @@ DEPENDS = "virtual/kernel dbus-glib udev intltool-native expat libusb"
 RDEPENDS_${PN} += "udev hal-info"
 RRECOMMENDS_${PN} += "udev-utils"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI = "http://freedesktop.org/~david/dist/hal-${PV}.tar.gz \
            file://configure_fix.patch;patch=1 \

diff --git a/packages/hal/hal_0.5.9.bb b/packages/hal/hal_0.5.9.bb
index d84179eb1e44a84b620941858f6947f1c9a97cbb..8015a4ceb5fd7b8675624f6289be149002cc989a 100644 (file)
--- a/packages/hal/hal_0.5.9.bb
+++ b/packages/hal/hal_0.5.9.bb
@@ -5,7 +5,7 @@ RDEPENDS += "udev hal-info"
 #RDEPENDS_hal-device-manager = "python hal python-pygnome"
 RRECOMMENDS = "udev-utils"
 
-PR = "r6"
+PR = "r7"
 
 SRC_URI += "file://99_hal \
             file://20hal \

diff --git a/packages/hal/hal_git.bb b/packages/hal/hal_git.bb
index 0cdcafd24de5a8a0ee58109b48f03bbef7356fe5..e2e941881000a1528b3456113fbd68b6062e2827 100644 (file)
--- a/packages/hal/hal_git.bb
+++ b/packages/hal/hal_git.bb
@@ -14,7 +14,7 @@ SRC_URI = "git://anongit.freedesktop.org/hal/;protocol=git \
         file://99_hal"
 
 PV = "0.5.9.1+git${SRCDATE}"
-PR = "r4"
+PR = "r5"
 
 S = "${WORKDIR}/git"