From: mb <mb@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 9 Sep 2010 23:49:46 +0000 (+0000)
Subject: pwrtray: Update.
X-Git-Url: http://207.154.207.93/?a=commitdiff_plain;h=8ace8a5005b32cb956f8680d7e05ae6de7ef9e45;p=packages.git

pwrtray: Update.



git-svn-id: svn://svn.openwrt.org/openwrt/packages@22995 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/Xorg/app/pwrtray/Makefile b/Xorg/app/pwrtray/Makefile
index a4297b7a8..f160ba0d4 100644
--- a/Xorg/app/pwrtray/Makefile
+++ b/Xorg/app/pwrtray/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pwrtray
-PKG_REV:=89c0d75ecb9efdb7ef2288635d617348c1fe5480
+PKG_REV:=e1cf5f9d31152a383612b2298f694894584127ab
 PKG_VERSION:=$(PKG_REV)
 PKG_RELEASE:=1
 
@@ -36,7 +36,9 @@ define Package/pwrtray/description
 endef
 
 EXTRA_CFLAGS:= \
-	-I$(PKG_BUILD_DIR)/moc
+	-I$(PKG_BUILD_DIR)/tray/moc \
+	-I$(STAGING_DIR)/usr/include/QtCore \
+	-I$(STAGING_DIR)/usr/include/QtGui
 
 EXTRA_LDFLAGS:= \
 	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
@@ -50,7 +52,9 @@ MAKE_VARS+= \
 #	V=1
 
 define Package/pwrtray/install
-	$(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/bin $(1)/usr/share
+	$(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-backend $(1)/usr/bin/
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray $(1)/usr/bin/
 	$(CP) $(PKG_INSTALL_DIR)/usr/share/pwrtray $(1)/usr/share/
 endef
diff --git a/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend b/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend
new file mode 100755
index 000000000..4ca60c062
--- /dev/null
+++ b/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend
@@ -0,0 +1,12 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2010 OpenWrt.org
+
+START=99
+
+start() {
+	[ -x /usr/bin/pwrtray-backend ] && /usr/bin/pwrtray-backend
+}
+
+stop() {
+	killall -q pwrtray-backend
+}