[oe-commits] Denis 'GNUtoo' Carikli : mpd, mpd-alsa : fix init script( start and stop were swaped in restart), bump all PR

[git version control]

Module: openembedded.git
Branch: shr/unstable
Commit: 523790db6f5307719d5609fb354430772e8d5aca
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=523790db6f5307719d5609fb354430772e8d5aca

Author: Denis 'GNUtoo' Carikli <GNUtoo at no-log.org>
Date:   Sun Apr 18 22:27:57 2010 +0200

mpd,mpd-alsa : fix init script(start and stop were swaped in restart),bump all PR

In the mpd init script,in the restart case,it first started then stopped.
Thanks to jconnolly for having noticed that it didn't restart at all

---

 recipes/musicpd/mpd-alsa_0.11.5.bb |    2 +-
 recipes/musicpd/mpd-alsa_0.14.2.bb |    2 +-
 recipes/musicpd/mpd/mpd.init       |    4 ++--
 recipes/musicpd/mpd_0.14.2.bb      |    2 +-
 recipes/musicpd/mpd_0.15.bb        |    2 ++
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/recipes/musicpd/mpd-alsa_0.11.5.bb b/recipes/musicpd/mpd-alsa_0.11.5.bb
index be02984..47a6ada 100644
--- a/recipes/musicpd/mpd-alsa_0.11.5.bb
+++ b/recipes/musicpd/mpd-alsa_0.11.5.bb
@@ -5,7 +5,7 @@ LICENSE = "GPLv2"
 DEPENDS = "libvorbis libogg libao-alsa zlib libmikmod flac audiofile virtual/libiconv \
            ${@base_conditional('ENTERPRISE_DISTRO', '1', '', 'libmad libid3tag', d)}"
 RDEPENDS = "libao-alsa"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.gz \
            file://mpd/save-volume-state.patch;patch=1 file://mpd/mpd.init"
diff --git a/recipes/musicpd/mpd-alsa_0.14.2.bb b/recipes/musicpd/mpd-alsa_0.14.2.bb
index adbf430..c9c71bb 100644
--- a/recipes/musicpd/mpd-alsa_0.14.2.bb
+++ b/recipes/musicpd/mpd-alsa_0.14.2.bb
@@ -10,7 +10,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
 file://mpd/mpd.conf \
 file://mpd/mpd.init"
 
-PR = "r3"
+PR = "r4"
 
 S = "${WORKDIR}/mpd-${PV}"
 inherit autotools update-rc.d
diff --git a/recipes/musicpd/mpd/mpd.init b/recipes/musicpd/mpd/mpd.init
index 98a75d0..2820ce7 100644
--- a/recipes/musicpd/mpd/mpd.init
+++ b/recipes/musicpd/mpd/mpd.init
@@ -19,9 +19,9 @@ case "$1" in
     ;;
   restart|force-reload)
     echo -n "Restarting music player daemon: mpd"
-    start-stop-daemon --start --quiet --exec /usr/bin/mpd
-    sleep 2
     start-stop-daemon --stop --quiet --exec /usr/bin/mpd
+    sleep 2
+    start-stop-daemon --start --quiet --exec /usr/bin/mpd
     echo "."
     ;;
   *)
diff --git a/recipes/musicpd/mpd_0.14.2.bb b/recipes/musicpd/mpd_0.14.2.bb
index 4f84dc8..f4ba6e5 100644
--- a/recipes/musicpd/mpd_0.14.2.bb
+++ b/recipes/musicpd/mpd_0.14.2.bb
@@ -9,7 +9,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
 	   file://mpd/mpd.conf \
            file://mpd/mpd.init"
 
-PR = "r4"
+PR = "r5"
 
 inherit autotools update-rc.d
 INITSCRIPT_NAME = "mpd"
diff --git a/recipes/musicpd/mpd_0.15.bb b/recipes/musicpd/mpd_0.15.bb
index a10be21..0f6295d 100644
--- a/recipes/musicpd/mpd_0.15.bb
+++ b/recipes/musicpd/mpd_0.15.bb
@@ -12,6 +12,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/musicpd/mpd-${PV}.tar.bz2 \
 inherit autotools update-rc.d
 INITSCRIPT_NAME = "mpd"
 
+PR = "r1"
+
 # Setting --enable-mpd-{mad,id3tag} causes local caches of the libraries to
 # be built, instead we use the OE built versions which should be installed
 # in staging - remove the --with and replace with --enable to use the local