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 @@
         2004-??-??The Opie Team <opie@handhelds.org>
 
-        * The launcher binary is now finally called 'opie' (mickeyl)
         * Added Conversion tool for pim-data (eilers)
         * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers)
 
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 @@
 Package: opie-taskbar
-Files: 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
+Files: 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
 Priority: required
 Section: opie/system
 Maintainer: 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
 DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
 
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqrsync
-TARGET       = opie
+TARGET       = qpe
 
 contains( $(CONFIG_TARGET_MACOSX), y ) {
   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
 fi
 
 
-if [ ! -x $OPIEDIR/bin/opie ] ; then 
+if [ ! -x $OPIEDIR/bin/qpe ] ; then 
     echo Opie not installed
     exit 0  
 fi
@@ -71,10 +71,10 @@ case $1 in
             
         if ! killall -0 syslogd 2>/dev/null >/dev/null; then
             echo Starting Opie....
-            $SSHAGENT $OPIEDIR/bin/opie 2>/dev/null >/dev/null &
+            $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
         else
             echo Starting Opie with syslog logging.....
-            ( $SSHAGENT $OPIEDIR/bin/opie 2>&1 | logger ) &
+            ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
         fi
     fi
 
@@ -82,7 +82,7 @@ case $1 in
 
 'stop')
     echo "Killing Opie..."
-    killall opie
+    killall qpe
     killall opie-login
 
     ;;