author | mickeyl <mickeyl> | 2004-04-30 14:13:38 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-30 14:13:38 (UTC) |
commit | ca3f6e77dc7ccf5ebfff346d1866bbdfae802f48 (patch) (unidiff) | |
tree | 74a80d520bec7a3eb0b7b1847d1a0e4e712b011b | |
parent | b313bfcc63e972b1dfe059d91fe364d535478c7c (diff) | |
download | opie-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.
-rw-r--r-- | ChangeLog | 1 | ||||
-rw-r--r-- | core/launcher/opie-taskbar.control | 2 | ||||
-rw-r--r-- | core/launcher/server.pro | 2 | ||||
-rwxr-xr-x | root/etc/init.d/opie | 8 |
4 files changed, 6 insertions, 7 deletions
@@ -1,19 +1,18 @@ | |||
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) | ||
4 | * Added Conversion tool for pim-data (eilers) | 3 | * Added Conversion tool for pim-data (eilers) |
5 | * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers) | 4 | * Modifcation of the PIM API for providing generic use of OPimRecords. (eilers) |
6 | 5 | ||
7 | 2004-25-04The Opie Team <opie@handhelds.org> | 6 | 2004-25-04The Opie Team <opie@handhelds.org> |
8 | 7 | ||
9 | * Released as Version 1.1.3 (devel) | 8 | * Released as Version 1.1.3 (devel) |
10 | * Introduced first implementation of SQL-Support using SQLite (eilers) | 9 | * Introduced first implementation of SQL-Support using SQLite (eilers) |
11 | * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp) | 10 | * Added a new Gutenberg Project reader app - opie-gutenbrowser (ljp) |
12 | * Added a real system graffiti character set (brad) | 11 | * Added a real system graffiti character set (brad) |
13 | * Added Generic Keyconfig Widget (zecke) | 12 | * Added Generic Keyconfig Widget (zecke) |
14 | * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke) | 13 | * Improved Screenshotapplet and Drawpad integration. You can now open a screenshot in drawpad and take notes (zecke) |
15 | * Added new Bible reader app - opie-dagger (drw) | 14 | * Added new Bible reader app - opie-dagger (drw) |
16 | * Added a new Image Viewer. Work is ongoing (zecke,alwin) | 15 | * Added a new Image Viewer. Work is ongoing (zecke,alwin) |
17 | * Added namespace usage in libopie2 and everywhere (zecke,alwin) | 16 | * Added namespace usage in libopie2 and everywhere (zecke,alwin) |
18 | * Enabled the possibility to pass command line arguments to applications (mickeyl) | 17 | * Enabled the possibility to pass command line arguments to applications (mickeyl) |
19 | * Added an about applet showing some credits and information about Opie (mickeyl) | 18 | * Added an about applet showing some credits and information about Opie (mickeyl) |
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 @@ | |||
1 | Package: opie-taskbar | 1 | Package: opie-taskbar |
2 | 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 | 2 | 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 |
3 | Priority: required | 3 | Priority: required |
4 | Section: opie/system | 4 | Section: opie/system |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
8 | Replaces: opie-rotation | 8 | Replaces: opie-rotation |
9 | Description: Launcher for Opie | 9 | Description: Launcher for Opie |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | 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 | |||
@@ -62,23 +62,23 @@ SOURCES += server.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 | ||
68 | INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate | 68 | INCLUDEPATH += $(OPIEDIR)/core/apps/calibrate |
69 | DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate | 69 | DEPENDPATH+= $(OPIEDIR)/core/apps/calibrate |
70 | 70 | ||
71 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync | 71 | INCLUDEPATH += $(OPIEDIR)/include $(OPIEDIR)/rsync |
72 | DEPENDPATH+= $(OPIEDIR)/rsync | 72 | DEPENDPATH+= $(OPIEDIR)/rsync |
73 | 73 | ||
74 | INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount | 74 | INCLUDEPATH += $(OPIEDIR)/noncore/settings/mediummount |
75 | DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount | 75 | DEPENDPATH += $(OPIEDIR)/noncore/settings/mediummount |
76 | 76 | ||
77 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync | 77 | LIBS += -lqpe -lopiecore2 -lopieui2 -lqrsync |
78 | TARGET = opie | 78 | TARGET = qpe |
79 | 79 | ||
80 | contains( $(CONFIG_TARGET_MACOSX), y ) { | 80 | contains( $(CONFIG_TARGET_MACOSX), y ) { |
81 | LIBS += -lcrypt | 81 | LIBS += -lcrypt |
82 | } | 82 | } |
83 | 83 | ||
84 | include ( $(OPIEDIR)/include.pro ) | 84 | 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 | |||
@@ -24,33 +24,33 @@ if [ -e /proc/hal/model ] ; then | |||
24 | esac | 24 | esac |
25 | else | 25 | else |
26 | export QWS_DISPLAY=Transformed:Rot270:0 | 26 | export QWS_DISPLAY=Transformed:Rot270:0 |
27 | fi | 27 | fi |
28 | 28 | ||
29 | if [ -e /proc/cpuinfo ] ; then | 29 | if [ -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 |
37 | fi | 37 | fi |
38 | 38 | ||
39 | 39 | ||
40 | if [ ! -x $OPIEDIR/bin/opie ] ; then | 40 | if [ ! -x $OPIEDIR/bin/qpe ] ; then |
41 | echo Opie not installed | 41 | echo Opie not installed |
42 | exit 0 | 42 | exit 0 |
43 | fi | 43 | fi |
44 | 44 | ||
45 | . /etc/profile | 45 | . /etc/profile |
46 | 46 | ||
47 | case $1 in | 47 | case $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 |
@@ -58,39 +58,39 @@ case $1 in | |||
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/opie 2>/dev/null >/dev/null & | 74 | $SSHAGENT $OPIEDIR/bin/qpe 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/opie 2>&1 | logger ) & | 77 | ( $SSHAGENT $OPIEDIR/bin/qpe 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 opie | 85 | killall qpe |
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 | ||
95 | esac | 95 | esac |
96 | 96 | ||