[oe-commits] org.oe.dev pulseaudio: improve packaging:

[koen commit]

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

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: adf85b1ec40339e44983ef65acf414d9ad5ed6a4
ViewMTN: http://monotone.openembedded.org/revision.psp?id=adf85b1ec40339e44983ef65acf414d9ad5ed6a4
Files:
1
packages/pulseaudio/pulse.inc
packages/pulseaudio/pulseaudio_0.9.5.bb
Diffs:

#
# mt diff -r6798f7bff709d8832a9dc494fce4ac4209ea8bc8 -radf85b1ec40339e44983ef65acf414d9ad5ed6a4
#
# 
# 
# patch "packages/pulseaudio/pulse.inc"
#  from [49cb20c18bb9950a2d327522824ef326b6c4a39a]
#    to [dfb25678adb1d2a72abcc8ec418d2e951b8ff5ef]
# 
# patch "packages/pulseaudio/pulseaudio_0.9.5.bb"
#  from [a11c1056ff363bda7672ea63e72652f348e0571f]
#    to [5e6d8a62c5f2c73ef633203ff8ee3473c6092950]
# 
============================================================
--- packages/pulseaudio/pulse.inc	49cb20c18bb9950a2d327522824ef326b6c4a39a
+++ packages/pulseaudio/pulse.inc	dfb25678adb1d2a72abcc8ec418d2e951b8ff5ef
@@ -8,7 +8,7 @@ DEPENDS += "alsa-lib"
 # optional
 DEPENDS += "alsa-lib"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-${PV}.tar.gz"
 
@@ -28,31 +28,45 @@ PARALLEL_MAKE = ""
 
 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"
 
-PACKAGES =+ "${PN}-bin ${PN}-conf"
+#upgrade path:
+RREPLACES_pulseaudio-server = "libpulse-bin libpulse-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 \
============================================================
--- packages/pulseaudio/pulseaudio_0.9.5.bb	a11c1056ff363bda7672ea63e72652f348e0571f
+++ packages/pulseaudio/pulseaudio_0.9.5.bb	5e6d8a62c5f2c73ef633203ff8ee3473c6092950
@@ -1,3 +1,3 @@ require pulse.inc
 require pulse.inc
 
+PR  = "r9"
-PR  = "r8"