4 files changed, 7 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a89404f..64300c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +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 778aff3..d2d070c 100644
--- a/core/launcher/opie-taskbar.control
+++ b/core/launcher/opie-taskbar.control
@@ -1,4 +1,4 @@
 Package: opie-taskbar
-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
+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
 Priority: required
 Section: opie/system
diff --git a/core/launcher/server.pro b/core/launcher/server.pro
index 4e6a581..d4bf39b 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -76,5 +76,5 @@ DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
 
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqrsync
-TARGET       = qpe
+TARGET       = opie
 
 contains( $(CONFIG_TARGET_MACOSX), y ) {
diff --git a/root/etc/init.d/opie b/root/etc/init.d/opie
index d49498c..a723864 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -38,5 +38,5 @@ fi
 
 
-if [ ! -x $OPIEDIR/bin/qpe ] ; then 
+if [ ! -x $OPIEDIR/bin/opie ] ; then 
     echo Opie not installed
     exit 0  
@@ -72,8 +72,8 @@ case $1 in
         if ! killall -0 syslogd 2>/dev/null >/dev/null; then
             echo Starting Opie....
-            $SSHAGENT $OPIEDIR/bin/qpe 2>/dev/null >/dev/null &
+            $SSHAGENT $OPIEDIR/bin/opie 2>/dev/null >/dev/null &
         else
             echo Starting Opie with syslog logging.....
-            ( $SSHAGENT $OPIEDIR/bin/qpe 2>&1 | logger ) &
+            ( $SSHAGENT $OPIEDIR/bin/opie 2>&1 | logger ) &
         fi
     fi
@@ -83,5 +83,5 @@ case $1 in
 'stop')
     echo "Killing Opie..."
-    killall qpe
+    killall opie
     killall opie-login