From: Tim Sander <[email protected]>

Signed-off-by: Marc Kleine-Budde <[email protected]>
---
 rules/upstart.in   |    1 +
 rules/upstart.make |   13 ++++++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/rules/upstart.in b/rules/upstart.in
index 7f10a41..e9cd712 100644
--- a/rules/upstart.in
+++ b/rules/upstart.in
@@ -3,6 +3,7 @@
 config UPSTART
        tristate
        select DBUS
+       select LIBNIH
        prompt "upstart"
        help
          upstart is a replacement for the /sbin/init daemon which
diff --git a/rules/upstart.make b/rules/upstart.make
index 38d2bad..bcc890d 100644
--- a/rules/upstart.make
+++ b/rules/upstart.make
@@ -1,6 +1,7 @@
 # -*-makefile-*-
 #
 # Copyright (C) 2009 by Robert Schwebel <[email protected]>
+#                      Tim Sander  <[email protected]>
 #
 # See CREDITS for details about who has contributed to this project.
 #
@@ -16,10 +17,10 @@ PACKAGES-$(PTXCONF_UPSTART) += upstart
 #
 # Paths and names
 #
-UPSTART_VERSION        := 0.5.1
+UPSTART_VERSION        := 0.6.5
 UPSTART                := upstart-$(UPSTART_VERSION)
-UPSTART_SUFFIX := tar.bz2
-UPSTART_URL    := 
http://upstart.ubuntu.com/download/0.5/$(UPSTART).$(UPSTART_SUFFIX)
+UPSTART_SUFFIX := tar.gz
+UPSTART_URL    := 
http://upstart.ubuntu.com/download/0.6/$(UPSTART).$(UPSTART_SUFFIX)
 UPSTART_SOURCE := $(SRCDIR)/$(UPSTART).$(UPSTART_SUFFIX)
 UPSTART_DIR    := $(BUILDDIR)/$(UPSTART)
 
@@ -87,8 +88,10 @@ $(STATEDIR)/upstart.targetinstall:
        @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/status)
        @$(call install_copy, upstart, 0, 0, 0755, -, /usr/sbin/initctl)
 
-       @$(call install_copy, upstart, 0, 0, 0755, /etc/init.d/conf.d)
-       @$(call install_copy, upstart, 0, 0, 0755, /etc/init.d/jobs.d)
+       @$(call install_copy, upstart, 0, 0, 0755, -, 
/etc/init/control-alt-delete.conf)
+       @$(call install_copy, upstart, 0, 0, 0755, -, /etc/init/rc.conf)
+       @$(call install_copy, upstart, 0, 0, 0755, -, /etc/init/rcS.conf)
+       @$(call install_copy, upstart, 0, 0, 0755, -, /etc/init/rc-sysinit.conf)
 
        @$(call install_copy, upstart, 0, 0, 0644, -, 
/etc/dbus-1/system.d/Upstart.conf)
 
-- 
1.7.0.3


-- 
ptxdist mailing list
[email protected]

Reply via email to