summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-04-30 14:13:38 (UTC)
committer mickeyl <mickeyl>2004-04-30 14:13:38 (UTC)
commitca3f6e77dc7ccf5ebfff346d1866bbdfae802f48 (patch) (side-by-side diff)
tree74a80d520bec7a3eb0b7b1847d1a0e4e712b011b
parentb313bfcc63e972b1dfe059d91fe364d535478c7c (diff)
downloadopie-ca3f6e77dc7ccf5ebfff346d1866bbdfae802f48.zip
opie-ca3f6e77dc7ccf5ebfff346d1866bbdfae802f48.tar.gz
opie-ca3f6e77dc7ccf5ebfff346d1866bbdfae802f48.tar.bz2
too bad... there is lots of hardcoded stuff and compatibility cruft which
calls for "qpe". Let's postpone this for Opie 2.0 then.
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,46 +1,45 @@
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-04 The 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)
* Added a new Image Viewer. Work is ongoing (zecke,alwin)
* Added namespace usage in libopie2 and everywhere (zecke,alwin)
* Enabled the possibility to pass command line arguments to applications (mickeyl)
* Added an about applet showing some credits and information about Opie (mickeyl)
* Added benchmarking functionality to sysinfo (mickeyl)
* Added applet and configuration application for switching hardware keyboard layouts (alwin)
* Ported applications from libopie1 to libopie2* (drw,ar,alwin)
* Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
* Clean-up of package information in control files (drw)
* Repaired mediummount which was broken since integrating the quicklauncher (alwin)
* Improved big-screen support (zecke,ar)
* Improved multikeyboard support, added keyboard layout switching applet (mouse)
* Added a new mail client based on libetpan (harlekin,alwin,jgf)
* Added new package manager - opie-packagemanager (drw)
* Improved light-n-power for C7x0 (mickeyl)
* Added automatic rotation support for C7x0 (treke)
* Split libopie1 up into a set of smaller - functionally grouped - libraries (mickeyl)
* Added scanning the wireless network neighbourhood to networksettings (mickeyl)
2003-11-29 The Opie Team <opie@handhelds.org>
* Released as Version 1.0.3
* Improved i18n (various contributors)
* Reduced application startup time by integrating the TT quicklauncher (zecke,harlekin)
* Made the Documents Tab optional (mickeyl)
* Integrated basic support for HP iPAQ 54xx and the Jornada 5xx (chicken)
2003-08-04 The Opie Team <opie@handhelds.org>
* Released as Version 1.0.0
* Including a PPP module for easy dial up (tille,harlekin,zecke)
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,10 +1,10 @@
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>
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 d4bf39b..4e6a581 100644
--- a/core/launcher/server.pro
+++ b/core/launcher/server.pro
@@ -1,84 +1,84 @@
TEMPLATE = app
CONFIG += qt warn_on
DESTDIR = $$(OPIEDIR)/bin
HEADERS += server.h \
serverinterface.h \
launchertab.h \
documentlist.h \
appicons.h \
taskbar.h \
runningappbar.h \
applauncher.h \
stabmon.h \
inputmethods.h \
systray.h \
wait.h \
shutdownimpl.h \
launcher.h \
launcherview.h \
$$(OPIEDIR)/core/apps/calibrate/calibrate.h \
startmenu.h \
transferserver.h \
qcopbridge.h \
packageslave.h \
irserver.h \
firstuse.h \
syncdialog.h \
serverapp.h \
qprocess.h \
screensaver.h \
$$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.h \
mediadlg.h
SOURCES += server.cpp \
serverinterface.cpp \
launchertab.cpp \
documentlist.cpp \
appicons.cpp \
taskbar.cpp \
runningappbar.cpp \
applauncher.cpp \
stabmon.cpp \
inputmethods.cpp \
systray.cpp \
wait.cpp \
shutdownimpl.cpp \
launcher.cpp \
launcherview.cpp \
$$(OPIEDIR)/core/apps/calibrate/calibrate.cpp \
transferserver.cpp \
packageslave.cpp \
irserver.cpp \
qcopbridge.cpp \
startmenu.cpp \
main.cpp \
firstuse.cpp \
syncdialog.cpp \
serverapp.cpp \
qprocess.cpp \
qprocess_unix.cpp \
screensaver.cpp \
$$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
mediadlg.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 = opie
+TARGET = qpe
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 a723864..d49498c 100755
--- a/root/etc/init.d/opie
+++ b/root/etc/init.d/opie
@@ -1,96 +1,96 @@
#!/bin/sh
#
[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/root
[ -z $HOME ] && export HOME=/$LOGNAME
export QTDIR=/opt/QtPalmtop
export OPIEDIR=/opt/QtPalmtop
export QPEDIR=/opt/QtPalmtop
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib
export PATH=$PATH:$OPIEDIR/bin
if [ -e /proc/hal/model ] ; then
ipaq=`cat /proc/hal/model`
case "$ipaq" in
"3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
"3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
"3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
"3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
"3900" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
"5400" ) export QWS_DISPLAY=Transformed:Rot0:0 ;;
*) echo "Unknown iPAQ model: $ipaq" ;;
esac
else
export QWS_DISPLAY=Transformed:Rot270:0
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/opie ] ; then
+if [ ! -x $OPIEDIR/bin/qpe ] ; 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
if ! killall -0 syslogd 2>/dev/null >/dev/null; then
echo Starting Opie-login....
$OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
else
echo Starting Opie-login with syslog logging.....
( $OPIEDIR/bin/opie-login 2>&1 | logger ) &
fi
else
$OPIEDIR/bin/opie-reorgfiles
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/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
;;
'stop')
echo "Killing Opie..."
- killall opie
+ killall qpe
killall opie-login
;;
*)
echo "usage: $0 { start | stop }"
;;
esac