upstart: Finer grained packaging. Fix license. New package, needs testing.

diff --git a/packages/upstart/upstart.inc b/packages/upstart/upstart.inc
index c1eaaeb..59f21c9 100644 (file)
--- a/packages/upstart/upstart.inc
+++ b/packages/upstart/upstart.inc
@@ -2,10 +2,25 @@ SECTION = "base"
 PRIORITY = "optional"
 DEPENDS = ""
 DESCRIPTION = "Event driven system init"
-LICENSE = "MPL LGPL"
+LICENSE = "GPL"
 
 inherit autotools pkgconfig 
 
+# --enable-compat builds halt, reboot, shutdown tools
+EXTRA_OECONF += "--enable-compat"
+
 do_stage () {
        autotools_stage_all
 }
+
+# libupstart can be used for upstart event generation from other programs.
+# However it is not used by upstart itself, so package it seperately.
+PACKAGES =+ "libupstart libupstart-dev"
+FILES_libupstart += "${libdir}/libupstart.so.*"
+FILES_libupstart-dev += "${libdir}/libupstart.* ${includedir}/upstart/"
+
+# upstart-sysvcompat provides Sys V Init compatible tools: halt, reboot,
+# shutdown, telinit. These might be needed by other scripts.
+PACKAGES =+ "upstart-sysvcompat upstart-sysvtools-doc"
+FILES_upstart-sysvcompat += "${sbindir}/reboot ${sbindir}/halt ${sbindir}/shutdown ${sbindir}/telinit"
+FILES_upstart-sysvcompat-doc += "${mandir}/*/reboot.* ${mandir}/*/halt.* ${mandir}/*/shutdown.* ${mandir}/*/telinit.*"

diff --git a/packages/upstart/upstart_0.3.8.bb b/packages/upstart/upstart_0.3.8.bb
index 6300270..5a4cf87 100644 (file)
--- a/packages/upstart/upstart_0.3.8.bb
+++ b/packages/upstart/upstart_0.3.8.bb
@@ -3,5 +3,5 @@ require upstart.inc
 SRC_URI = "http://upstart.ubuntu.com/download/0.3/upstart-${PV}.tar.bz2 \
 file://autoconf_version.patch;patch=1"
 
-PR = "r0"
+PR = "r1"