pulseaudio: improve packaging:

* more granular
* proper Replaces: for a good upgrade path
* proper CONFFILES

diff --git a/packages/pulseaudio/pulse.inc b/packages/pulseaudio/pulse.inc
index 9cbf9a3..c8cb6dc 100644 (file)
--- a/packages/pulseaudio/pulse.inc
+++ b/packages/pulseaudio/pulse.inc
@@ -8,7 +8,7 @@ DEPENDS = "libatomics-ops liboil avahi libsamplerate0 libsndfile1 libtool"
 # optional
 DEPENDS += "alsa-lib"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
 
@@ -28,31 +28,45 @@ EXTRA_OECONF = "\
 
 PARALLEL_MAKE = ""
 
-export TARGET_FPU="${TARGET_FPU}"
+export TARGET_PFPU="${TARGET_FPU}"
 
 do_install_append() {
        install -d ${D}${sysconfdir}/default/volatiles
        install -m 0644 ${WORKDIR}/volatiles.04_pulse  ${D}${sysconfdir}/default/volatiles/volatiles.04_pulse
        
-       if [ "x${TARGET_FPU}" == "xsoft" ] ; then 
+       if [ "x${TARGET_PFPU}" == "xsoft" ] ; then 
             sed -i -e s:\;\ resample-method\ =\ sinc-fastest:resample-method\ =\ trivial: ${D}${sysconfdir}/pulse/daemon.conf
        fi
 }
 
 
-LEAD_SONAME = "libpulse.so"
+PACKAGES =+ "libpulsecore libpulse libpulse-simple libpulse-browse libpulse-mainloop-glib pulseaudio-server \
+            pulseaudio-misc pulseaudio-gconf-helper"
+
+#upgrade path:
+RREPLACES_pulseaudio-server = "libpulse-bin libpulse-conf"
+
 
-PACKAGES =+ "${PN}-bin ${PN}-conf"
 PACKAGES_DYNAMIC = "pulseaudio-lib* pulseaudio-module* libpulse-lib* libpulse-module* "
 
+
+FILES_libpulsecore = "${libdir}/libpulsecore.so.*"
+FILES_libpulse = "${libdir}/libpulse.so.*"
+FILES_libpulse-simple = "${libdir}/libpulse-simple.so.*"
+FILES_libpulse-browse = "${libdir}/libpulse-browse.so.*"
+FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
+                                        
 FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
                     ${libdir}/pulse-0.9/modules/.debug"
 FILES_${PN}-dev += "${libdir}/pulse-0.9/modules/*.la"              
 FILES_${PN}-conf = "${sysconfdir}"
 FILES_${PN}-bin = "${bindir}/* \
                    ${sysconfdir}/default/volatiles/volatiles.04_pulse"
+FILES_${PN}-server = "${bindir}/pulseaudio ${sysconfdir}"
+FILES_${PN}-gconf-helper = "${libexecdir}/pulse/gconf-helper"
+FILES_${PN}-misc = "${bindir}/*"
 
-CONFFILES_${PN}-conf = "\ 
+CONFFILES_pulseaudio-server = "\ 
                        ${sysconfdir}/pulse/default.pa \
                       ${sysconfdir}/pulse/daemon.conf \
                       ${sysconfdir}/pulse/client.conf \

diff --git a/packages/pulseaudio/pulseaudio_0.9.5.bb b/packages/pulseaudio/pulseaudio_0.9.5.bb
index 4eb2e45..dda2353 100644 (file)
--- a/packages/pulseaudio/pulseaudio_0.9.5.bb
+++ b/packages/pulseaudio/pulseaudio_0.9.5.bb
@@ -1,3 +1,3 @@
 require pulse.inc
 
-PR  = "r8"
+PR  = "r9"