summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog1
-rw-r--r--core/launcher/opie-taskbar.control2
-rw-r--r--core/launcher/server.pro2
-rwxr-xr-xroot/etc/init.d/opie8
4 files changed, 6 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index 64300c8..a89404f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,5 @@
1 2004-??-??The Opie Team <opie@handhelds.org> 1 2004-??-??The Opie Team <opie@handhelds.org>
2 2
3 * The launcher binary is now finally called 'opie' (mickeyl)
4 * Added Conversion tool for pim-data (eilers) 3 * Added Conversion tool for pim-data (eilers)
5 * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers) 4 * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers)
6 5
diff --git a/core/launcher/opie-taskbar.control b/core/launcher/opie-taskbar.control
index d2d070c..778aff3 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,5 +1,5 @@
1Package: opie-taskbar 1Package: opie-taskbar
2Files: bin/opie apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie 2Files: bin/qpe apps/Settings/Calibrate.desktop pics/launcher pics/devicebuttons/*.png plugins/applets/libsuspendapplet.so* plugins/applets/libhomeapplet.so* plugins/applets/liblogoutapplet.so* plugins/applets/librotateapplet.so* root/etc/init.d/opie
3Priority: required 3Priority: required
4Section: opie/system 4Section: opie/system
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index d4bf39b..4e6a581 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -75,7 +75,7 @@ INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
75DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount 75DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount
76 76
77LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync 77LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync
78TARGET = opie 78TARGET = qpe
79 79
80contains( $(CONFIG_TARGET_MACOSX), y ) { 80contains( $(CONFIG_TARGET_MACOSX), y ) {
81 LIBS += -lcrypt 81 LIBS += -lcrypt
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index a723864..d49498c 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -37,7 +37,7 @@ if [ -e /proc/cpuinfo ] ; then
37fi 37fi
38 38
39 39
40if [ ! -x $OPIEDIR/bin/opie ] ; then 40if [ ! -x $OPIEDIR/bin/qpe ] ; then
41 echo Opie not installed 41 echo Opie not installed
42 exit 0 42 exit 0
43fi 43fi
@@ -71,10 +71,10 @@ case $1 in
71 71
72 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 72 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
73 echo Starting Opie.... 73 echo Starting Opie....
74 $SSHAGENT $OPIEDIR/bin/opie 2>/dev/null >/dev/null & 74 $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
75 else 75 else
76 echo Starting Opie with syslog logging..... 76 echo Starting Opie with syslog logging.....
77 ( $SSHAGENT $OPIEDIR/bin/opie 2>&1 | logger ) & 77 ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
78 fi 78 fi
79 fi 79 fi
80 80
@@ -82,7 +82,7 @@ case $1 in
82 82
83'stop') 83'stop')
84 echo "Killing Opie..." 84 echo "Killing Opie..."
85 killall opie 85 killall qpe
86 killall opie-login 86 killall opie-login
87 87
88 ;; 88 ;;