summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKoen Kooi <koen@openembedded.org>2009-02-19 21:00:01 +0100
committerKoen Kooi <koen@openembedded.org>2009-02-19 21:00:01 +0100
commitd2c9e2e66f3d5a6674eafb76d64fd5084970ac16 (patch)
tree13b4dd93eeb53ee4b9bc91166429230d5af767da
parent41fb47bf44f61652c1223e20f754262ff398f2d9 (diff)
parent7eb0e939b5ccbdf4f094cd739f007957187de62b (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
-rw-r--r--packages/musicpd/mpd-alsa_0.14.2.bb4
-rw-r--r--packages/musicpd/mpd_0.14.2.bb4
2 files changed, 4 insertions, 4 deletions
diff --git a/packages/musicpd/mpd-alsa_0.14.2.bb b/packages/musicpd/mpd-alsa_0.14.2.bb
index 0a0cedf124..87b59a1bcf 100644
--- a/packages/musicpd/mpd-alsa_0.14.2.bb
+++ b/packages/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 = "r2"
+PR = "r3"
S = "${WORKDIR}/mpd-${PV}"
inherit autotools update-rc.d
@@ -58,5 +58,5 @@ do_configure_append() {
do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd
- install -m 755 ${WORKDIR}/mpd/mpd.conf ${D}${sysconfdir}/mpd.conf
+ install -m 644 ${WORKDIR}/mpd/mpd.conf ${D}${sysconfdir}/mpd.conf
}
diff --git a/packages/musicpd/mpd_0.14.2.bb b/packages/musicpd/mpd_0.14.2.bb
index c2d1f790fe..8aed178af2 100644
--- a/packages/musicpd/mpd_0.14.2.bb
+++ b/packages/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 = "r2"
+PR = "r3"
inherit autotools update-rc.d
INITSCRIPT_NAME = "mpd"
@@ -39,6 +39,6 @@ do_compile_prepend() {
do_install_append() {
install -d ${D}${sysconfdir}/init.d
install -m 755 ${WORKDIR}/mpd/mpd.init ${D}${sysconfdir}/init.d/mpd
- install -m 755 ${WORKDIR}/mpd/mpd.conf ${D}${sysconfdir}/mpd.conf
+ install -m 644 ${WORKDIR}/mpd/mpd.conf ${D}${sysconfdir}/mpd.conf
}