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

diff --git a/recipes/musicpd/mpd-alsa_0.11.5.bb b/recipes/musicpd/mpd-alsa_0.11.5.bb
index be02984cbd40c138c68b2996e65a59ecfbbe8d78..47a6ada62d0e95a49a3c4d701f21b8b0a522fe4b 100644 (file)
--- 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 adbf430e6781f3c94f88818cd8915cf340df3bab..c9c71bb3cad075dccd3e23a9906760054427820a 100644 (file)
--- 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 98a75d0af7cc2bc3ce9871421e7eb3ace9f856b5..2820ce7add183b678d09d0e272360e321e6f1b3b 100644 (file)
--- 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 4f84dc83bd05b2af76a224228b81d2cfff6d7173..f4ba6e570e89e37357b5260dc986a2213b1e1db5 100644 (file)
--- 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 a10be212ccdc1812951f141014d21b4d713ce432..0f6295da9368cb38fdf477ce84d20e6c43a09285 100644 (file)
--- 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