45 files changed, 70 insertions, 46 deletions
@@ -1,205 +1,213 @@ | |||
1 | .phony: force | 1 | .phony: force |
2 | force: | 2 | force: |
3 | 3 | ||
4 | $(configs) : | 4 | $(configs) : |
5 | $(call makecfg,$@) | 5 | $(call makecfg,$@) |
6 | 6 | ||
7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config | 7 | $(TOPDIR)/gen.pro : $(TOPDIR)/.config |
8 | echo > $@ | 8 | echo > $@ |
9 | # added for threaded version | 9 | # added for threaded version |
10 | ifneq ($(CONFIG_THREADED),) | 10 | ifneq ($(CONFIG_THREADED),) |
11 | echo CONFIG += thread >> $@ | 11 | echo CONFIG += thread >> $@ |
12 | else | 12 | else |
13 | echo CONFIG -= thread >> $@ | 13 | echo CONFIG -= thread >> $@ |
14 | endif | 14 | endif |
15 | # added for auto stripped build | ||
16 | ifneq ($(CONFIG_STRIP),) | ||
17 | echo CONFIG += strip >> $@ | ||
18 | endif | ||
15 | ifneq ($(CONFIG_DEBUG),) | 19 | ifneq ($(CONFIG_DEBUG),) |
16 | echo CONFIG += debug >> $@ | 20 | echo CONFIG += debug >> $@ |
17 | echo CONFIG -= release >> $@ | 21 | echo CONFIG -= release >> $@ |
18 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ | 22 | echo DEFINES += "QT_COMPONENT_DEBUG=2" >> $@ |
19 | echo DEFINES += QT_DEBUG >> $@ | 23 | echo DEFINES += QT_DEBUG >> $@ |
20 | else | 24 | else |
21 | echo CONFIG -= debug >> $@ | 25 | echo CONFIG -= debug >> $@ |
22 | echo CONFIG += release >> $@ | 26 | echo CONFIG += release >> $@ |
23 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ | 27 | echo DEFINES += "OPIE_NO_DEBUG" >> $@ |
24 | endif | 28 | endif |
25 | ifeq ($(CONFIG_STATIC),y) | 29 | ifeq ($(CONFIG_STATIC),y) |
26 | echo !contains\( TARGET,qpe \) \{ >> $@ | 30 | echo !contains\( TARGET,qpe \) \{ >> $@ |
27 | echo CONFIG += staticlib >> $@ | 31 | echo CONFIG += staticlib >> $@ |
28 | echo \} >> $@ | 32 | echo \} >> $@ |
29 | endif | 33 | endif |
30 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 | 34 | ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3 |
31 | echo CONFIG -= qt3 >> $@ | 35 | echo CONFIG -= qt3 >> $@ |
32 | else | 36 | else |
33 | echo CONFIG += qt3 >> $@ | 37 | echo CONFIG += qt3 >> $@ |
34 | endif | 38 | endif |
35 | ifneq ($(CONFIG_QUICK_LAUNCH),) | 39 | ifneq ($(CONFIG_QUICK_LAUNCH),) |
36 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 40 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
37 | echo CONFIG -= staticlib >> $@ | 41 | echo CONFIG -= staticlib >> $@ |
38 | echo CONFIG -= quick-app >> $@ | 42 | echo CONFIG -= quick-app >> $@ |
39 | echo CONFIG += quick-app-lib >> $@ | 43 | echo CONFIG += quick-app-lib >> $@ |
40 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ | 44 | echo QUICKLAUNCH_PATH = $(CONFIG_QUICKLAUNCH_PATH) >> $@ |
41 | echo \} >> $@ | 45 | echo \} >> $@ |
42 | else | 46 | else |
43 | echo contains\( CONFIG, quick-app \) \{ >> $@ | 47 | echo contains\( CONFIG, quick-app \) \{ >> $@ |
44 | echo CONFIG -= quick-app >> $@ | 48 | echo CONFIG -= quick-app >> $@ |
45 | echo CONFIG += quick-app-bin >> $@ | 49 | echo CONFIG += quick-app-bin >> $@ |
46 | echo \} >> $@ | 50 | echo \} >> $@ |
47 | endif | 51 | endif |
48 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) | 52 | ifeq ($(CONFIG_SQL_PIM_BACKEND),y) |
49 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ | 53 | echo ENABLE_SQL_PIM_BACKEND=$(CONFIG_SQL_PIM_BACKEND) >> $@ |
50 | else | 54 | else |
51 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ | 55 | echo ENABLE_SQL_PIM_BACKEND=n >> $@ |
52 | endif | 56 | endif |
53 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) | 57 | ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y) |
54 | echo CONFIG += no-override >> $@ | 58 | echo CONFIG += no-override >> $@ |
55 | endif | 59 | endif |
56 | ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) | 60 | ifeq ($(CONFIG_OPIELOGIN_USEPAM),y) |
57 | echo CONFIG += OPIELOGIN_USEPAM >> $@ | 61 | echo CONFIG += OPIELOGIN_USEPAM >> $@ |
58 | endif | 62 | endif |
59 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) | 63 | ifeq ($(CONFIG_LIBQPE_WITHROHFEEDBACK),y) |
60 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ | 64 | echo CONFIG += LIBQPE_WITHROHFEEDBACK >> $@ |
61 | endif | 65 | endif |
62 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) | 66 | ifeq ($(CONFIG_OPIE_NO_ERASERECT_FIX),y) |
63 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ | 67 | echo DEFINES += OPIE_NO_ERASE_RECT_HACKFIX >> $@ |
64 | endif | 68 | endif |
65 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) | 69 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_SHUTDOWN),y) |
66 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ | 70 | echo DEFINES += OPIE_NO_BUILTIN_SHUTDOWN >> $@ |
67 | endif | 71 | endif |
68 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) | 72 | ifeq ($(CONFIG_OPIE_NO_BUILTIN_CALIBRATE),y) |
69 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ | 73 | echo DEFINES += OPIE_NO_BUILTIN_CALIBRATE >> $@ |
70 | endif | 74 | endif |
71 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) | 75 | ifeq ($(CONFIG_USE_REALTIME_AUDIO_THREAD),y) |
72 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ | 76 | echo DEFINES += USE_REALTIME_AUDIO_THREAD >> $@ |
73 | endif | 77 | endif |
74 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) | 78 | ifeq ($(CONFIG_USE_FILE_NOTIFICATION),y) |
75 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ | 79 | echo DEFINES += USE_FILE_NOTIFICATION >> $@ |
76 | endif | 80 | endif |
77 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) | 81 | ifeq ($(CONFIG_QT_QWS_ALLOW_CLOCK),y) |
78 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ | 82 | echo DEFINES += QT_QWS_ALLOW_OVERCLOCK >> $@ |
79 | endif | 83 | endif |
80 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) | 84 | ifeq ($(CONFIG_OPIE_NEW_ALLOC),y) |
81 | echo DEFINES += OPIE_NEW_MALLOC >> $@ | 85 | echo DEFINES += OPIE_NEW_MALLOC >> $@ |
82 | endif | 86 | endif |
83 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) | 87 | ifeq ($(CONFIG_OPIE_NO_SOUND_PCM_READ_BITS),y) |
84 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ | 88 | echo DEFINES += OPIE_NO_SOUND_PCM_READ_BITS >> $@ |
85 | endif | 89 | endif |
86 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ | 90 | echo DEFINES += OPIE_SOUND_FRAGMENT_SHIFT=$(CONFIG_OPIE_SOUND_FRAGMENT_SHIFT) >> $@ |
87 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) | 91 | ifeq ($(CONFIG_OPIE_WE_VERSION_OVERRIDE),y) |
88 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ | 92 | echo DEFINES += OPIE_WE_VERSION=$(CONFIG_OPIE_WE_VERSION) >> $@ |
89 | endif | 93 | endif |
90 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) | 94 | ifeq ($(CONFIG_OPIE_TASKBAR_LOCK_KEY_STATE),y) |
91 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ | 95 | echo DEFINES += OPIE_TASKBAR_LOCK_KEY_STATE >> $@ |
92 | endif | 96 | endif |
93 | # Write LIB dirs and INC dirs... | 97 | # Write LIB dirs and INC dirs... |
94 | ifeq ($(CONFIG_LIBETPAN_DEP),y) | 98 | ifeq ($(CONFIG_LIBETPAN_DEP),y) |
95 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ | 99 | echo LIBETPAN_LIB_DIR = $(CONFIG_LIBETPAN_LIB_DIR) >> $@ |
96 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ | 100 | echo LIBETPAN_INC_DIR = $(CONFIG_LIBETPAN_INC_DIR) >> $@ |
97 | endif | 101 | endif |
98 | ifeq ($(CONFIG_LIBPCAP_DEP),y) | 102 | ifeq ($(CONFIG_LIBPCAP_DEP),y) |
99 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ | 103 | echo LIBPCAP_LIB_DIR = $(CONFIG_LIBPCAP_LIB_DIR) >> $@ |
100 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ | 104 | echo LIBPCAP_INC_DIR = $(CONFIG_LIBPCAP_INC_DIR) >> $@ |
101 | endif | 105 | endif |
102 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) | 106 | ifeq ($(CONFIG_LIBSQLITE_DEP),y) |
103 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ | 107 | echo LIBSQLITE_LIB_DIR = $(CONFIG_LIBSQLITE_LIB_DIR) >> $@ |
104 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ | 108 | echo LIBSQLITE_INC_DIR = $(CONFIG_LIBSQLITE_INC_DIR) >> $@ |
105 | endif | 109 | endif |
106 | ifeq ($(CONFIG_LIBXINE_DEP),y) | 110 | ifeq ($(CONFIG_LIBXINE_DEP),y) |
107 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ | 111 | echo LIBXINE_LIB_DIR = $(CONFIG_LIBXINE_LIB_DIR) >> $@ |
108 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ | 112 | echo LIBXINE_INC_DIR = $(CONFIG_LIBXINE_INC_DIR) >> $@ |
109 | endif | 113 | endif |
114 | ifeq ($(CONFIG_LIBBLUEZ_DEP),y) | ||
115 | echo LIBBLUEZ_LIB_DIR = $(CONFIG_LIBBLUEZ_LIB_DIR) >> $@ | ||
116 | echo LIBBLUEZ_INC_DIR = $(CONFIG_LIBBLUEZ_INC_DIR) >> $@ | ||
117 | endif | ||
110 | ifeq ($(CONFIG_LIBIPK_DEP),y) | 118 | ifeq ($(CONFIG_LIBIPK_DEP),y) |
111 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ | 119 | echo LIBIPK_LIB_DIR = $(CONFIG_LIBIPK_LIB_DIR) >> $@ |
112 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ | 120 | echo LIBIPK_INC_DIR = $(CONFIG_LIBIPK_INC_DIR) >> $@ |
113 | endif | 121 | endif |
114 | ifeq ($(CONFIG_LIBSDK_DEP),y) | 122 | ifeq ($(CONFIG_LIBSDK_DEP),y) |
115 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ | 123 | echo LIBSDL_LIB_DIR = $(CONFIG_LIBSDL_LIB_DIR) >> $@ |
116 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ | 124 | echo LIBSDL_INC_DIR = $(CONFIG_LIBSDL_INC_DIR) >> $@ |
117 | endif | 125 | endif |
118 | ifeq ($(CONFIG_LIBSWORD_DEP),y) | 126 | ifeq ($(CONFIG_LIBSWORD_DEP),y) |
119 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ | 127 | echo LIBSWORD_LIB_DIR = $(CONFIG_LIBSWORD_LIB_DIR) >> $@ |
120 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ | 128 | echo LIBSWORD_INC_DIR = $(CONFIG_LIBSWORD_INC_DIR) >> $@ |
121 | endif | 129 | endif |
122 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages | 130 | $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages |
123 | @echo Generating dependency information... | 131 | @echo Generating dependency information... |
124 | # add to subdir-y, and add descend rules | 132 | # add to subdir-y, and add descend rules |
125 | @cat $(TOPDIR)/packages | grep -v '^#' | \ | 133 | @cat $(TOPDIR)/packages | grep -v '^#' | \ |
126 | awk '{print \ | 134 | awk '{print \ |
127 | ".PHONY : " $$2 "\n" \ | 135 | ".PHONY : " $$2 "\n" \ |
128 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ | 136 | "subdir-$$(" $$1 ") += " $$2 "\n\n"; \ |
129 | print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends | 137 | print $$2 " : " $$2 "/Makefile\n\t+$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends |
130 | cat $(TOPDIR)/packages | grep -v '^#' | \ | 138 | cat $(TOPDIR)/packages | grep -v '^#' | \ |
131 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ | 139 | perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \ |
132 | >> $(TOPDIR)/.depends | 140 | >> $(TOPDIR)/.depends |
133 | # interpackage dependency generation | 141 | # interpackage dependency generation |
134 | @cat $(TOPDIR)/packages | \ | 142 | @cat $(TOPDIR)/packages | \ |
135 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends | 143 | $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends |
136 | 144 | ||
137 | $(TOPDIR)/.depends.cfgs: | 145 | $(TOPDIR)/.depends.cfgs: |
138 | # config.in interdependencies | 146 | # config.in interdependencies |
139 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs | 147 | @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs |
140 | @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ | 148 | @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@ |
141 | @-rm -f dirs | 149 | @-rm -f dirs |
142 | 150 | ||
143 | $(QTDIR)/stamp-headers : | 151 | $(QTDIR)/stamp-headers : |
144 | @-rm -f $(QTDIR)/stamp-headers* | 152 | @-rm -f $(QTDIR)/stamp-headers* |
145 | ( cd $(QTDIR)/include; \ | 153 | ( cd $(QTDIR)/include; \ |
146 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ | 154 | $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \ |
147 | qcopchannel_qws.h qwindowsystem_qws.h \ | 155 | qcopchannel_qws.h qwindowsystem_qws.h \ |
148 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) | 156 | qfontmanager_qws.h qwsdefaultdecoration_qws.h)) |
149 | touch $@ | 157 | touch $@ |
150 | 158 | ||
151 | $(QTDIR)/stamp-headers-x11 : | 159 | $(QTDIR)/stamp-headers-x11 : |
152 | @-rm -f $(QTDIR)/stamp-headers* | 160 | @-rm -f $(QTDIR)/stamp-headers* |
153 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) | 161 | cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h) |
154 | touch $@ | 162 | touch $@ |
155 | 163 | ||
156 | $(OPIEDIR)/stamp-headers : | 164 | $(OPIEDIR)/stamp-headers : |
157 | @-rm -f $(OPIEDIR)/stamp-headers* | 165 | @-rm -f $(OPIEDIR)/stamp-headers* |
158 | mkdir -p $(TOPDIR)/include/qpe \ | 166 | mkdir -p $(TOPDIR)/include/qpe \ |
159 | $(TOPDIR)/include/qtopia \ | 167 | $(TOPDIR)/include/qtopia \ |
160 | $(TOPDIR)/include/opie \ | 168 | $(TOPDIR)/include/opie \ |
161 | $(TOPDIR)/include/opie2 \ | 169 | $(TOPDIR)/include/opie2 \ |
162 | $(TOPDIR)/include/opie2/private \ | 170 | $(TOPDIR)/include/opie2/private \ |
163 | $(TOPDIR)/include/qtopia/private \ | 171 | $(TOPDIR)/include/qtopia/private \ |
164 | $(TOPDIR)/include/sl | 172 | $(TOPDIR)/include/sl |
165 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 173 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
166 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 174 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
167 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 175 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
168 | # libopie2 | 176 | # libopie2 |
169 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) | 177 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; ) |
170 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) | 178 | ( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; ) |
171 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) | 179 | ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; ) |
172 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) | 180 | ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; ) |
173 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) | 181 | ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; ) |
174 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) | 182 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; ) |
175 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) | 183 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; ) |
176 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) | 184 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; ) |
177 | ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) | 185 | ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; ) |
178 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) | 186 | ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; ) |
179 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) | 187 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; ) |
180 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) | 188 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; ) |
181 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) | 189 | ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; ) |
182 | ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) | 190 | ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; ) |
183 | # auxilliary libraries | 191 | # auxilliary libraries |
184 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) | 192 | ( cd include/opie2 && ln -sf ../../libqtaux/*.h .; ) |
185 | ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) | 193 | ( cd include/sl && ln -sf ../../libslcompat/*.h .; ) |
186 | ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) | 194 | ( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; ) |
187 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) | 195 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; ) |
188 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) | 196 | ( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; ) |
189 | # all | 197 | # all |
190 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 198 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
191 | ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) | 199 | ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done ) |
192 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ | 200 | ( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \ |
193 | ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) | 201 | ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done ) |
194 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h | 202 | ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h |
195 | touch $@ | 203 | touch $@ |
196 | 204 | ||
197 | $(OPIEDIR)/stamp-headers-x11 : | 205 | $(OPIEDIR)/stamp-headers-x11 : |
198 | @-rm -f $(OPIEDIR)/stamp-headers* | 206 | @-rm -f $(OPIEDIR)/stamp-headers* |
199 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ | 207 | mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \ |
200 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private | 208 | $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private |
201 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) | 209 | ( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; ) |
202 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) | 210 | ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; ) |
203 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) | 211 | ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; ) |
204 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) | 212 | ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; ) |
205 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) | 213 | ( cd include/opie && ln -sf ../../libsql/*.h .; ) |
diff --git a/core/multimedia/opieplayer/modplug/opie-modplugin.control b/core/multimedia/opieplayer/modplug/opie-modplugin.control index 9e0957b..6e9ad7c 100644 --- a/core/multimedia/opieplayer/modplug/opie-modplugin.control +++ b/core/multimedia/opieplayer/modplug/opie-modplugin.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-modplugin | 1 | Package: opie-modplugin |
2 | Files: plugins/codecs/libmodplugin.so* | 2 | Files: plugins/codecs/libmodplugin.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: libs | 4 | Section: libs |
5 | Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> | 5 | Maintainer: Simon Hausmann <hausmann@kde.org>, L.J. Potter <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 2.0.2-$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: MOD/XM/S3M/IT plugin using libmodplug | 9 | Description: MOD/XM/S3M/IT plugin using libmodplug |
10 | Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment. | 10 | Plugin to play MOD/XM/S3M/IT amiga tracker modules with the mediaplayer in the Opie environment. |
diff --git a/core/pim/addressbook/addressbook.cpp b/core/pim/addressbook/addressbook.cpp index 0654e1a..3f0ac74 100644 --- a/core/pim/addressbook/addressbook.cpp +++ b/core/pim/addressbook/addressbook.cpp | |||
@@ -1,166 +1,166 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de) | 3 | ** Copyright (C) 2003 Stefan Eilers (eilers.stefan@epost.de) |
4 | ** | 4 | ** |
5 | ** This file is part of the Open Palmtop Environment (see www.opie.info). | 5 | ** This file is part of the Open Palmtop Environment (see www.opie.info). |
6 | ** | 6 | ** |
7 | ** This file may be distributed and/or modified under the terms of the | 7 | ** This file may be distributed and/or modified under the terms of the |
8 | ** GNU General Public License version 2 as published by the Free Software | 8 | ** GNU General Public License version 2 as published by the Free Software |
9 | ** Foundation and appearing in the file LICENSE.GPL included in the | 9 | ** Foundation and appearing in the file LICENSE.GPL included in the |
10 | ** packaging of this file. | 10 | ** packaging of this file. |
11 | ** | 11 | ** |
12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 12 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 13 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
14 | ** | 14 | ** |
15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 15 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
16 | ** | 16 | ** |
17 | ** | 17 | ** |
18 | **********************************************************************/ | 18 | **********************************************************************/ |
19 | 19 | ||
20 | #define QTOPIA_INTERNAL_FD | 20 | #define QTOPIA_INTERNAL_FD |
21 | 21 | ||
22 | // #include "addresssettings.h" | 22 | // #include "addresssettings.h" |
23 | #include "addressbook.h" | 23 | #include "addressbook.h" |
24 | 24 | ||
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <opie2/ofileselector.h> | 26 | #include <opie2/ofileselector.h> |
27 | #include <opie2/ofiledialog.h> | 27 | #include <opie2/ofiledialog.h> |
28 | #include <opie2/opimcontact.h> | 28 | #include <opie2/opimcontact.h> |
29 | #include <opie2/ocontactaccessbackend_vcard.h> | 29 | #include <opie2/ocontactaccessbackend_vcard.h> |
30 | 30 | ||
31 | #include <qpe/resource.h> | 31 | #include <qpe/resource.h> |
32 | #include <qpe/ir.h> | 32 | #include <qpe/ir.h> |
33 | #include <qpe/qpemessagebox.h> | 33 | #include <qpe/qpemessagebox.h> |
34 | #include <qmenubar.h> | 34 | #include <qmenubar.h> |
35 | // #include <qtoolbar.h> | 35 | // #include <qtoolbar.h> |
36 | // #include <qmenubar.h> | 36 | // #include <qmenubar.h> |
37 | #include <qpe/qpeapplication.h> | 37 | #include <qpe/qpeapplication.h> |
38 | 38 | ||
39 | #include <qaction.h> | 39 | #include <qaction.h> |
40 | #include <qlayout.h> | 40 | #include <qlayout.h> |
41 | #include <qmessagebox.h> | 41 | #include <qmessagebox.h> |
42 | #include <qtoolbutton.h> | 42 | #include <qtoolbutton.h> |
43 | 43 | ||
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
45 | #include <sys/stat.h> | 45 | #include <sys/stat.h> |
46 | #include <sys/types.h> | 46 | #include <sys/types.h> |
47 | #include <fcntl.h> | 47 | #include <fcntl.h> |
48 | #include <unistd.h> | 48 | #include <unistd.h> |
49 | 49 | ||
50 | 50 | ||
51 | #include "picker.h" | 51 | #include "picker.h" |
52 | #include "configdlg.h" | 52 | #include "configdlg.h" |
53 | 53 | ||
54 | extern QString addressbookPersonalVCardName(); | 54 | extern QString addressbookPersonalVCardName(); |
55 | 55 | ||
56 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, | 56 | AddressbookWindow::AddressbookWindow( QWidget *parent, const char *name, |
57 | WFlags f ) | 57 | WFlags f ) |
58 | : QMainWindow( parent, name, f ), | 58 | : QMainWindow( parent, name, f ), |
59 | catMenu (0l), | 59 | catMenu (0l), |
60 | abEditor(0l), | 60 | abEditor(0l), |
61 | syncing(FALSE), | 61 | syncing(FALSE), |
62 | m_tableViewButton(0l), | 62 | m_tableViewButton(0l), |
63 | m_cardViewButton(0l) | 63 | m_cardViewButton(0l) |
64 | { | 64 | { |
65 | isLoading = true; | 65 | isLoading = true; |
66 | 66 | ||
67 | m_config.load(); | 67 | m_config.load(); |
68 | 68 | ||
69 | setCaption( tr("Contacts") ); | 69 | setCaption( tr("Contacts") ); |
70 | setIcon( Resource::loadPixmap( "AddressBook" ) ); | 70 | setIcon( Resource::loadPixmap( "addressbook/AddressBook" ) ); |
71 | 71 | ||
72 | // Settings for Main Menu | 72 | // Settings for Main Menu |
73 | // setToolBarsMovable( false ); | 73 | // setToolBarsMovable( false ); |
74 | setToolBarsMovable( !m_config.fixedBars() ); | 74 | setToolBarsMovable( !m_config.fixedBars() ); |
75 | setRightJustification( true ); | 75 | setRightJustification( true ); |
76 | 76 | ||
77 | QToolBar *bar = new QToolBar( this ); | 77 | QToolBar *bar = new QToolBar( this ); |
78 | bar->setHorizontalStretchable( TRUE ); | 78 | bar->setHorizontalStretchable( TRUE ); |
79 | 79 | ||
80 | QMenuBar *mbList = new QMenuBar( bar ); | 80 | QMenuBar *mbList = new QMenuBar( bar ); |
81 | mbList->setMargin( 0 ); | 81 | mbList->setMargin( 0 ); |
82 | 82 | ||
83 | QPopupMenu *edit = new QPopupMenu( mbList ); | 83 | QPopupMenu *edit = new QPopupMenu( mbList ); |
84 | mbList->insertItem( tr( "Contact" ), edit ); | 84 | mbList->insertItem( tr( "Contact" ), edit ); |
85 | 85 | ||
86 | // Category Menu | 86 | // Category Menu |
87 | catMenu = new QPopupMenu( this ); | 87 | catMenu = new QPopupMenu( this ); |
88 | catMenu->setCheckable( TRUE ); | 88 | catMenu->setCheckable( TRUE ); |
89 | connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) ); | 89 | connect( catMenu, SIGNAL(activated(int)), this, SLOT(slotSetCategory(int)) ); |
90 | mbList->insertItem( tr("View"), catMenu ); | 90 | mbList->insertItem( tr("View"), catMenu ); |
91 | 91 | ||
92 | // Create Toolbar | 92 | // Create Toolbar |
93 | listTools = new QToolBar( this, "list operations" ); | 93 | listTools = new QToolBar( this, "list operations" ); |
94 | listTools->setHorizontalStretchable( true ); | 94 | listTools->setHorizontalStretchable( true ); |
95 | addToolBar( listTools ); | 95 | addToolBar( listTools ); |
96 | moveToolBar( listTools, m_config.getToolBarPos() ); | 96 | moveToolBar( listTools, m_config.getToolBarPos() ); |
97 | 97 | ||
98 | // View Icons | 98 | // View Icons |
99 | m_tableViewButton = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ), | 99 | m_tableViewButton = new QAction( tr( "List" ), Resource::loadPixmap( "addressbook/listview" ), |
100 | QString::null, 0, this, 0 ); | 100 | QString::null, 0, this, 0 ); |
101 | connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) ); | 101 | connect( m_tableViewButton, SIGNAL( activated() ), this, SLOT( slotListView() ) ); |
102 | m_tableViewButton->setToggleAction( true ); | 102 | m_tableViewButton->setToggleAction( true ); |
103 | m_tableViewButton->addTo( listTools ); | 103 | m_tableViewButton->addTo( listTools ); |
104 | m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ), QString::null, 0, this, 0 ); | 104 | m_cardViewButton = new QAction( tr( "Card" ), Resource::loadPixmap( "addressbook/cardview" ), QString::null, 0, this, 0 ); |
105 | connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) ); | 105 | connect( m_cardViewButton, SIGNAL( activated() ), this, SLOT( slotCardView() ) ); |
106 | m_cardViewButton->setToggleAction( true ); | 106 | m_cardViewButton->setToggleAction( true ); |
107 | m_cardViewButton->addTo( listTools ); | 107 | m_cardViewButton->addTo( listTools ); |
108 | 108 | ||
109 | listTools->addSeparator(); | 109 | listTools->addSeparator(); |
110 | 110 | ||
111 | // Other Buttons | 111 | // Other Buttons |
112 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, | 112 | QAction *a = new QAction( tr( "New" ), Resource::loadPixmap( "new" ), QString::null, |
113 | 0, this, 0 ); | 113 | 0, this, 0 ); |
114 | actionNew = a; | 114 | actionNew = a; |
115 | connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) ); | 115 | connect( a, SIGNAL( activated() ), this, SLOT( slotListNew() ) ); |
116 | a->addTo( edit ); | 116 | a->addTo( edit ); |
117 | a->addTo( listTools ); | 117 | a->addTo( listTools ); |
118 | 118 | ||
119 | a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null, | 119 | a = new QAction( tr( "Edit" ), Resource::loadPixmap( "edit" ), QString::null, |
120 | 0, this, 0 ); | 120 | 0, this, 0 ); |
121 | actionEdit = a; | 121 | actionEdit = a; |
122 | connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) ); | 122 | connect( a, SIGNAL( activated() ), this, SLOT( slotViewEdit() ) ); |
123 | a->addTo( edit ); | 123 | a->addTo( edit ); |
124 | a->addTo( listTools ); | 124 | a->addTo( listTools ); |
125 | 125 | ||
126 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, | 126 | a = new QAction( tr( "Delete" ), Resource::loadPixmap( "trash" ), QString::null, |
127 | 0, this, 0 ); | 127 | 0, this, 0 ); |
128 | actionTrash = a; | 128 | actionTrash = a; |
129 | connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) ); | 129 | connect( a, SIGNAL( activated() ), this, SLOT( slotListDelete() ) ); |
130 | a->addTo( edit ); | 130 | a->addTo( edit ); |
131 | a->addTo( listTools ); | 131 | a->addTo( listTools ); |
132 | 132 | ||
133 | 133 | ||
134 | // make it possible to go directly to businesscard via qcop call | 134 | // make it possible to go directly to businesscard via qcop call |
135 | //#if defined(Q_WS_QWS) // Why this ? (se) | 135 | //#if defined(Q_WS_QWS) // Why this ? (se) |
136 | #if !defined(QT_NO_COP) | 136 | #if !defined(QT_NO_COP) |
137 | QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this ); | 137 | QCopChannel *addressChannel = new QCopChannel("QPE/Addressbook" , this ); |
138 | connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)), | 138 | connect (addressChannel, SIGNAL( received(const QCString&,const QByteArray&)), |
139 | this, SLOT ( appMessage(const QCString&,const QByteArray&) ) ); | 139 | this, SLOT ( appMessage(const QCString&,const QByteArray&) ) ); |
140 | #endif | 140 | #endif |
141 | // #endif | 141 | // #endif |
142 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), | 142 | a = new QAction( tr( "Find" ), Resource::loadPixmap( "mag" ), |
143 | QString::null, 0, this, 0 ); | 143 | QString::null, 0, this, 0 ); |
144 | actionFind = a; | 144 | actionFind = a; |
145 | connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) ); | 145 | connect( a, SIGNAL(activated()), this, SLOT( slotFindOpen()) ); |
146 | a->addTo( edit ); | 146 | a->addTo( edit ); |
147 | a->addTo( listTools ); | 147 | a->addTo( listTools ); |
148 | 148 | ||
149 | // Much better search widget, taken from QTReader.. (se) | 149 | // Much better search widget, taken from QTReader.. (se) |
150 | searchBar = new OFloatBar( "Search", this, QMainWindow::Top, TRUE ); | 150 | searchBar = new OFloatBar( "Search", this, QMainWindow::Top, TRUE ); |
151 | searchBar->setHorizontalStretchable( TRUE ); | 151 | searchBar->setHorizontalStretchable( TRUE ); |
152 | searchBar->hide(); | 152 | searchBar->hide(); |
153 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); | 153 | searchEdit = new QLineEdit( searchBar, "searchEdit" ); |
154 | 154 | ||
155 | // QFont f("unifont", 16 /*, QFont::Bold*/); | 155 | // QFont f("unifont", 16 /*, QFont::Bold*/); |
156 | // searchEdit->setFont( f ); | 156 | // searchEdit->setFont( f ); |
157 | 157 | ||
158 | searchBar->setStretchableWidget( searchEdit ); | 158 | searchBar->setStretchableWidget( searchEdit ); |
159 | connect( searchEdit, SIGNAL( returnPressed() ), | 159 | connect( searchEdit, SIGNAL( returnPressed() ), |
160 | this, SLOT( slotFind() ) ); | 160 | this, SLOT( slotFind() ) ); |
161 | 161 | ||
162 | a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 ); | 162 | a = new QAction( tr( "Start Search" ), Resource::loadPixmap( "enter" ), QString::null, 0, this, 0 ); |
163 | connect( a, SIGNAL( activated() ), this, SLOT( slotFind() ) ); | 163 | connect( a, SIGNAL( activated() ), this, SLOT( slotFind() ) ); |
164 | a->addTo( searchBar ); | 164 | a->addTo( searchBar ); |
165 | 165 | ||
166 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); | 166 | a = new QAction( tr( "Close Find" ), Resource::loadPixmap( "close" ), QString::null, 0, this, 0 ); |
diff --git a/core/pim/today/task-opie-today.control b/core/pim/today/task-opie-today.control index 6798141..3d637cc 100644 --- a/core/pim/today/task-opie-today.control +++ b/core/pim/today/task-opie-today.control | |||
@@ -1,12 +1,12 @@ | |||
1 | Package: task-opie-today | 1 | Package: task-opie-today |
2 | Priority: optional | 2 | Priority: optional |
3 | Section: opie/pim | 3 | Section: opie/pim |
4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> | 4 | Maintainer: Maximilian Reiß <harlekin@handhelds.org> |
5 | Architecture: arm | 5 | Architecture: arm |
6 | Version: $QPE_VERSION$EXTRAVERSION | 6 | Version: 0.5$EXTRAVERSION |
7 | Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin | 7 | Depends: task-opie-minimal, opie-today, opie-today-datebookplugin, opie-today-todolistplugin |
8 | License: GPL | 8 | License: GPL |
9 | Description: Task for basic Today app setup | 9 | Description: Task for basic Today app setup |
10 | Includes datebook and todolist plugins. | 10 | Includes datebook and todolist plugins. |
11 | 11 | ||
12 | Files: | 12 | Files: |
diff --git a/core/settings/security/demo/multiauth.control b/core/settings/security/demo/multiauth.control index c7dd82a..c549035 100644 --- a/core/settings/security/demo/multiauth.control +++ b/core/settings/security/demo/multiauth.control | |||
@@ -1,16 +1,16 @@ | |||
1 | Package: opie-multiauth | 1 | Package: opie-multiauth |
2 | Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png | 2 | Files: bin/multiauth apps/Applications/multiauth.desktop pics/security/multiauth.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: opie-security | 8 | Depends: opie-security |
9 | Description: multi-plugin authentication demonstrator for Opie. | 9 | Description: multi-plugin authentication demonstrator for Opie. |
10 | This demonstration application allows us to use one or several | 10 | This demonstration application allows us to use one or several |
11 | ways to lock and unlock our device. Since it really locks your | 11 | ways to lock and unlock our device. Since it really locks your |
12 | PDA the way you configured it in the Security settings, you can | 12 | PDA the way you configured it in the Security settings, you can |
13 | map a button to it through the Buttons settings to lock your | 13 | map a button to it through the Buttons settings to lock your |
14 | PDA on demand, with one simple click. | 14 | PDA on demand, with one simple click. |
15 | You must install some opie-multiauth-* plugins, and configure | 15 | You must install some opie-multiauth-* plugins, and configure |
16 | them through opie-security, to really see its possibilities. | 16 | them through opie-security, to really see its possibilities. |
diff --git a/core/tools/quicklauncher/main.cpp b/core/tools/quicklauncher/main.cpp index fbed5a1..59dd17e 100644 --- a/core/tools/quicklauncher/main.cpp +++ b/core/tools/quicklauncher/main.cpp | |||
@@ -24,194 +24,193 @@ | |||
24 | /* OPIE */ | 24 | /* OPIE */ |
25 | #include <opie2/odebug.h> | 25 | #include <opie2/odebug.h> |
26 | #include <opie2/oapplication.h> | 26 | #include <opie2/oapplication.h> |
27 | 27 | ||
28 | /* QT */ | 28 | /* QT */ |
29 | #include <qpainter.h> | 29 | #include <qpainter.h> |
30 | #include <qstrlist.h> | 30 | #include <qstrlist.h> |
31 | #include <qtimer.h> | 31 | #include <qtimer.h> |
32 | #include <qguardedptr.h> | 32 | #include <qguardedptr.h> |
33 | #include <qcopchannel_qws.h> | 33 | #include <qcopchannel_qws.h> |
34 | 34 | ||
35 | #ifdef private | 35 | #ifdef private |
36 | # undef private | 36 | # undef private |
37 | #endif | 37 | #endif |
38 | #define private public | 38 | #define private public |
39 | #include <qtopia/qpeapplication.h> | 39 | #include <qtopia/qpeapplication.h> |
40 | #undef private | 40 | #undef private |
41 | 41 | ||
42 | /* STD */ | 42 | /* STD */ |
43 | #include <stdio.h> | 43 | #include <stdio.h> |
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
45 | #include <sys/types.h> | 45 | #include <sys/types.h> |
46 | #include <sys/stat.h> | 46 | #include <sys/stat.h> |
47 | 47 | ||
48 | #ifdef _OS_LINUX_ | 48 | #ifdef _OS_LINUX_ |
49 | #include <sys/prctl.h> | 49 | #include <sys/prctl.h> |
50 | #ifndef PR_SET_NAME | 50 | #ifndef PR_SET_NAME |
51 | #define PR_SET_NAME 15 | 51 | #define PR_SET_NAME 15 |
52 | #endif | 52 | #endif |
53 | #endif | 53 | #endif |
54 | 54 | ||
55 | #include <unistd.h> | 55 | #include <unistd.h> |
56 | 56 | ||
57 | 57 | ||
58 | using QuickPrivate::PluginLoader; | 58 | using QuickPrivate::PluginLoader; |
59 | 59 | ||
60 | static QPEApplication *app = 0; | 60 | static QPEApplication *app = 0; |
61 | static PluginLoader *loader = 0; | 61 | static PluginLoader *loader = 0; |
62 | static ApplicationInterface *appIface = 0; | 62 | static ApplicationInterface *appIface = 0; |
63 | static QGuardedPtr<QWidget> mainWindow; | 63 | static QGuardedPtr<QWidget> mainWindow; |
64 | 64 | ||
65 | #ifdef _OS_LINUX_ | 65 | #ifdef _OS_LINUX_ |
66 | static char **argv0 = 0; | 66 | static char **argv0 = 0; |
67 | static int argv_lth; | 67 | static int argv_lth; |
68 | extern char **environ; | 68 | extern char **environ; |
69 | #ifndef SPT_BUFSIZE | 69 | #ifndef SPT_BUFSIZE |
70 | #define SPT_BUFSIZE 2048 | 70 | #define SPT_BUFSIZE 2048 |
71 | #endif | 71 | #endif |
72 | #include <stdarg.h> | 72 | #include <stdarg.h> |
73 | void setproctitle (const char *fmt,...) { | 73 | void setproctitle (const char *fmt,...) { |
74 | int i; | 74 | int i; |
75 | char buf[SPT_BUFSIZE]; | 75 | char buf[SPT_BUFSIZE]; |
76 | va_list ap; | 76 | va_list ap; |
77 | 77 | ||
78 | if (!argv0) | 78 | if (!argv0) |
79 | return; | 79 | return; |
80 | 80 | ||
81 | va_start(ap, fmt); | 81 | va_start(ap, fmt); |
82 | (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap); | 82 | (void) vsnprintf(buf, SPT_BUFSIZE, fmt, ap); |
83 | va_end(ap); | 83 | va_end(ap); |
84 | 84 | ||
85 | i = strlen (buf); | 85 | i = strlen (buf); |
86 | if (i > argv_lth - 2) { | 86 | if (i > argv_lth - 2) { |
87 | i = argv_lth - 2; | 87 | i = argv_lth - 2; |
88 | buf[i] = '\0'; | 88 | buf[i] = '\0'; |
89 | } | 89 | } |
90 | 90 | ||
91 | memset(argv0[0], '\0', argv_lth); /* clear the memory area */ | 91 | memset(argv0[0], '\0', argv_lth); /* clear the memory area */ |
92 | (void) strcpy (argv0[0], buf); | 92 | (void) strcpy (argv0[0], buf); |
93 | 93 | ||
94 | argv0[1] = NULL; | 94 | argv0[1] = NULL; |
95 | } | 95 | } |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | 98 | ||
99 | class QuickLauncher : public QObject | 99 | class QuickLauncher : public QObject |
100 | { | 100 | { |
101 | Q_OBJECT | 101 | Q_OBJECT |
102 | public: | 102 | public: |
103 | QuickLauncher() : QObject() | 103 | QuickLauncher() : QObject() |
104 | { | 104 | { |
105 | QCString ch("QPE/QuickLauncher-"); | 105 | QCString ch("QPE/QuickLauncher-"); |
106 | ch += QString::number(getpid()); | 106 | ch += QString::number(getpid()); |
107 | qlChannel = new QCopChannel( ch, this); | 107 | qlChannel = new QCopChannel( ch, this); |
108 | connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)), | 108 | connect( qlChannel, SIGNAL(received(const QCString&,const QByteArray&)), |
109 | this, SLOT(message(const QCString&,const QByteArray&)) ); | 109 | this, SLOT(message(const QCString&,const QByteArray&)) ); |
110 | } | 110 | } |
111 | 111 | ||
112 | static void exec( int /*argc*/, char **argv ) | 112 | static void exec( int /*argc*/, char **argv ) |
113 | { | 113 | { |
114 | QString appName = argv[0]; | 114 | QString appName = argv[0]; |
115 | int sep = appName.findRev( '/' ); | 115 | int sep = appName.findRev( '/' ); |
116 | if ( sep > 0 ) | 116 | if ( sep > 0 ) |
117 | appName = appName.mid( sep+1 ); | 117 | appName = appName.mid( sep+1 ); |
118 | 118 | ||
119 | appIface = 0; | 119 | appIface = 0; |
120 | if ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) != QS_OK ) { | 120 | if ( ! ( loader->queryInterface(appName, IID_QtopiaApplication, (QUnknownInterface**)&appIface) == QS_OK ) ) { |
121 | owarn << "Plugin does not support QuickLauncher interface" << oendl; | ||
122 | exit(-1); | 121 | exit(-1); |
123 | } | 122 | } |
124 | 123 | ||
125 | mainWindow = appIface->createMainWindow( appName ); | 124 | mainWindow = appIface->createMainWindow( appName ); |
126 | 125 | ||
127 | if ( mainWindow ) { | 126 | if ( mainWindow ) { |
128 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { | 127 | if ( mainWindow->metaObject()->slotNames().contains("setDocument(const QString&)") ) { |
129 | app->showMainDocumentWidget( mainWindow ); | 128 | app->showMainDocumentWidget( mainWindow ); |
130 | } else { | 129 | } else { |
131 | app->showMainWidget( mainWindow ); | 130 | app->showMainWidget( mainWindow ); |
132 | } | 131 | } |
133 | } else { | 132 | } else { |
134 | owarn << "Could not create application main window" << oendl; | 133 | owarn << "Could not create application main window" << oendl; |
135 | exit(-1); | 134 | exit(-1); |
136 | } | 135 | } |
137 | } | 136 | } |
138 | 137 | ||
139 | private slots: | 138 | private slots: |
140 | void message(const QCString &msg, const QByteArray & data) | 139 | void message(const QCString &msg, const QByteArray & data) |
141 | { | 140 | { |
142 | QStrList argList; | 141 | QStrList argList; |
143 | 142 | ||
144 | if ( msg == "execute(QStrList)" ) { | 143 | if ( msg == "execute(QStrList)" ) { |
145 | delete qlChannel; | 144 | delete qlChannel; |
146 | QDataStream stream( data, IO_ReadOnly ); | 145 | QDataStream stream( data, IO_ReadOnly ); |
147 | QStrList argList; | 146 | QStrList argList; |
148 | stream >> argList; | 147 | stream >> argList; |
149 | odebug << "QuickLauncher execute: " << argList.at(0) << oendl; | 148 | odebug << "QuickLauncher execute: " << argList.at(0) << oendl; |
150 | doQuickLaunch( argList ); | 149 | doQuickLaunch( argList ); |
151 | delete this; | 150 | delete this; |
152 | } else if ( msg == "execute(QString)" ) { | 151 | } else if ( msg == "execute(QString)" ) { |
153 | delete qlChannel; | 152 | delete qlChannel; |
154 | QDataStream stream( data, IO_ReadOnly ); | 153 | QDataStream stream( data, IO_ReadOnly ); |
155 | QString arg; | 154 | QString arg; |
156 | stream >> arg; | 155 | stream >> arg; |
157 | odebug << "QuickLauncher execute: " << arg << oendl; | 156 | odebug << "QuickLauncher execute: " << arg << oendl; |
158 | QStrList argList; | 157 | QStrList argList; |
159 | argList.append( arg.utf8() ); | 158 | argList.append( arg.utf8() ); |
160 | doQuickLaunch( argList ); | 159 | doQuickLaunch( argList ); |
161 | delete this; | 160 | delete this; |
162 | } | 161 | } |
163 | } | 162 | } |
164 | 163 | ||
165 | private: | 164 | private: |
166 | void doQuickLaunch( QStrList &argList ) | 165 | void doQuickLaunch( QStrList &argList ) |
167 | { | 166 | { |
168 | static int myargc = argList.count(); | 167 | static int myargc = argList.count(); |
169 | static char **myargv = new char *[myargc + 1]; | 168 | static char **myargv = new char *[myargc + 1]; |
170 | 169 | ||
171 | for ( int j = 0; j < myargc; j++ ) { | 170 | for ( int j = 0; j < myargc; j++ ) { |
172 | myargv[j] = new char [strlen(argList.at(j))+1]; | 171 | myargv[j] = new char [strlen(argList.at(j))+1]; |
173 | strcpy( myargv[j], argList.at(j) ); | 172 | strcpy( myargv[j], argList.at(j) ); |
174 | } | 173 | } |
175 | 174 | ||
176 | myargv[myargc] = NULL; | 175 | myargv[myargc] = NULL; |
177 | #ifdef _OS_LINUX_ | 176 | #ifdef _OS_LINUX_ |
178 | // Change name of process | 177 | // Change name of process |
179 | setproctitle(myargv[0]); | 178 | setproctitle(myargv[0]); |
180 | prctl( PR_SET_NAME, (unsigned long)myargv[0], 0, 0, 0 ); | 179 | prctl( PR_SET_NAME, (unsigned long)myargv[0], 0, 0, 0 ); |
181 | #endif | 180 | #endif |
182 | 181 | ||
183 | connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); | 182 | connect(app, SIGNAL(lastWindowClosed()), app, SLOT(hideOrQuit())); |
184 | app->exit_loop(); | 183 | app->exit_loop(); |
185 | app->initApp( myargc, myargv ); | 184 | app->initApp( myargc, myargv ); |
186 | exec( myargc, myargv ); | 185 | exec( myargc, myargv ); |
187 | } | 186 | } |
188 | 187 | ||
189 | private: | 188 | private: |
190 | QCopChannel *qlChannel; | 189 | QCopChannel *qlChannel; |
191 | }; | 190 | }; |
192 | 191 | ||
193 | int main( int argc, char** argv ) | 192 | int main( int argc, char** argv ) |
194 | { | 193 | { |
195 | app = new Opie::Core::OApplication( argc, argv ); | 194 | app = new Opie::Core::OApplication( argc, argv ); |
196 | 195 | ||
197 | loader = new PluginLoader( "application" ); | 196 | loader = new PluginLoader( "application" ); |
198 | 197 | ||
199 | unsetenv( "LD_BIND_NOW" ); | 198 | unsetenv( "LD_BIND_NOW" ); |
200 | 199 | ||
201 | QCString arg0 = argv[0]; | 200 | QCString arg0 = argv[0]; |
202 | int sep = arg0.findRev( '/' ); | 201 | int sep = arg0.findRev( '/' ); |
203 | 202 | ||
204 | if ( sep > 0 ) | 203 | if ( sep > 0 ) |
205 | arg0 = arg0.mid( sep+1 ); | 204 | arg0 = arg0.mid( sep+1 ); |
206 | 205 | ||
207 | if ( arg0 != "quicklauncher" ) { | 206 | if ( arg0 != "quicklauncher" ) { |
208 | odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; | 207 | odebug << "QuickLauncher invoked as: " << arg0.data() << oendl; |
209 | QuickLauncher::exec( argc, argv ); | 208 | QuickLauncher::exec( argc, argv ); |
210 | } else { | 209 | } else { |
211 | #ifdef _OS_LINUX_ | 210 | #ifdef _OS_LINUX_ |
212 | // Setup to change proc title | 211 | // Setup to change proc title |
213 | int i; | 212 | int i; |
214 | char **envp = environ; | 213 | char **envp = environ; |
215 | /* Move the environment so we can reuse the memory. | 214 | /* Move the environment so we can reuse the memory. |
216 | * (Code borrowed from sendmail.) */ | 215 | * (Code borrowed from sendmail.) */ |
217 | for (i = 0; envp[i] != NULL; i++) | 216 | for (i = 0; envp[i] != NULL; i++) |
diff --git a/dependencies.in b/dependencies.in index ce1ac96..357d994 100644 --- a/dependencies.in +++ b/dependencies.in | |||
@@ -1,84 +1,96 @@ | |||
1 | config LIBETPAN_DEP | 1 | config LIBETPAN_DEP |
2 | boolean "Have Libetpan >= 0.33pre" | 2 | boolean "Have Libetpan >= 0.33pre" |
3 | default "n" | 3 | default "n" |
4 | 4 | ||
5 | config LIBETPAN_LIB_DIR | 5 | config LIBETPAN_LIB_DIR |
6 | string "LIBETPAN library dir" | 6 | string "LIBETPAN library dir" |
7 | depends LIBETPAN_DEP | 7 | depends LIBETPAN_DEP |
8 | 8 | ||
9 | config LIBETPAN_INC_DIR | 9 | config LIBETPAN_INC_DIR |
10 | string "LIBETPAN include dir" | 10 | string "LIBETPAN include dir" |
11 | depends LIBETPAN_DEP | 11 | depends LIBETPAN_DEP |
12 | 12 | ||
13 | config LIBPCAP_DEP | 13 | config LIBPCAP_DEP |
14 | boolean "Have libpcap >= 0.7.2" | 14 | boolean "Have libpcap >= 0.7.2" |
15 | default "n" | 15 | default "n" |
16 | 16 | ||
17 | config LIBPCAP_LIB_DIR | 17 | config LIBPCAP_LIB_DIR |
18 | string "LIBPCAP library dir" | 18 | string "LIBPCAP library dir" |
19 | depends LIBPCAP_DEP | 19 | depends LIBPCAP_DEP |
20 | 20 | ||
21 | config LIBPCAP_INC_DIR | 21 | config LIBPCAP_INC_DIR |
22 | string "LIBPCAP include dir" | 22 | string "LIBPCAP include dir" |
23 | depends LIBPCAP_DEP | 23 | depends LIBPCAP_DEP |
24 | 24 | ||
25 | config LIBSQLITE_DEP | 25 | config LIBSQLITE_DEP |
26 | boolean "Have sqlite >= 3.0.7" | 26 | boolean "Have sqlite >= 3.0.7" |
27 | default n | 27 | default n |
28 | 28 | ||
29 | config LIBSQLITE_LIB_DIR | 29 | config LIBSQLITE_LIB_DIR |
30 | string "LIBSQLITE library dir" | 30 | string "LIBSQLITE library dir" |
31 | depends LIBSQLITE_DEP | 31 | depends LIBSQLITE_DEP |
32 | 32 | ||
33 | config LIBSQLITE_INC_DIR | 33 | config LIBSQLITE_INC_DIR |
34 | string "LIBSQLITE include dir" | 34 | string "LIBSQLITE include dir" |
35 | depends LIBSQLITE_DEP | 35 | depends LIBSQLITE_DEP |
36 | 36 | ||
37 | config LIBXINE_DEP | 37 | config LIBXINE_DEP |
38 | boolean "Have libxine >= 1.0rc6" | 38 | boolean "Have libxine >= 1.0rc6" |
39 | default "n" | 39 | default "n" |
40 | 40 | ||
41 | config LIBXINE_LIB_DIR | 41 | config LIBXINE_LIB_DIR |
42 | string "LIBXINE library dir" | 42 | string "LIBXINE library dir" |
43 | depends LIBXINE_DEP | 43 | depends LIBXINE_DEP |
44 | 44 | ||
45 | config LIBXINE_INC_DIR | 45 | config LIBXINE_INC_DIR |
46 | string "LIBXINE include dir" | 46 | string "LIBXINE include dir" |
47 | depends LIBXINE_DEP | 47 | depends LIBXINE_DEP |
48 | 48 | ||
49 | config LIBIPK_DEP | 49 | config LIBIPK_DEP |
50 | boolean "Have libipkg >= 0.99.120" | 50 | boolean "Have libipkg >= 0.99.120" |
51 | default "n" | 51 | default "n" |
52 | 52 | ||
53 | config LIBIPK_LIB_DIR | 53 | config LIBIPK_LIB_DIR |
54 | string "libipkg library dir" | 54 | string "libipkg library dir" |
55 | depends LIBIPK_DEP | 55 | depends LIBIPK_DEP |
56 | 56 | ||
57 | config LIBIPK_INC_DIR | 57 | config LIBIPK_INC_DIR |
58 | string "libipkg include dir" | 58 | string "libipkg include dir" |
59 | depends LIBIPK_DEP | 59 | depends LIBIPK_DEP |
60 | 60 | ||
61 | config LIBSDL_DEP | 61 | config LIBSDL_DEP |
62 | boolean "Have libsdl12 and sdlimage" | 62 | boolean "Have libsdl12 and sdlimage" |
63 | default "n" | 63 | default "n" |
64 | 64 | ||
65 | config LIBSDL_LIB_DIR | 65 | config LIBSDL_LIB_DIR |
66 | string "LIBSDL library dir" | 66 | string "LIBSDL library dir" |
67 | depends LIBSDL_DEP | 67 | depends LIBSDL_DEP |
68 | 68 | ||
69 | config LIBSDL_INC_DIR | 69 | config LIBSDL_INC_DIR |
70 | string "LIBSDL include dir" | 70 | string "LIBSDL include dir" |
71 | depends LIBSDL_DEP | 71 | depends LIBSDL_DEP |
72 | 72 | ||
73 | config LIBSWORD_DEP | 73 | config LIBSWORD_DEP |
74 | boolean "Have libsword > = 1.5.0" | 74 | boolean "Have libsword > = 1.5.0" |
75 | default "n" | 75 | default "n" |
76 | 76 | ||
77 | config LIBSWORD_LIB_DIR | 77 | config LIBSWORD_LIB_DIR |
78 | string "libsword library dir" | 78 | string "libsword library dir" |
79 | depends LIBSWORD_DEP | 79 | depends LIBSWORD_DEP |
80 | 80 | ||
81 | config LIBSWORD_INC_DIR | 81 | config LIBSWORD_INC_DIR |
82 | string "libsword include dir" | 82 | string "libsword include dir" |
83 | depends LIBSWORD_DEP | 83 | depends LIBSWORD_DEP |
84 | 84 | ||
85 | config LIBBLUEZ_DEP | ||
86 | boolean "Have bluez library" | ||
87 | default "n" | ||
88 | |||
89 | config LIBBLUEZ_LIB_DIR | ||
90 | string "libbluez library dir" | ||
91 | depends LIBBLUEZ_DEP | ||
92 | |||
93 | config LIBBLUEZ_INC_DIR | ||
94 | string "libbluez include dir" | ||
95 | depends LIBBLUEZ_DEP | ||
96 | |||
diff --git a/etc/opie-keytabs.control b/etc/opie-keytabs.control index e3d83de..9563b3a 100644 --- a/etc/opie-keytabs.control +++ b/etc/opie-keytabs.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-keytabs | 1 | Package: opie-keytabs |
2 | Files: etc/keytabs/* | 2 | Files: etc/keytabs/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.6$EXTRAVERSION |
8 | License: GPL | 8 | License: GPL |
9 | Description: Opie keytabs for terminal applications | 9 | Description: Opie keytabs for terminal applications |
diff --git a/libopie2/libopie2.control b/libopie2/libopie2.control index fcd44b4..e72c535 100644 --- a/libopie2/libopie2.control +++ b/libopie2/libopie2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopie2 | 1 | Package: libopie2 |
2 | Files: | 2 | Files: |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.2$EXTRAVERSION |
8 | Depends: libopiecore2 ($QPE_VERSION), libopiedb2 ($QPE_VERSION), libopiemm2 ($QPE_VERSION), libopienet2 ($QPE_VERSION), libopiepim2 ($QPE_VERSION), libopieui2 ($QPE_VERSION) | 8 | Depends: libopiecore2 ($QPE_VERSION), libopiedb2 ($QPE_VERSION), libopiemm2 ($QPE_VERSION), libopienet2 ($QPE_VERSION), libopiepim2 ($QPE_VERSION), libopieui2 ($QPE_VERSION) |
9 | Provides: libopie2 | 9 | Provides: libopie2 |
10 | Description: Opie library 2.0 | 10 | Description: Opie library 2.0 |
diff --git a/libopie2/opiecore/libopiecore2.control b/libopie2/opiecore/libopiecore2.control index c7fc141..1d27c1c 100644 --- a/libopie2/opiecore/libopiecore2.control +++ b/libopie2/opiecore/libopiecore2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiecore2 | 1 | Package: libopiecore2 |
2 | Files: lib/libopiecore2.so.* | 2 | Files: lib/libopiecore2.so.* |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.5$EXTRAVERSION |
8 | Depends: libqpe1 | 8 | Depends: libqpe1 |
9 | Provides: libopiecore2 | 9 | Provides: libopiecore2 |
10 | Description: Opie library 2.0 CORE | 10 | Description: Opie library 2.0 CORE |
diff --git a/libopie2/opiedb/libopiedb2.control b/libopie2/opiedb/libopiedb2.control index 7e9354a..5744b24 100644 --- a/libopie2/opiedb/libopiedb2.control +++ b/libopie2/opiedb/libopiedb2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiedb2 | 1 | Package: libopiedb2 |
2 | Files: lib/libopiedb2.so* | 2 | Files: lib/libopiedb2.so* |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.2$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 ($QPE_VERSION), libsqlite3-0 | sqlite3-bin | 8 | Depends: libqpe1, libopiecore2 ($QPE_VERSION), libsqlite3-0 | sqlite3-bin |
9 | Provides: libopiedb2 | 9 | Provides: libopiedb2 |
10 | Description: Opie library 2.1 DB | 10 | Description: Opie library 2.1 DB |
diff --git a/libopie2/opiemm/libopiemm2.control b/libopie2/opiemm/libopiemm2.control index 0dd2df2..38d7ddc 100644 --- a/libopie2/opiemm/libopiemm2.control +++ b/libopie2/opiemm/libopiemm2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiemm2 | 1 | Package: libopiemm2 |
2 | Files: lib/libopiemm2.so.* | 2 | Files: lib/libopiemm2.so.* |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.2$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 (1.8.2) | 8 | Depends: libqpe1, libopiecore2 (1.8.2) |
9 | Provides: libopiemm2 | 9 | Provides: libopiemm2 |
10 | Description: Opie library 2.0 MM | 10 | Description: Opie library 2.0 MM |
diff --git a/libopie2/opienet/libopienet2.control b/libopie2/opienet/libopienet2.control index 69876b5..da53e2b 100644 --- a/libopie2/opienet/libopienet2.control +++ b/libopie2/opienet/libopienet2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopienet2 | 1 | Package: libopienet2 |
2 | Files: lib/libopienet2.so.* etc/manufacturers | 2 | Files: lib/libopienet2.so.* etc/manufacturers |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/libs | 4 | Section: opie/libs |
5 | Maintainer: Opie Team <opie@handhelds.org> | 5 | Maintainer: Opie Team <opie@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.4$EXTRAVERSION |
8 | Depends: libopiecore2, libpcap0.8 (>=0.7.2) | 8 | Depends: libopiecore2, libpcap0.8 (>=0.7.2) |
9 | Provides: libopienet2 | 9 | Provides: libopienet2 |
10 | Description: Opie library 2.0 NET | 10 | Description: Opie library 2.0 NET |
diff --git a/libopie2/opiepim/libopiepim2.control b/libopie2/opiepim/libopiepim2.control index 28b7505..457e20a 100644 --- a/libopie2/opiepim/libopiepim2.control +++ b/libopie2/opiepim/libopiepim2.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libopiepim2 | 1 | Package: libopiepim2 |
2 | Files: lib/libopiepim2.so.* | 2 | Files: lib/libopiepim2.so.* |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.3$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2 (>=1.8.0) | 8 | Depends: libqpe1, libopiecore2 (>=1.8.0) |
9 | Provides: libopiepim2 | 9 | Provides: libopiepim2 |
10 | Description: Opie library 2.0 PIM | 10 | Description: Opie library 2.0 PIM |
diff --git a/libopie2/opiesecurity/libopiesecurity2.control b/libopie2/opiesecurity/libopiesecurity2.control index 1eabb93..0a29a47 100644 --- a/libopie2/opiesecurity/libopiesecurity2.control +++ b/libopie2/opiesecurity/libopiesecurity2.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: libopiesecurity2 | 1 | Package: libopiesecurity2 |
2 | Files: lib/libopiesecurity2.so.* | 2 | Files: lib/libopiesecurity2.so.* |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.8.5$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2, libopieui2 | 8 | Depends: libqpe1, libopiecore2, libopieui2 |
9 | Provides: libopiesecurity2 | 9 | Provides: libopiesecurity2 |
10 | Recommends: opie-multiauth-pinplugin | opie-multiauth-noticeplugin | opie-multiauth-dummyplugin | opie-multiauth-bluepingplugin, opie-security | 10 | Recommends: opie-multiauth-pinplugin | opie-multiauth-noticeplugin | opie-multiauth-dummyplugin | opie-multiauth-bluepingplugin, opie-security |
11 | Description: Opie library 2.0 security | 11 | Description: Opie library 2.0 security |
diff --git a/libopie2/opieui/oresource.cpp b/libopie2/opieui/oresource.cpp index 9559210..c94421a 100644 --- a/libopie2/opieui/oresource.cpp +++ b/libopie2/opieui/oresource.cpp | |||
@@ -1,58 +1,59 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | 3 | ||
4 | Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> | 4 | Copyright (C) 2003 Patrick S. Vogt <tille@handhelds.org> |
5 | =. | 5 | =. |
6 | .=l. | 6 | .=l. |
7 | .>+-= | 7 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 8 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include <opie2/oapplication.h> | 31 | #include <opie2/oapplication.h> |
32 | #include <opie2/odebug.h> | 32 | #include <opie2/odebug.h> |
33 | 33 | ||
34 | #include "oresource.h" | 34 | #include "oresource.h" |
35 | 35 | ||
36 | 36 | ||
37 | #ifdef QWS | 37 | #ifdef QWS |
38 | namespace Resource | 38 | namespace Resource |
39 | { | 39 | { |
40 | 40 | ||
41 | QPixmap loadPixmap( const QString& pix ) | 41 | QPixmap loadPixmap( const QString& pix ) |
42 | { | 42 | { |
43 | QString filename; | 43 | QString filename; |
44 | filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); | 44 | filename.sprintf( "%s/%s.png", (const char*) oApp->qpeDir(), (const char*) pix ); |
45 | odebug << "Load pixmap " << filename << oendl; | ||
45 | QPixmap pixmap( filename ); | 46 | QPixmap pixmap( filename ); |
46 | if ( pixmap.isNull() ) | 47 | if ( pixmap.isNull() ) |
47 | { | 48 | { |
48 | odebug << "libopie2 resource: can't find pixmap " << filename << oendl; | 49 | odebug << "libopie2 resource: can't find pixmap " << filename << oendl; |
49 | } | 50 | } |
50 | return pixmap; | 51 | return pixmap; |
51 | }; | 52 | }; |
52 | 53 | ||
53 | }; | 54 | }; |
54 | 55 | ||
55 | #endif | 56 | #endif |
56 | 57 | ||
57 | 58 | ||
58 | 59 | ||
diff --git a/libqtaux/libqtaux.control b/libqtaux/libqtaux.control index d801a98..996962f 100644 --- a/libqtaux/libqtaux.control +++ b/libqtaux/libqtaux.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libqtaux2 | 1 | Package: libqtaux2 |
2 | Files: lib/libqtaux2.so.* | 2 | Files: lib/libqtaux2.so.* |
3 | Priority: optional | 3 | Priority: optional |
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 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 2.3.7$EXTRAVERSION |
8 | Depends: libqte2 | 8 | Depends: libqte2 |
9 | Provides: libqtaux | 9 | Provides: libqtaux |
10 | Description: Qt/Embedded Auxilliary Stuff | 10 | Description: Qt/Embedded Auxilliary Stuff |
diff --git a/noncore/applets/zkbapplet/zkbapplet.control b/noncore/applets/zkbapplet/zkbapplet.control index 08b540f..4e03c26 100644 --- a/noncore/applets/zkbapplet/zkbapplet.control +++ b/noncore/applets/zkbapplet/zkbapplet.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: zkbapplet | 1 | Package: zkbapplet |
2 | Files: plugins/applets/libzkbapplet.so* pics/zkb-disabled.png share/zkb/*.xml bin/keyz-cfg apps/Settings/keyz-cfg.desktop pics/keyz-cfg.png share/zkb/zkb.xml.sample | 2 | Files: plugins/applets/libzkbapplet.so* pics/zkb-disabled.png share/zkb/*.xml bin/keyz-cfg apps/Settings/keyz-cfg.desktop pics/keyz-cfg.png share/zkb/zkb.xml.sample |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Depends: task-opie-minimal | 7 | Depends: task-opie-minimal |
8 | Description: ZKB Applet and configuration program | 8 | Description: ZKB Applet and configuration program |
9 | Obsoletes: keyz-cfg | 9 | Obsoletes: keyz-cfg |
10 | Version: $QPE_VERSION$EXTRAVERSION | 10 | Version: 0.6.0$EXTRAVERSION |
diff --git a/noncore/apps/dagger/opie-dagger.control b/noncore/apps/dagger/opie-dagger.control index cfb45be..4ded1f2 100644 --- a/noncore/apps/dagger/opie-dagger.control +++ b/noncore/apps/dagger/opie-dagger.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-dagger | 1 | Package: opie-dagger |
2 | Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop | 2 | Files: plugins/application/libdagger.so* bin/dagger pics/dagger apps/Applications/dagger.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Depends: task-opie-minimal, libopiecore2, libopieui2 | 5 | Depends: task-opie-minimal, libopiecore2, libopieui2 |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Maintainer: Dan Williams (drw@handhelds.org) | 7 | Maintainer: Dan Williams (drw@handhelds.org) |
8 | Description: A Bible study program utilizing the Sword library. | 8 | Description: A Bible study program utilizing the Sword library. |
9 | Version: $QPE_VERSION$EXTRAVERSION | 9 | Version: 0.9.1$EXTRAVERSION |
diff --git a/noncore/games/bounce/opie-bounce.control b/noncore/games/bounce/opie-bounce.control index 0513958..54c14b4 100644 --- a/noncore/games/bounce/opie-bounce.control +++ b/noncore/games/bounce/opie-bounce.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-bounce | 1 | Package: opie-bounce |
2 | Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png | 2 | Files: plugins/application/libbounce.so* bin/bounce apps/Games/bounce.desktop pics/bounce/*.png |
3 | Version: $QPE_VERSION$EXTRAVERSION | 3 | Version: 0.6$EXTRAVERSION |
4 | Depends: task-opie-minimal, libopiecore2 | 4 | Depends: task-opie-minimal, libopiecore2 |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 7 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: bounce | 10 | Description: bounce |
11 | A JezzGame like game for Qtopia. | 11 | A JezzGame like game for Qtopia. |
diff --git a/noncore/games/buzzword/opie-buzzword.control b/noncore/games/buzzword/opie-buzzword.control index f76a2c2..586b566 100644 --- a/noncore/games/buzzword/opie-buzzword.control +++ b/noncore/games/buzzword/opie-buzzword.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-buzzword | 1 | Package: opie-buzzword |
2 | Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords | 2 | Files: plugins/application/libbuzzword.so* bin/buzzword apps/Games/buzzword.desktop pics/buzzword/buzzword.png share/buzzword/buzzwords |
3 | Version: $QPE_VERSION$EXTRAVERSION | 3 | Version: 1.1$EXTRAVERSION |
4 | Depends: task-opie-minimal,libopiecore2 | 4 | Depends: task-opie-minimal,libopiecore2 |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Martin Imobersteg <imm@gmx.ch> | 7 | Maintainer: Martin Imobersteg <imm@gmx.ch> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: BuzzWord | 10 | Description: BuzzWord |
11 | A BuzzWord Bingo for the Opie environment. | 11 | A BuzzWord Bingo for the Opie environment. |
diff --git a/noncore/games/kbill/opie-kbill.control b/noncore/games/kbill/opie-kbill.control index cf12bca..665fa32 100644 --- a/noncore/games/kbill/opie-kbill.control +++ b/noncore/games/kbill/opie-kbill.control | |||
@@ -1,13 +1,13 @@ | |||
1 | Package: opie-kbill | 1 | Package: opie-kbill |
2 | Files: bin/kbill apps/Games/kbill.desktop pics/kbill/* | 2 | Files: bin/kbill apps/Games/kbill.desktop pics/kbill/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: Mark Westcott <mark@houseoffish.org> | 5 | Maintainer: Mark Westcott <mark@houseoffish.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.8$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: The famous hit Bill game | 10 | Description: The famous hit Bill game |
11 | Hit Bill as hard as you can before he | 11 | Hit Bill as hard as you can before he |
12 | infects your network with a wannabe | 12 | infects your network with a wannabe |
13 | OS. | 13 | OS. |
diff --git a/noncore/games/kcheckers/opie-kcheckers.control b/noncore/games/kcheckers/opie-kcheckers.control index e7c20d3..e64acca 100644 --- a/noncore/games/kcheckers/opie-kcheckers.control +++ b/noncore/games/kcheckers/opie-kcheckers.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-kcheckers | 1 | Package: opie-kcheckers |
2 | Files: plugins/application/libkcheckers.so* bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers | 2 | Files: plugins/application/libkcheckers.so* bin/kcheckers apps/Games/kcheckers.desktop pics/kcheckers |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/games | 4 | Section: opie/games |
5 | Maintainer: leseb <prudhomme@laposte.net> | 5 | Maintainer: leseb <prudhomme@laposte.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.3$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopiecore2 | 8 | Depends: task-opie-minimal, libopiecore2 |
9 | Description: The game of Checkers | 9 | Description: The game of Checkers |
10 | A game for the Opie environment. | 10 | A game for the Opie environment. |
diff --git a/noncore/games/kpacman/opie-kpacman.control b/noncore/games/kpacman/opie-kpacman.control index 97120aa..2717f44 100644 --- a/noncore/games/kpacman/opie-kpacman.control +++ b/noncore/games/kpacman/opie-kpacman.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-kpacman | 1 | Package: opie-kpacman |
2 | Files: plugins/applications/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman | 2 | Files: plugins/applications/libkpacman.so* bin/kpacman apps/Games/kpacman.desktop pics/kpacman/kpacman.png share/kpacman |
3 | Version: $QPE_VERSION$EXTRAVERSION | 3 | Version: 0.3.1$EXTRAVERSION |
4 | Depends: task-opie-minimal | 4 | Depends: task-opie-minimal |
5 | Priority: optional | 5 | Priority: optional |
6 | Section: opie/games | 6 | Section: opie/games |
7 | Maintainer: Catalin Climov <catalin@climov.com> | 7 | Maintainer: Catalin Climov <catalin@climov.com> |
8 | Architecture: arm | 8 | Architecture: arm |
9 | License: GPL | 9 | License: GPL |
10 | Description: Kpacman | 10 | Description: Kpacman |
11 | A Pacman clone for Qtopia. | 11 | A Pacman clone for Qtopia. |
diff --git a/noncore/multimedia/camera/opie-camera.control b/noncore/multimedia/camera/opie-camera.control index 5171050..091de98 100644 --- a/noncore/multimedia/camera/opie-camera.control +++ b/noncore/multimedia/camera/opie-camera.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-camera | 1 | Package: opie-camera |
2 | Files: lib/libcamera.* bin/camera bin/capture pics/camera apps/Applications/camera.desktop | 2 | Files: lib/libcamera.* bin/camera bin/capture pics/camera apps/Applications/camera.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/multimedia | 4 | Section: opie/multimedia |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@Vanille.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.0.1$EXTRAVERSION |
8 | Depends: libqpe1, libopiecore2, libopieui2 | 8 | Depends: libqpe1, libopiecore2, libopieui2 |
9 | Description: A Camera Application | 9 | Description: A Camera Application |
10 | A Camera Application to use with the Sharp CE-AG06. | 10 | A Camera Application to use with the Sharp CE-AG06. |
diff --git a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control index f4cbc41..9c14ab4 100644 --- a/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control +++ b/noncore/multimedia/opieplayer2/opie-mediaplayer2-codecs.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-mediaplayer2-codecs | 1 | Package: opie-mediaplayer2-codecs |
2 | Files: root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/* | 2 | Files: root/usr/lib/libao.so* root/usr/lib/libogg* root/usr/lib/libvorbisidec.so* root/usr/lib/libxine.so* root/usr/lib/xine/* |
3 | Section: ;ibs | 3 | Section: ;ibs |
4 | Essential: no | 4 | Essential: no |
5 | Priority: optional | 5 | Priority: optional |
6 | Version: $QPE_VERSION$EXTRAVERSION | 6 | Version: 0.7$EXTRAVERSION |
7 | Architecture: arm | 7 | Architecture: arm |
8 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> | 8 | Maintainer: Maximilian Reiss <harlekin@handhelds.org> |
9 | Depends: libc6 (>= 2.1), opie-mediaplayer2 | 9 | Depends: libc6 (>= 2.1), opie-mediaplayer2 |
10 | Description: Codecs for opieplayer 2 | 10 | Description: Codecs for opieplayer 2 |
diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control index 490e8a2..5216385 100644 --- a/noncore/multimedia/powerchord/opie-powerchord.control +++ b/noncore/multimedia/powerchord/opie-powerchord.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-powercord | 1 | Package: opie-powercord |
2 | Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord | 2 | Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/multimedia | 4 | Section: opie/multimedia |
5 | Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com> | 5 | Maintainer: Camilo Mesias <camilo@mesias.co.uk>, ljp <lpotter@trolltech.com> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.8$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: Guitar Chord generator application | 9 | Description: Guitar Chord generator application |
10 | Allows naming of chords using base note and key. Fretboard diagrams are | 10 | Allows naming of chords using base note and key. Fretboard diagrams are |
11 | produced illustrating ways to play the chord. | 11 | produced illustrating ways to play the chord. |
diff --git a/noncore/net/mail/libetpanstuff/libetpan.control b/noncore/net/mail/libetpanstuff/libetpan.control index b664157..d90124d 100644 --- a/noncore/net/mail/libetpanstuff/libetpan.control +++ b/noncore/net/mail/libetpanstuff/libetpan.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libetpan | 1 | Package: libetpan |
2 | Files: usr/lib/libetpan* | 2 | Files: usr/lib/libetpan* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: system | 4 | Section: system |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.33$EXTRAVERSION |
8 | Depends: libssl0.9.7 | 8 | Depends: libssl0.9.7 |
9 | Description: libetpan mail/news library - A version of libetpan patched for Opies mailing app | 9 | Description: libetpan mail/news library - A version of libetpan patched for Opies mailing app |
10 | License: LGPL | 10 | License: LGPL |
diff --git a/noncore/net/mail/libmailwrapper/libmailwrapper.control b/noncore/net/mail/libmailwrapper/libmailwrapper.control index 3491d67..1226c10 100644 --- a/noncore/net/mail/libmailwrapper/libmailwrapper.control +++ b/noncore/net/mail/libmailwrapper/libmailwrapper.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: libmailwrapper | 1 | Package: libmailwrapper |
2 | Files: lib/libmailwrapper.so* | 2 | Files: lib/libmailwrapper.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: libs | 4 | Section: libs |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.6$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre) | 8 | Depends: task-opie-minimal, libopiecore2, libopieui2, libetpan (>= 0.33pre) |
9 | Description: wrapper lib needed by Opie's mailer | 9 | Description: wrapper lib needed by Opie's mailer |
10 | License: LGPL | 10 | License: LGPL |
diff --git a/noncore/net/mail/taskbarapplet/opie-mailapplet.control b/noncore/net/mail/taskbarapplet/opie-mailapplet.control index c838e0b..fc7b337 100644 --- a/noncore/net/mail/taskbarapplet/opie-mailapplet.control +++ b/noncore/net/mail/taskbarapplet/opie-mailapplet.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-mailapplet | 1 | Package: opie-mailapplet |
2 | Files: plugins/applets/libmailapplet.so* | 2 | Files: plugins/applets/libmailapplet.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applets | 4 | Section: opie/applets |
5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> | 5 | Maintainer: Rajko Albrecht <alwin@handhelds.org>, Juergen Graf <jgf@handhelds.org>, Maximilian Reiß <harlekin@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.5$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopiecore2, opie-mail | 8 | Depends: task-opie-minimal, libopiecore2, opie-mail |
9 | Description: A Biff-like mailchecker | 9 | Description: A Biff-like mailchecker |
10 | License: LGPL | 10 | License: LGPL |
diff --git a/noncore/net/opierdesktop/opie-rdesktop.control b/noncore/net/opierdesktop/opie-rdesktop.control index 2a9d415..754e572 100644 --- a/noncore/net/opierdesktop/opie-rdesktop.control +++ b/noncore/net/opierdesktop/opie-rdesktop.control | |||
@@ -1,9 +1,9 @@ | |||
1 | Package: opie-rdesktop | 1 | Package: opie-rdesktop |
2 | Files: bin/ordesktop pics/opierdesktop apps/Applications/ordesktop.desktop | 2 | Files: bin/ordesktop pics/opierdesktop apps/Applications/ordesktop.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.2.0$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | Description: Remote Desktop Protocol (RDP) Client | 9 | Description: Remote Desktop Protocol (RDP) Client |
diff --git a/noncore/net/opietooth/blue-pin/opie-bluepin.control b/noncore/net/opietooth/blue-pin/opie-bluepin.control index e9aa683..3d94691 100644 --- a/noncore/net/opietooth/blue-pin/opie-bluepin.control +++ b/noncore/net/opietooth/blue-pin/opie-bluepin.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-bluepin | 1 | Package: opie-bluepin |
2 | Files: plugins/application/libbluepin.so* bin/bluepin | 2 | Files: plugins/application/libbluepin.so* bin/bluepin |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Holger Freyther <zecke@handhelds.org> | 5 | Maintainer: Holger Freyther <zecke@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.3.4$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: Bluetooth pin application | 10 | Description: Bluetooth pin application |
diff --git a/noncore/net/opietooth/manager/opie-bluetoothmanager.control b/noncore/net/opietooth/manager/opie-bluetoothmanager.control index 89ab698..5a4d01d 100644 --- a/noncore/net/opietooth/manager/opie-bluetoothmanager.control +++ b/noncore/net/opietooth/manager/opie-bluetoothmanager.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-bluetoothmanager | 1 | Package: opie-bluetoothmanager |
2 | Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/* | 2 | Files: plugins/application/libbluetooth-manager.so* bin/bluetooth-manager apps/Settings/bluetooth-manager.desktop pics/opietooth/* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Maximilian Reiß <max.reiss@gmx.de> | 5 | Maintainer: Maximilian Reiß <max.reiss@gmx.de> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.5.4$EXTRAVERSION |
8 | Depends: task-opie-minimal, libopietooth1, opie-bluepin | 8 | Depends: task-opie-minimal, libopietooth1, opie-bluepin |
9 | License: GPL | 9 | License: GPL |
10 | Description: Bluetooth Manager application | 10 | Description: Bluetooth Manager application |
diff --git a/noncore/net/wellenreiter/opie-wellenreiter.control b/noncore/net/wellenreiter/opie-wellenreiter.control index 7dc9c22..2c36d17 100644 --- a/noncore/net/wellenreiter/opie-wellenreiter.control +++ b/noncore/net/wellenreiter/opie-wellenreiter.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-wellenreiter | 1 | Package: opie-wellenreiter |
2 | Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop | 2 | Files: bin/wellenreiter pics/wellenreiter apps/Applications/wellenreiter.desktop |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> | 5 | Maintainer: Michael 'Mickey' Lauer <mickeyl@handhelds.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.0.3$EXTRAVERSION |
8 | Depends: libqpe1, libpcap0.8 (>=0.7.2), libopiecore2, libopienet2, libopieui2 | 8 | Depends: libqpe1, libpcap0.8 (>=0.7.2), libopiecore2, libopienet2, libopieui2 |
9 | Description: A WaveLAN Network Monitor | 9 | Description: A WaveLAN Network Monitor |
10 | A WaveLAN Network Monitor/Sniffer for the Opie Environment. | 10 | A WaveLAN Network Monitor/Sniffer for the Opie Environment. |
diff --git a/noncore/securityplugins/blueping/bluepingplugin.control b/noncore/securityplugins/blueping/bluepingplugin.control index 62562f7..4b3e96a 100644 --- a/noncore/securityplugins/blueping/bluepingplugin.control +++ b/noncore/securityplugins/blueping/bluepingplugin.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-bluepingplugin | 1 | Package: opie-multiauth-bluepingplugin |
2 | Files: plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth | 2 | Files: plugins/security/libmultiauthbluepingplugin.so* pics/security/bluepingplugin.png root/etc/suspend-scripts/S50bluetooth |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security, bluez-utils (<= 2.3rel-hh5) | 8 | Depends: libopiecore2, opie-security, bluez-utils (<= 2.3rel-hh5) |
9 | Description: Blueping plugin for opie-security authentication. | 9 | Description: Blueping plugin for opie-security authentication. |
10 | This is a bluetooth-based authentication plugin (you need | 10 | This is a bluetooth-based authentication plugin (you need |
11 | to have another Bluetooth device around to use it). | 11 | to have another Bluetooth device around to use it). |
diff --git a/noncore/securityplugins/dummy/dummyplugin.control b/noncore/securityplugins/dummy/dummyplugin.control index b4cc5e2..bfd4d8d 100644 --- a/noncore/securityplugins/dummy/dummyplugin.control +++ b/noncore/securityplugins/dummy/dummyplugin.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-dummyplugin | 1 | Package: opie-multiauth-dummyplugin |
2 | Files: plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png | 2 | Files: plugins/security/libmultiauthdummyplugin.so* pics/security/dummyplugin.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security | 8 | Depends: libopiecore2, opie-security |
9 | Description: Dummy plugin for opie-security authentication. | 9 | Description: Dummy plugin for opie-security authentication. |
10 | This is a very simple authentication plugin (you just have | 10 | This is a very simple authentication plugin (you just have |
11 | to press a button basically), for demonstration purpose. | 11 | to press a button basically), for demonstration purpose. |
diff --git a/noncore/securityplugins/notice/notice.control b/noncore/securityplugins/notice/notice.control index 091ce74..29a8fb7 100644 --- a/noncore/securityplugins/notice/notice.control +++ b/noncore/securityplugins/notice/notice.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-noticeplugin | 1 | Package: opie-multiauth-noticeplugin |
2 | Files: plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png | 2 | Files: plugins/security/libmultiauthnoticeplugin.so* pics/security/noticeplugin.png pics/security/noticeplugin_small.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.1$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security | 8 | Depends: libopiecore2, opie-security |
9 | Description: Notice plugin for opie-security authentication. | 9 | Description: Notice plugin for opie-security authentication. |
10 | It allows you to display e.g. a notice from your legal departement. | 10 | It allows you to display e.g. a notice from your legal departement. |
11 | 11 | ||
diff --git a/noncore/securityplugins/pin/pin.control b/noncore/securityplugins/pin/pin.control index 51c3f08..9235f04 100644 --- a/noncore/securityplugins/pin/pin.control +++ b/noncore/securityplugins/pin/pin.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-multiauth-pinplugin | 1 | Package: opie-multiauth-pinplugin |
2 | Files: plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png | 2 | Files: plugins/security/libmultiauthpinplugin.so* pics/security/pinplugin.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/settings | 4 | Section: opie/settings |
5 | Maintainer: Clement Seveillac <clement@nist.gov> | 5 | Maintainer: Clement Seveillac <clement@nist.gov> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.0.2$EXTRAVERSION |
8 | Depends: libopiecore2, opie-security | 8 | Depends: libopiecore2, opie-security |
9 | Description: PIN plugin for opie-security authentication. | 9 | Description: PIN plugin for opie-security authentication. |
10 | Simple PIN-based authentication plugin (replicate the functionality | 10 | Simple PIN-based authentication plugin (replicate the functionality |
11 | Qtopia has, or Opie used to have, without plugins). | 11 | Qtopia has, or Opie used to have, without plugins). |
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control index 496a036..6627335 100644 --- a/noncore/tools/opie-sh/opie-sh.control +++ b/noncore/tools/opie-sh/opie-sh.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-sh | 1 | Package: opie-sh |
2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html | 2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/sh | 4 | Section: opie/sh |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.5$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: A QDialog shell frontend | 10 | Description: A QDialog shell frontend |
11 | A program to let you use various dialogs from the console (or a shell script) | 11 | A program to let you use various dialogs from the console (or a shell script) |
diff --git a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control index 0d6b235..9450eee 100644 --- a/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control +++ b/noncore/tools/opie-sh/scripts/opie-sh-wavelanchooser.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-sh-wavelanchooser | 1 | Package: opie-sh-wavelanchooser |
2 | Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png | 2 | Files: bin/opie-sh-wavelanchooser.sh apps/Opie-SH/opie-sh-wavelanchooser.desktop pics/opie-sh-scripts/qtwavelan.png |
3 | Installed-Size: 0 | 3 | Installed-Size: 0 |
4 | Version: $QPE_VERSION$EXTRAVERSION | 4 | Version: 0.1$EXTRAVERSION |
5 | Depends: task-opie-minimal (1.5.0+), opie-sh | 5 | Depends: task-opie-minimal (1.5.0+), opie-sh |
6 | Priority: optional | 6 | Priority: optional |
7 | Section: opie/sh | 7 | Section: opie/sh |
8 | Maintainer: gonz <gonz@directbox.com> | 8 | Maintainer: gonz <gonz@directbox.com> |
9 | Architecture: all | 9 | Architecture: all |
10 | License: GPL | 10 | License: GPL |
11 | Description: Frontend to choose wavelan config | 11 | Description: Frontend to choose wavelan config |
diff --git a/noncore/unsupported/gsmtool/opie-gsmtool.control b/noncore/unsupported/gsmtool/opie-gsmtool.control index d987b11..6c5e4a3 100644 --- a/noncore/unsupported/gsmtool/opie-gsmtool.control +++ b/noncore/unsupported/gsmtool/opie-gsmtool.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-gsmtool | 1 | Package: opie-gsmtool |
2 | Files: plugins/application/libgsmtool.so* bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool | 2 | Files: plugins/application/libgsmtool.so* bin/gsmtool apps/Applications/gsmtool.desktop pics/gsmtool |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: David Woodhouse <dwmw2@infradead.org> | 5 | Maintainer: David Woodhouse <dwmw2@infradead.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 1.0.0$EXTRAVERSION |
8 | Depends: task-opie-minimal, gsmlib | 8 | Depends: task-opie-minimal, gsmlib |
9 | License: Public Domain | 9 | License: Public Domain |
10 | Description: GSMTool program | 10 | Description: GSMTool program |
11 | An GSM phone utility program for the Opie environment. | 11 | An GSM phone utility program for the Opie environment. |
diff --git a/noncore/unsupported/ubrowser/opie-ubrowser.control b/noncore/unsupported/ubrowser/opie-ubrowser.control index bfa6c30..349a7df 100644 --- a/noncore/unsupported/ubrowser/opie-ubrowser.control +++ b/noncore/unsupported/ubrowser/opie-ubrowser.control | |||
@@ -1,10 +1,10 @@ | |||
1 | Package: opie-ubrowser | 1 | Package: opie-ubrowser |
2 | Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png plugins/application/libubrowser.so* | 2 | Files: bin/ubrowser apps/Applications/ubrowser.desktop pics/ubrowser/*.png plugins/application/libubrowser.so* |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: 0.1$EXTRAVERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: A very small web browser | 10 | Description: A very small web browser |
diff --git a/scripts/GeneratePackageMake b/scripts/GeneratePackageMake index 099d3e8..9d692a9 100755 --- a/scripts/GeneratePackageMake +++ b/scripts/GeneratePackageMake | |||
@@ -1,137 +1,137 @@ | |||
1 | # generate file containg control name / package name / files | 1 | # generate file containg control name / package name / files |
2 | find . -name *.control | grep -v -- "-mt.control" | while read i | 2 | find . -name *.control | grep -v -- "-mt.control" | while read i |
3 | do | 3 | do |
4 | i=${i/.\//} | 4 | i=${i/.\//} |
5 | CDIR=${i%/*} | 5 | CDIR=${i%/*} |
6 | BNAME=${i##*/} | 6 | BNAME=${i##*/} |
7 | BNAME=${BNAME/.control/} | 7 | BNAME=${BNAME/.control/} |
8 | echo "cdir: ${CDIR}" | 8 | echo "cdir: ${CDIR}" |
9 | echo "bname: ${BNAME}" | 9 | echo "bname: ${BNAME}" |
10 | grep -e "Package:" -e "Files:" ./${i} | 10 | grep -e "Package:" -e "Files:" ./${i} |
11 | done > /tmp/ALL | 11 | done > /tmp/ALL |
12 | 12 | ||
13 | # | 13 | # |
14 | # makefile header | 14 | # makefile header |
15 | # | 15 | # |
16 | 16 | ||
17 | cat << MAKEFILEHEADER | 17 | cat << MAKEFILEHEADER |
18 | 18 | ||
19 | # | 19 | # |
20 | # generate -mt.control file from regular control | 20 | # generate -mt.control file from regular control |
21 | # arg 1 : path to control file to convert | 21 | # arg 1 : path to control file to convert |
22 | # | 22 | # |
23 | 23 | ||
24 | define GenerateMTControl | 24 | define GenerateMTControl |
25 | @echo "Generating -mt control file for \$(basename \$<)" | 25 | @echo "Generating -mt control file for \$(basename \$<)" |
26 | @\$(OPIEDIR)/scripts/tothreaded \$< \$(OPIEDIR)/AllThreadedPackages | 26 | @\$(OPIEDIR)/scripts/tothreaded \$< \$(OPIEDIR)/AllThreadedPackages |
27 | endef | 27 | endef |
28 | 28 | ||
29 | # | 29 | # |
30 | # package one control file | 30 | # package one control file |
31 | # arg 1 : directory from OPIEROOT where control file resides | 31 | # arg 1 : directory from OPIEROOT where control file resides |
32 | # arg 2 : control file basename without -mt (no .control) | 32 | # arg 2 : control file basename without -mt (no .control) |
33 | # arg 3 : control file basename with -mt if needed | 33 | # arg 3 : control file basename with -mt if needed |
34 | # arg 4 : package name (value specified by Package: ...) | 34 | # arg 4 : package name (value specified by Package: ...) |
35 | # | 35 | # |
36 | 36 | ||
37 | define DoPackage | 37 | define DoPackage |
38 | @echo \"Building ipk of \$(4)\" | 38 | echo \"Building ipk of \$(4)\" |
39 | @( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst | 39 | ( \$(ForSubst) ) > \$(TOPDIR)/scripts/subst |
40 | @( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst | 40 | ( \$(ForFileSubst) ) > \$(TOPDIR)/scripts/Filesubst |
41 | @( cd \$(OPIEDIR); \\ | 41 | ( cd \$(OPIEDIR); \\ |
42 | \$(OPIEDIR)/scripts/mkipkg \\ | 42 | \$(OPIEDIR)/scripts/mkipkg \\ |
43 | --subst=\$(OPIEDIR)/scripts/subst \\ | 43 | --subst=\$(OPIEDIR)/scripts/subst \\ |
44 | --filesubst=\$(OPIEDIR)/scripts/filesubst \\ | 44 | --filesubst=\$(OPIEDIR)/scripts/filesubst \\ |
45 | --control=\$(OPIEDIR)/\$(1)/\$(3).control \\ | 45 | --control=\$(OPIEDIR)/\$(1)/\$(3).control \\ |
46 | --prerm=\$(OPIEDIR)/\$(1)/\$(2).prerm \\ | 46 | --prerm=\$(OPIEDIR)/\$(1)/\$(2).prerm \\ |
47 | --preinst=\$(OPIEDIR)/\$(1)/\$(2).preinst \\ | 47 | --preinst=\$(OPIEDIR)/\$(1)/\$(2).preinst \\ |
48 | --postrm=\$(OPIEDIR)/\$(1)/\$(2).postrm \\ | 48 | --postrm=\$(OPIEDIR)/\$(1)/\$(2).postrm \\ |
49 | --postinst=\$(OPIEDIR)/\$(1)/\$(2).postinst \\ | 49 | --postinst=\$(OPIEDIR)/\$(1)/\$(2).postinst \\ |
50 | --strip=\$(STRIP) \$(OPIEDIR); \\ | 50 | --strip=\$(STRIP) \$(OPIEDIR); \\ |
51 | rm -f \$(OPIEDIR)/Packages/\$(4)_*.ipk; \\ | 51 | rm -f \$(OPIEDIR)/Packages/\$(4)_*.ipk; \\ |
52 | mv *.ipk \$(OPIEDIR)/Packages; \\ | 52 | mv *.ipk \$(OPIEDIR)/Packages; \\ |
53 | touch \$(OPIEDIR)/Packages/\$(4) \\ | 53 | touch \$(OPIEDIR)/Packages/\$(4) \\ |
54 | ) || true | 54 | ) || true |
55 | endef | 55 | endef |
56 | 56 | ||
57 | # | 57 | # |
58 | # prepared for generating the substfile for every build | 58 | # prepared for generating the substfile for every build |
59 | # | 59 | # |
60 | 60 | ||
61 | define ForSubst | 61 | define ForSubst |
62 | echo 's,\\\$\$QPE_VERSION,\$(QPE_VERSION),g'; \\ | 62 | echo 's,\\\$\$QPE_VERSION,\$(QPE_VERSION),g'; \\ |
63 | echo 's,\\\$\$OPIE_VERSION,\$(OPIE_VERSION),g'; \\ | 63 | echo 's,\\\$\$OPIE_VERSION,\$(OPIE_VERSION),g'; \\ |
64 | echo 's,\\\$\$QTE_VERSION,\$(QTE_VERSION),g'; \\ | 64 | echo 's,\\\$\$QTE_VERSION,\$(QTE_VERSION),g'; \\ |
65 | echo 's,\\\$\$QTE_REVISION,\$(QTE_REVISION),g'; \\ | 65 | echo 's,\\\$\$QTE_REVISION,\$(QTE_REVISION),g'; \\ |
66 | echo 's,\\\$\$SUB_VERSION,\$(SUB_VERSION),g'; \\ | 66 | echo 's,\\\$\$SUB_VERSION,\$(SUB_VERSION),g'; \\ |
67 | echo 's,\\\$\$EXTRAVERSION,\$(EXTRAVERSION),g'; \\ | 67 | echo 's,\\\$\$EXTRAVERSION,\$(EXTRAVERSION),g'; \\ |
68 | echo 's,\\\$\$QTE_BASEVERSION,\$(QTE_BASEVERSION),g' | 68 | echo 's,\\\$\$QTE_BASEVERSION,\$(QTE_BASEVERSION),g' |
69 | endef | 69 | endef |
70 | 70 | ||
71 | define ForFileSubst | 71 | define ForFileSubst |
72 | echo 's,\\\$\$OPIEDIR/root/,/,g'; \\ | 72 | echo 's,\\\$\$OPIEDIR/root/,/,g'; \\ |
73 | echo 's,\$(OPIEDIR)/root/,/,g'; \\ | 73 | echo 's,\$(OPIEDIR)/root/,/,g'; \\ |
74 | echo 's,\\\$\$OPIEDIR,\$(prefix),g'; \\ | 74 | echo 's,\\\$\$OPIEDIR,\$(prefix),g'; \\ |
75 | echo 's,\$(OPIEDIR),\$(prefix),g'; \\ | 75 | echo 's,\$(OPIEDIR),\$(prefix),g'; \\ |
76 | echo 's,\\\$\$QTDIR,\$(prefix),g'; \\ | 76 | echo 's,\\\$\$QTDIR,\$(prefix),g'; \\ |
77 | echo 's,\$(QTDIR),\$(prefix),g'; \\ | 77 | echo 's,\$(QTDIR),\$(prefix),g'; \\ |
78 | echo 's,^\(\./\)*root/,/,g'; \\ | 78 | echo 's,^\(\./\)*root/,/,g'; \\ |
79 | echo 's,^\(\./\)*etc/,\$(prefix)/etc/,g'; \\ | 79 | echo 's,^\(\./\)*etc/,\$(prefix)/etc/,g'; \\ |
80 | echo 's,^\(\./\)*lib/,\$(prefix)/lib/,g'; \\ | 80 | echo 's,^\(\./\)*lib/,\$(prefix)/lib/,g'; \\ |
81 | echo 's,^\(\./\)*bin/,\$(prefix)/bin/,g'; \\ | 81 | echo 's,^\(\./\)*bin/,\$(prefix)/bin/,g'; \\ |
82 | echo 's,^\(\./\)*pics/,\$(prefix)/pics/,g'; \\ | 82 | echo 's,^\(\./\)*pics/,\$(prefix)/pics/,g'; \\ |
83 | echo 's,^\(\./\)*sounds/,\$(prefix)/sounds/,g'; \\ | 83 | echo 's,^\(\./\)*sounds/,\$(prefix)/sounds/,g'; \\ |
84 | echo 's,^\(\./\)*i18n/,\$(prefix)/i18n/,g'; \\ | 84 | echo 's,^\(\./\)*i18n/,\$(prefix)/i18n/,g'; \\ |
85 | echo 's,^\(\./\)*plugins/,\$(prefix)/plugins/,g'; \\ | 85 | echo 's,^\(\./\)*plugins/,\$(prefix)/plugins/,g'; \\ |
86 | echo 's,^\(\./\)*apps/,\$(prefix)/apps/,g'; \\ | 86 | echo 's,^\(\./\)*apps/,\$(prefix)/apps/,g'; \\ |
87 | echo 's,^\(\./\)*share/,\$(prefix)/share/,g'; \\ | 87 | echo 's,^\(\./\)*share/,\$(prefix)/share/,g'; \\ |
88 | echo 's,^\(\./\)*i18n/,\$(prefix)/i18n/,g'; \\ | 88 | echo 's,^\(\./\)*i18n/,\$(prefix)/i18n/,g'; \\ |
89 | echo 's,^\(\./\)*help/,\$(prefix)/help/,g' | 89 | echo 's,^\(\./\)*help/,\$(prefix)/help/,g' |
90 | endef | 90 | endef |
91 | 91 | ||
92 | # | 92 | # |
93 | # Will contain a list of all non-mt control files | 93 | # Will contain a list of all non-mt control files |
94 | ALLCONTROLFILES= | 94 | ALLCONTROLFILES= |
95 | 95 | ||
96 | # | 96 | # |
97 | # Will contain a list of all packaging targets | 97 | # Will contain a list of all packaging targets |
98 | ALLPACKAGES= | 98 | ALLPACKAGES= |
99 | 99 | ||
100 | # s contains now single space | 100 | # s contains now single space |
101 | s=\$(x) \$(x) | 101 | s=\$(x) \$(x) |
102 | 102 | ||
103 | # | 103 | # |
104 | # for convenience : generate AllTh | 104 | # for convenience : generate AllTh |
105 | ATP=\$(OPIEDIR)/AllThreadedPackages | 105 | ATP=\$(OPIEDIR)/AllThreadedPackages |
106 | 106 | ||
107 | MAKEFILEHEADER | 107 | MAKEFILEHEADER |
108 | 108 | ||
109 | while read k | 109 | while read k |
110 | do | 110 | do |
111 | CDIR="${k#* }" | 111 | CDIR="${k#* }" |
112 | read k | 112 | read k |
113 | BNAME="${k#* }" | 113 | BNAME="${k#* }" |
114 | read k | 114 | read k |
115 | case $k in | 115 | case $k in |
116 | *"ackage:"*) | 116 | *"ackage:"*) |
117 | Pkg="${k#* }" | 117 | Pkg="${k#* }" |
118 | Pkg="${Pkg// }" | 118 | Pkg="${Pkg// }" |
119 | ;; | 119 | ;; |
120 | *"iles:"*) | 120 | *"iles:"*) |
121 | Files="${k/Files:/}" | 121 | Files="${k/Files:/}" |
122 | ;; | 122 | ;; |
123 | esac | 123 | esac |
124 | read k | 124 | read k |
125 | case $k in | 125 | case $k in |
126 | *"ackage:"*) | 126 | *"ackage:"*) |
127 | Pkg="${k#* }" | 127 | Pkg="${k#* }" |
128 | Pkg="${Pkg// }" | 128 | Pkg="${Pkg// }" |
129 | ;; | 129 | ;; |
130 | *"iles:"*) | 130 | *"iles:"*) |
131 | Files="${k/Files:/}" | 131 | Files="${k/Files:/}" |
132 | ;; | 132 | ;; |
133 | esac | 133 | esac |
134 | 134 | ||
135 | cat << HERE | 135 | cat << HERE |
136 | # | 136 | # |
137 | # package $Pkg in ${BNAME} | 137 | # package $Pkg in ${BNAME} |
diff --git a/scripts/mkipkg b/scripts/mkipkg index a336371..2f020f4 100755 --- a/scripts/mkipkg +++ b/scripts/mkipkg | |||
@@ -151,225 +151,229 @@ findFile() | |||
151 | fi | 151 | fi |
152 | } | 152 | } |
153 | 153 | ||
154 | _pushd() { oldpwd=`pwd`; cd $1; } | 154 | _pushd() { oldpwd=`pwd`; cd $1; } |
155 | _popd() { cd $oldpwd; } | 155 | _popd() { cd $oldpwd; } |
156 | 156 | ||
157 | setVar() | 157 | setVar() |
158 | { | 158 | { |
159 | eval "$1='$2'" | 159 | eval "$1='$2'" |
160 | } | 160 | } |
161 | 161 | ||
162 | expandMaskToList() | 162 | expandMaskToList() |
163 | { | 163 | { |
164 | local _list=`echo $1` | 164 | local _list=`echo $1` |
165 | local _tmpFileList= | 165 | local _tmpFileList= |
166 | for f in $_list; do | 166 | for f in $_list; do |
167 | if [ -d $f ]; then | 167 | if [ -d $f ]; then |
168 | f="`findFile $f`" | 168 | f="`findFile $f`" |
169 | fi | 169 | fi |
170 | _tmpFileList="`eval echo $f` $_tmpFileList" | 170 | _tmpFileList="`eval echo $f` $_tmpFileList" |
171 | done | 171 | done |
172 | setVar $2 "$_tmpFileList" | 172 | setVar $2 "$_tmpFileList" |
173 | } | 173 | } |
174 | 174 | ||
175 | createFileList() | 175 | createFileList() |
176 | { | 176 | { |
177 | local excludeMask | 177 | local excludeMask |
178 | local includeMask | 178 | local includeMask |
179 | local includemaskpresent=0 | 179 | local includemaskpresent=0 |
180 | local excludemaskpresent=0 | 180 | local excludemaskpresent=0 |
181 | 181 | ||
182 | if (grep -q ^FileExcludeMask $1); then | 182 | if (grep -q ^FileExcludeMask $1); then |
183 | excludemaskpresent=1 | 183 | excludemaskpresent=1 |
184 | excludeMask=$(eval echo '"'$(sed -n -e "s,^FileExcludeMask: *,,p" $1)'"') | 184 | excludeMask=$(eval echo '"'$(sed -n -e "s,^FileExcludeMask: *,,p" $1)'"') |
185 | fi | 185 | fi |
186 | if (grep -q ^FileIncludeMask $1); then | 186 | if (grep -q ^FileIncludeMask $1); then |
187 | includemaskpresent=1 | 187 | includemaskpresent=1 |
188 | includeMask=$(eval echo '"'$(sed -n -e "s,^FileIncludeMask: *,,p" $1)'"') | 188 | includeMask=$(eval echo '"'$(sed -n -e "s,^FileIncludeMask: *,,p" $1)'"') |
189 | else | 189 | else |
190 | if (grep -q ^Files: $1); then | 190 | if (grep -q ^Files: $1); then |
191 | includemaskpresent=1 | 191 | includemaskpresent=1 |
192 | includeMask=$(eval echo '"'$(sed -n -e "s,^Files: *,,p" $1)'"') | 192 | includeMask=$(eval echo '"'$(sed -n -e "s,^Files: *,,p" $1)'"') |
193 | fi | 193 | fi |
194 | fi | 194 | fi |
195 | 195 | ||
196 | _pushd $destdir | 196 | _pushd $destdir |
197 | 197 | ||
198 | declare -a excludeMaskArray | 198 | declare -a excludeMaskArray |
199 | excludeMaskArray=( $excludeMask ) | 199 | excludeMaskArray=( $excludeMask ) |
200 | excludeMaskArray=( "${excludeMaskArray[@]}" "CONTROL/*" "usr/share/*" ) | 200 | excludeMaskArray=( "${excludeMaskArray[@]}" "CONTROL/*" "usr/share/*" ) |
201 | 201 | ||
202 | if [ $includemaskpresent != 1 ]; then | 202 | if [ $includemaskpresent != 1 ]; then |
203 | includeMask="." | 203 | includeMask="." |
204 | fi | 204 | fi |
205 | 205 | ||
206 | if [ -z "$includeMask" ]; then | 206 | if [ -z "$includeMask" ]; then |
207 | setVar $2 "" | 207 | setVar $2 "" |
208 | _popd | 208 | _popd |
209 | return 0 | 209 | return 0 |
210 | fi | 210 | fi |
211 | 211 | ||
212 | expandMaskToList "$includeMask" _fileList | 212 | expandMaskToList "$includeMask" _fileList |
213 | 213 | ||
214 | excludeMaskArray=( "${excludeMaskArray[@]}" "*/CVS*" "*/SCCS*" ) | 214 | excludeMaskArray=( "${excludeMaskArray[@]}" "*/CVS*" "*/SCCS*" ) |
215 | 215 | ||
216 | local realFileList= | 216 | local realFileList= |
217 | local missing=0 | 217 | local missing=0 |
218 | for file in $_fileList; do | 218 | for file in $_fileList; do |
219 | local containedInList=0 | 219 | local containedInList=0 |
220 | for i in "${excludeMaskArray[@]}"; do | 220 | for i in "${excludeMaskArray[@]}"; do |
221 | if [[ $file == $i ]]; then | 221 | if [[ $file == $i ]]; then |
222 | containedInList=1 | 222 | containedInList=1 |
223 | break; | 223 | break; |
224 | fi | 224 | fi |
225 | done | 225 | done |
226 | 226 | ||
227 | if [ $containedInList = 0 ]; then | 227 | if [ $containedInList = 0 ]; then |
228 | if ! [ -e $file -o -L $file ]; then | 228 | if ! [ -e $file -o -L $file ]; then |
229 | echo "$self: $file not found" | 229 | echo "$self: $file not found" |
230 | missing=1 | 230 | missing=1 |
231 | fi | 231 | fi |
232 | realFileList=$file" $realFileList" | 232 | realFileList=$file" $realFileList" |
233 | fi | 233 | fi |
234 | done | 234 | done |
235 | 235 | ||
236 | _popd | 236 | _popd |
237 | 237 | ||
238 | if [ $missing = 1 ]; then | 238 | if [ $missing = 1 ]; then |
239 | return 1 | 239 | return 1 |
240 | fi | 240 | fi |
241 | 241 | ||
242 | setVar $2 "$realFileList" | 242 | setVar $2 "$realFileList" |
243 | } | 243 | } |
244 | 244 | ||
245 | stripFile() | 245 | stripFile() |
246 | { | 246 | { |
247 | if [ -f $1 -a -x $1 ]; then | 247 | if [ ! -h $1 -a -f $1 -a -x $1 ]; then |
248 | $strip --strip-all $1 | 248 | $strip -p --strip-all $1 |
249 | fi | 249 | fi |
250 | } | 250 | } |
251 | 251 | ||
252 | substFile() | 252 | substFile() |
253 | { | 253 | { |
254 | local oldfile=$1 | 254 | local oldfile=$1 |
255 | 255 | ||
256 | if [ ! -e $2 ]; then return 1; fi | 256 | if [ ! -e $2 ]; then return 1; fi |
257 | 257 | ||
258 | if [ -e $oldfile -o -L $oldfile ]; then | 258 | if [ -e $oldfile -o -L $oldfile ]; then |
259 | newfile=`echo $oldfile|sed -f $2|sed -e's,^/,,g'` | 259 | newfile=`echo $oldfile|sed -f $2|sed -e's,^/,,g'` |
260 | olddir=`dirname $oldfile` | 260 | olddir=`dirname $oldfile` |
261 | base=`basename $oldfile` | 261 | base=`basename $oldfile` |
262 | newdir=`dirname $newfile` | 262 | newdir=`dirname $newfile` |
263 | 263 | ||
264 | # echo >&2 moving $oldfile to $newfile | 264 | # echo >&2 moving $oldfile to $newfile |
265 | 265 | ||
266 | if [ "$newdir" = "$olddir" ]; then | 266 | if [ "$newdir" = "$olddir" ]; then |
267 | return 0 | 267 | return 0 |
268 | fi | 268 | fi |
269 | 269 | ||
270 | mkdir -p $newdir | 270 | mkdir -p $newdir |
271 | mv $olddir/$base $newfile | 271 | mv $olddir/$base $newfile |
272 | rmdir -p $olddir 2>/dev/null | 272 | rmdir -p $olddir 2>/dev/null |
273 | fi | 273 | fi |
274 | } | 274 | } |
275 | 275 | ||
276 | stripFiles() | 276 | stripFiles() |
277 | { | 277 | { |
278 | for f in $1; do | 278 | for f in $1; do |
279 | # do not strip links | ||
280 | if [ ! -h ./$f ] | ||
281 | then | ||
279 | stripFile ./$f | 282 | stripFile ./$f |
283 | fi | ||
280 | done | 284 | done |
281 | } | 285 | } |
282 | 286 | ||
283 | substFiles() | 287 | substFiles() |
284 | { | 288 | { |
285 | for f in $1; do | 289 | for f in $1; do |
286 | substFile ./$f | 290 | substFile ./$f |
287 | done | 291 | done |
288 | } | 292 | } |
289 | 293 | ||
290 | substAndStripFiles() | 294 | substAndStripFiles() |
291 | { | 295 | { |
292 | for f in $1; do | 296 | for f in $1; do |
293 | stripFile ./$f | 297 | stripFile ./$f |
294 | substFile ./$f $2 | 298 | substFile ./$f $2 |
295 | done | 299 | done |
296 | } | 300 | } |
297 | 301 | ||
298 | installScript() | 302 | installScript() |
299 | { | 303 | { |
300 | if [ -n "$1" -a -f "$1" ]; then | 304 | if [ -n "$1" -a -f "$1" ]; then |
301 | destfile=`basename $1` | 305 | destfile=`basename $1` |
302 | filetype=`echo $destfile|cut -d. -f2` | 306 | filetype=`echo $destfile|cut -d. -f2` |
303 | if [ -n "$filetype" ]; then destfile=$filetype; fi | 307 | if [ -n "$filetype" ]; then destfile=$filetype; fi |
304 | if [ -n "$subst" ]; then | 308 | if [ -n "$subst" ]; then |
305 | sed -f $subst < $1 > $ctrldir/$destfile | 309 | sed -f $subst < $1 > $ctrldir/$destfile |
306 | else | 310 | else |
307 | cat $1 > $ctrldir/$destfile | 311 | cat $1 > $ctrldir/$destfile |
308 | fi | 312 | fi |
309 | chmod +x $ctrldir/$destfile | 313 | chmod +x $ctrldir/$destfile |
310 | fi | 314 | fi |
311 | } | 315 | } |
312 | 316 | ||
313 | tempDir=/tmp/`basename $self`.$$ | 317 | tempDir=/tmp/`basename $self`.$$ |
314 | mkdir -p $tempDir | 318 | mkdir -p $tempDir |
315 | if [ $? != 0 ]; then | 319 | if [ $? != 0 ]; then |
316 | echo "$self: cannot create $tempDir, exiting..." | 320 | echo "$self: cannot create $tempDir, exiting..." |
317 | rm -rf $tempDir | 321 | rm -rf $tempDir |
318 | exit 1 | 322 | exit 1 |
319 | fi | 323 | fi |
320 | 324 | ||
321 | ctrldir=$tempDir/CONTROL | 325 | ctrldir=$tempDir/CONTROL |
322 | 326 | ||
323 | mkdir -p $ctrldir | 327 | mkdir -p $ctrldir |
324 | 328 | ||
325 | if [ ! -e $subst ] || [ -z "$subst" ]; then | 329 | if [ ! -e $subst ] || [ -z "$subst" ]; then |
326 | cat $control > $ctrldir/control.new | 330 | cat $control > $ctrldir/control.new |
327 | else | 331 | else |
328 | sed -f $subst < $control > $ctrldir/control.new | 332 | sed -f $subst < $control > $ctrldir/control.new |
329 | fi | 333 | fi |
330 | 334 | ||
331 | createFileList $ctrldir/control.new ipkgFileList | 335 | createFileList $ctrldir/control.new ipkgFileList |
332 | 336 | ||
333 | if [ "$?" != "0" ]; then | 337 | if [ "$?" != "0" ]; then |
334 | echo "$self: ERROR: missing files, not building $control" | 338 | echo "$self: ERROR: missing files, not building $control" |
335 | rm -rf $tempDir | 339 | rm -rf $tempDir |
336 | exit 1 | 340 | exit 1 |
337 | fi | 341 | fi |
338 | 342 | ||
339 | 343 | ||
340 | cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control | 344 | cat $ctrldir/control.new | egrep -v '^(Files|FileExcludeMask|FileIncludeMask):' > $ctrldir/control |
341 | rm -f $ctrldir/control.new | 345 | rm -f $ctrldir/control.new |
342 | 346 | ||
343 | ( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null ) | 347 | ( cd $destdir && tar -cf - $ipkgFileList 2>/dev/null ) | ( cd $tempDir && tar -xf - 2>/dev/null ) |
344 | 348 | ||
345 | if [ -z "$filesubst" ]; then | 349 | if [ -z "$filesubst" ]; then |
346 | ( cd $tempDir && stripFiles "$ipkgFileList" ) | 350 | ( cd $tempDir && stripFiles "$ipkgFileList" ) |
347 | else | 351 | else |
348 | if ! (echo $filesubst|grep -q '^/'); then | 352 | if ! (echo $filesubst|grep -q '^/'); then |
349 | filesubst="$oldpwd/$filesubst" | 353 | filesubst="$oldpwd/$filesubst" |
350 | fi | 354 | fi |
351 | ( cd $tempDir && substAndStripFiles "$ipkgFileList" $filesubst ) | 355 | ( cd $tempDir && substAndStripFiles "$ipkgFileList" $filesubst ) |
352 | fi | 356 | fi |
353 | 357 | ||
354 | # removing CVS directories | 358 | # removing CVS directories |
355 | find $tempDir -name CVS -a -type d -print0 | xargs -0 rm -rf | 359 | find $tempDir -name CVS -a -type d -print0 | xargs -0 rm -rf |
356 | 360 | ||
357 | path="`echo "$PATH" | sed -e "s/\:/ /g"`" | 361 | path="`echo "$PATH" | sed -e "s/\:/ /g"`" |
358 | if [ -z "$mkfsjffs2" ]; then | 362 | if [ -z "$mkfsjffs2" ]; then |
359 | for i in $path; do | 363 | for i in $path; do |
360 | if [ -x "$i/mkfs.jffs2" ]; then | 364 | if [ -x "$i/mkfs.jffs2" ]; then |
361 | mkfsjffs2="$i/mkfs.jffs2" | 365 | mkfsjffs2="$i/mkfs.jffs2" |
362 | break | 366 | break |
363 | fi | 367 | fi |
364 | done | 368 | done |
365 | fi | 369 | fi |
366 | 370 | ||
367 | if [ -z "$mkfsjffs2" ]; then | 371 | if [ -z "$mkfsjffs2" ]; then |
368 | echo "$self: WARNING: no mkjfs.jffs2 found in path. Falling back to using du" | 372 | echo "$self: WARNING: no mkjfs.jffs2 found in path. Falling back to using du" |
369 | echo "for size calculation. mkfs.jffs2 is recommended for size calculation" | 373 | echo "for size calculation. mkfs.jffs2 is recommended for size calculation" |
370 | echo "as it calculates the real package size on the compressed file system," | 374 | echo "as it calculates the real package size on the compressed file system," |
371 | echo "in contrast to du calculating the uncompressed size!" | 375 | echo "in contrast to du calculating the uncompressed size!" |
372 | buildsize=`du -h -s $tempDir | awk '{print $1}'` | 376 | buildsize=`du -h -s $tempDir | awk '{print $1}'` |
373 | else | 377 | else |
374 | buildsize=`$mkfsjffs2 -r $tempDir | wc -c` | 378 | buildsize=`$mkfsjffs2 -r $tempDir | wc -c` |
375 | fi | 379 | fi |
diff --git a/scripts/tothreaded b/scripts/tothreaded index 31ed31e..f916ad8 100755 --- a/scripts/tothreaded +++ b/scripts/tothreaded | |||