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, 7 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index a89404f..64300c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,26 +1,27 @@
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)
3 * Added Conversion tool for pim-data (eilers) 4 * Added Conversion tool for pim-data (eilers)
4 * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers) 5 * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers)
5 6
6 2004-25-04The Opie Team <opie@handhelds.org> 7 2004-25-04The Opie Team <opie@handhelds.org>
7 8
8 * Released as Version 1.1.3 (devel) 9 * Released as Version 1.1.3 (devel)
9 * Introduced first implementation of SQL-Support using SQLite (eilers) 10 * Introduced first implementation of SQL-Support using SQLite (eilers)
10 * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp) 11 * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp)
11 * Added a real system graffiti character set (brad) 12 * Added a real system graffiti character set (brad)
12 * Added Generic Keyconfig Widget (zecke) 13 * Added Generic Keyconfig Widget (zecke)
13 * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke) 14 * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke)
14 * Added new Bible reader app - opie-dagger (drw) 15 * Added new Bible reader app - opie-dagger (drw)
15 * Added a new Image Viewer. Work is ongoing (zecke,alwin) 16 * Added a new Image Viewer. Work is ongoing (zecke,alwin)
16 * Added namespace usage in libopie2 and everywhere (zecke,alwin) 17 * Added namespace usage in libopie2 and everywhere (zecke,alwin)
17 * Enabled the possibility to pass command line arguments to applications (mickeyl) 18 * Enabled the possibility to pass command line arguments to applications (mickeyl)
18 * Added an about applet showing some credits and information about Opie (mickeyl) 19 * Added an about applet showing some credits and information about Opie (mickeyl)
19 * Added benchmarking functionality to sysinfo (mickeyl) 20 * Added benchmarking functionality to sysinfo (mickeyl)
20 * Added applet and configuration application for switching hardware keyboard layouts (alwin) 21 * Added applet and configuration application for switching hardware keyboard layouts (alwin)
21 * Ported applications from libopie1 to libopie2* (drw,ar,alwin) 22 * Ported applications from libopie1 to libopie2* (drw,ar,alwin)
22 * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe) 23 * Imported fullscreen and font improvements from the Qkonsole fork to embeddedkonsole (waspe)
23 * Clean-up of package information in control files (drw) 24 * Clean-up of package information in control files (drw)
24 * Repaired mediummount which was broken since integrating the quicklauncher (alwin) 25 * Repaired mediummount which was broken since integrating the quicklauncher (alwin)
25 * Improved big-screen support (zecke,ar) 26 * Improved big-screen support (zecke,ar)
26 * Improved multikeyboard support, added keyboard layout switching applet (mouse) 27 * Improved multikeyboard support, added keyboard layout switching applet (mouse)
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 @@
1Package: opie-taskbar 1Package: opie-taskbar
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 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
3Priority: required 3Priority: required
4Section: opie/system 4Section: opie/system
5Maintainer: Opie Team <opie@handhelds.org> 5Maintainer: Opie Team <opie@handhelds.org>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal 7Depends: task-opie-minimal
8Replaces: opie-rotation 8Replaces: opie-rotation
9Description: Launcher for Opie 9Description: Launcher for Opie
10Version: $QPE_VERSION$EXTRAVERSION 10Version: $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
@@ -54,31 +54,31 @@ SOURCES += server.cpp \
54 irserver.cpp \ 54 irserver.cpp \
55 qcopbridge.cpp \ 55 qcopbridge.cpp \
56 startmenu.cpp \ 56 startmenu.cpp \
57 main.cpp \ 57 main.cpp \
58 firstuse.cpp \ 58 firstuse.cpp \
59 syncdialog.cpp \ 59 syncdialog.cpp \
60 serverapp.cpp \ 60 serverapp.cpp \
61 qprocess.cpp \ 61 qprocess.cpp \
62 qprocess_unix.cpp \ 62 qprocess_unix.cpp \
63 screensaver.cpp \ 63 screensaver.cpp \
64 $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \ 64 $$(OPIEDIR)/noncore/settings/mediummount/mediumwidget.cc \
65 mediadlg.cpp 65 mediadlg.cpp
66 66
67 67
68INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate 68INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate
69 DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate 69 DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate
70 70
71INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync 71INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync
72 DEPENDPATH+= $(OPIEDIR)/rsync 72 DEPENDPATH+= $(OPIEDIR)/rsync
73 73
74INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount 74INCLUDEPATH += $(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 = qpe 78TARGET = opie
79 79
80contains( $(CONFIG_TARGET_MACOSX), y ) { 80contains( $(CONFIG_TARGET_MACOSX), y ) {
81 LIBS += -lcrypt 81 LIBS += -lcrypt
82} 82}
83 83
84include ( $(OPIEDIR)/include.pro ) 84include ( $(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
@@ -16,81 +16,81 @@ if [ -e /proc/hal/model ] ; then
16 case "$ipaq" in 16 case "$ipaq" in
17 "3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; 17 "3100" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
18 "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 18 "3600" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
19 "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 19 "3700" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
20 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;; 20 "3800" ) export QWS_DISPLAY=Transformed:Rot90:0 ;;
21 "3900" ) export QWS_DISPLAY=Transformed:Rot270:0 ;; 21 "3900" ) export QWS_DISPLAY=Transformed:Rot270:0 ;;
22 "5400" ) export QWS_DISPLAY=Transformed:Rot0:0 ;; 22 "5400" ) export QWS_DISPLAY=Transformed:Rot0:0 ;;
23 *) echo "Unknown iPAQ model: $ipaq" ;; 23 *) echo "Unknown iPAQ model: $ipaq" ;;
24 esac 24 esac
25else 25else
26 export QWS_DISPLAY=Transformed:Rot270:0 26 export QWS_DISPLAY=Transformed:Rot270:0
27fi 27fi
28 28
29if [ -e /proc/cpuinfo ] ; then 29if [ -e /proc/cpuinfo ] ; then
30 if (grep -qi "Simpad" /proc/cpuinfo) ; then 30 if (grep -qi "Simpad" /proc/cpuinfo) ; then
31 export QWS_KEYBOARD='SIMpad' 31 export QWS_KEYBOARD='SIMpad'
32 export QWS_DISPLAY=Transformed:Rot0:0 32 export QWS_DISPLAY=Transformed:Rot0:0
33 fi 33 fi
34 if (grep -qi "HP Jornada 56x" /proc/cpuinfo) ; then 34 if (grep -qi "HP Jornada 56x" /proc/cpuinfo) ; then
35 export QWS_DISPLAY=Transformed:Rot0:0 35 export QWS_DISPLAY=Transformed:Rot0:0
36 fi 36 fi
37fi 37fi
38 38
39 39
40if [ ! -x $OPIEDIR/bin/qpe ] ; then 40if [ ! -x $OPIEDIR/bin/opie ] ; then
41 echo Opie not installed 41 echo Opie not installed
42 exit 0 42 exit 0
43fi 43fi
44 44
45. /etc/profile 45. /etc/profile
46 46
47case $1 in 47case $1 in
48'start') 48'start')
49 cd $HOME 49 cd $HOME
50 rm -f /etc/rc2.d/S99x # Can't have both running! 50 rm -f /etc/rc2.d/S99x # Can't have both running!
51 51
52 if [ -x $OPIEDIR/bin/opie-login ]; then 52 if [ -x $OPIEDIR/bin/opie-login ]; then
53 if ! killall -0 syslogd 2>/dev/null >/dev/null; then 53 if ! killall -0 syslogd 2>/dev/null >/dev/null; then
54 echo Starting Opie-login.... 54 echo Starting Opie-login....
55 $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null & 55 $OPIEDIR/bin/opie-login 2>/dev/null >/dev/null &
56 else 56 else
57 echo Starting Opie-login with syslog logging..... 57 echo Starting Opie-login with syslog logging.....
58 ( $OPIEDIR/bin/opie-login 2>&1 | logger ) & 58 ( $OPIEDIR/bin/opie-login 2>&1 | logger ) &
59 fi 59 fi
60 else 60 else
61 $OPIEDIR/bin/opie-reorgfiles 61 $OPIEDIR/bin/opie-reorgfiles
62 if [ -x /usr/bin/ssh-agent ]; then 62 if [ -x /usr/bin/ssh-agent ]; then
63 SSHAGENT=/usr/bin/ssh-agent 63 SSHAGENT=/usr/bin/ssh-agent
64 else 64 else
65 SSHAGENT="" 65 SSHAGENT=""
66 fi 66 fi
67 67
68 if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then 68 if [ -x $OPIEDIR/bin/opie-sh-ssh-askpass.sh ]; then
69 export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh 69 export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
70 fi 70 fi
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/qpe 2>/dev/null >/dev/null & 74 $SSHAGENT $OPIEDIR/bin/opie 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/qpe 2>&1 | logger ) & 77 ( $SSHAGENT $OPIEDIR/bin/opie 2>&1 | logger ) &
78 fi 78 fi
79 fi 79 fi
80 80
81 ;; 81 ;;
82 82
83'stop') 83'stop')
84 echo "Killing Opie..." 84 echo "Killing Opie..."
85 killall qpe 85 killall opie
86 killall opie-login 86 killall opie-login
87 87
88 ;; 88 ;;
89 89
90*) 90*)
91 echo "usage: $0 { start | stop }" 91 echo "usage: $0 { start | stop }"
92 92
93 ;; 93 ;;
94 94
95esac 95esac
96 96