yeah for consistency: s/qpe/opie/

4 files changed, 7 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index a89404f..64300c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,14 +1,15 @@
         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)
 
         2004-25-04The Opie Team <opie@handhelds.org>
 
         * Released as Version 1.1.3 (devel)
         * Introduced first implementation of SQL-Support using SQLite (eilers)
         * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
         * Added a real system graffiti character set (brad)
         * Added Generic Keyconfig Widget (zecke)
         * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
         * Added new Bible reader app - opie-dagger (drw)
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,10 +1,10 @@
 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
 Maintainer: Opie Team <opie@handhelds.org>
 Architecture: arm
 Depends: task-opie-minimal
 Replaces: opie-rotation
 Description: Launcher for Opie
 Version: $QPE_VERSION$EXTRAVERSION
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
@@ -66,19 +66,19 @@ SOURCES		+= server.cpp \
 
 
 INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
         DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
 
 INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
         DEPENDPATH+= $(OPIEDIR)/rsync
 
 INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount
 DEPENDPATH  += $(OPIEDIR)/noncore/settings/mediummount
 
 LIBS        += -lqpe -lopiecore2 -lopieui2 -lqrsync
-TARGET       = qpe
+TARGET       = opie
 
 contains( $(CONFIG_TARGET_MACOSX), y ) {
   LIBS += -lcrypt
 }
 
 include ( $(OPIEDIR)/include.pro )
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
@@ -28,25 +28,25 @@ fi
 
 if [ -e /proc/cpuinfo ] ; then
         if (grep -qi "Simpad" /proc/cpuinfo) ; then
            export QWS_KEYBOARD='SIMpad'
            export QWS_DISPLAY=Transformed:Rot0:0
     fi
             if (grep -qi "HP Jornada 56x" /proc/cpuinfo) ; then
            export QWS_DISPLAY=Transformed:Rot0:0
     fi
 fi
 
 
-if [ ! -x $OPIEDIR/bin/qpe ] ; then 
+if [ ! -x $OPIEDIR/bin/opie ] ; then 
     echo Opie not installed
     exit 0  
 fi
 
 . /etc/profile
 
 case $1 in
 'start')
     cd $HOME
     rm -f /etc/rc2.d/S99x # Can't have both running!
     
     if [ -x $OPIEDIR/bin/opie-login ]; then
@@ -62,35 +62,35 @@ case $1 in
         if [ -x /usr/bin/ssh-agent ]; then
              SSHAGENT=/usr/bin/ssh-agent
         else
              SSHAGENT=""
         fi
         
         if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then
             export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
         fi
             
         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
 
     ;;
 
 'stop')
     echo "Killing Opie..."
-    killall qpe
+    killall opie
     killall opie-login
 
     ;;
 
 *)
     echo "usage: $0 { start | stop }"
 
     ;;
 
 esac