summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-11-16 22:19:47 (UTC)
committer mickeyl <mickeyl>2004-11-16 22:19:47 (UTC)
commit539a1bfc1c120bcd196f2b7ab27befde1550e661 (patch) (side-by-side diff)
tree112ec70184ad5e8bf765c4df2a0897791b9eb145
parentadd434632dc0b449a1439215ecbc2ae0589fd713 (diff)
downloadopie-539a1bfc1c120bcd196f2b7ab27befde1550e661.zip
opie-539a1bfc1c120bcd196f2b7ab27befde1550e661.tar.gz
opie-539a1bfc1c120bcd196f2b7ab27befde1550e661.tar.bz2
bye bye libopie1
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog13
-rw-r--r--Rules.make9
-rw-r--r--config.in2
-rw-r--r--packages5
4 files changed, 12 insertions, 17 deletions
diff --git a/ChangeLog b/ChangeLog
index d343f54..5ccad50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,13 +6,17 @@
Fixed Bugs
----------
* #1464 - Packagemanager dont set active filter after install a package (drw)
* n.a. - PackageManager - (Minor UI tweak) in filter dialog, when option is enabled, set focus to widget that corresponds to that option (drw)
* n.a. - PackageManager - (Minor UI tweak) fix double entry in source feed configuration when adding a new feed (drw)
-
+
+ Internal
+ --------
+ * Moved libopie1 to unsupported (mickeyl)
+
2004-11-14 Opie 1.1.7
New Features
------------
* libOpieDB now uses SQLite V3 instead V2. Remember to upgrade your database files! (eilers)
* Backup now uses the busy indicator when backing up and restore (ar)
@@ -51,14 +55,17 @@
* n.a. - Opie-mail: fixed some crasher, some layout-problems
* n.a. - Converted applications to not hardcode /opt/QtPalmtop but to use QPEApplication::qpeDir (zecke)
* n.a. - Converted usage of qpeDir() not to include a '/' as first charachter of the string (zecke)
* n.a. - Build system: Enable distcc and ccache when crosscompiling too, and use them everywhere we can (clem)
* n.a. - Build system: Fix deps in several config.in (and fix scripts/deps.pl too) to stop breaking builds, especially with make -j highNumber (clem)
* n.a. - Removed hardcoded icon size in a couple of applets (mickeyl)
- * n.a. - Opie-Qashmoney has been moved to unsupported (mickeyl)
- * n.a. - Opie-Ubrowser has been moved to unsupported (mickeyl)
+
+ Internal
+ --------
+ * Opie-Qashmoney has been moved to unsupported (mickeyl)
+ * Opie-Ubrowser has been moved to unsupported (mickeyl)
2004-09-17 Opie 1.1.6
New Features
------------
* Fifteen gained configurable number of items (zecke)
diff --git a/Rules.make b/Rules.make
index c025d72..644a6cf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -162,17 +162,12 @@ $(OPIEDIR)/stamp-headers :
$(TOPDIR)/include/opie2/private \
$(TOPDIR)/include/qtopia/private \
$(TOPDIR)/include/sl
( cd include/qpe && rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
-ifeq ($(CONFIG_LIBOPIE),y)
- # libopie1
- ( cd include/opie && rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
- ( cd include/opie && ln -sf ../../libopie/pim/*.h .; )
-endif
# libopie2
( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opiecore/device/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
@@ -189,16 +184,12 @@ endif
( cd include/opie2 && ln -sf ../../libqtaux/*.h .; )
( cd include/sl && ln -sf ../../libslcompat/*.h .; )
( cd include/ && ln -sf ../noncore/net/ftplib/*.h .; )
( cd include/ && ln -sf ../inputmethods/pickboard/pickboardcfg.h .; )
( cd include/ && ln -sf ../inputmethods/pickboard/pickboardpicks.h .; )
# all
-ifeq ($(CONFIG_LIBOPIE),y)
- ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
- ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
-endif
( cd include/opie2; for generatedHeader in `cd ../../libopie2/opieui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
ln -sf ../../libopie2/opieui/$$generatedHeader $$generatedHeader; done )
( cd include/opie2; for generatedHeader in `cd ../../libopie2/opiepim/ui; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
ln -sf ../../libopie2/opiepim/ui/$$generatedHeader $$generatedHeader; done )
ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
touch $@
diff --git a/config.in b/config.in
index 372ecfb..8cffa38 100644
--- a/config.in
+++ b/config.in
@@ -178,14 +178,12 @@ menu "Base"
choice
prompt "Qpe Library Selection"
default LIBQPE
source library/config.in
source x11/config.in
endchoice
- source libopie/config.in
-
source libopie2/config.in
source libqtaux/config.in
source rsync/config.in
source core/opie-login/config.in
source core/opiealarm/config.in
source core/tools/quicklauncher/config.in
diff --git a/packages b/packages
index ac614f2..e84184c 100644
--- a/packages
+++ b/packages
@@ -8,13 +8,13 @@ CONFIG_AQPKG noncore/settings/aqpkg aqpkg.pro
CONFIG_AUTOROTATEAPPLET noncore/applets/autorotateapplet autorotateapplet.pro
CONFIG_BACKGAMMON noncore/games/backgammon backgammon.pro
CONFIG_BACKUP noncore/settings/backup backup.pro
CONFIG_BARTENDER noncore/apps/opie-bartender bartender.pro
CONFIG_BATTERYAPPLET core/applets/batteryapplet batteryapplet.pro
CONFIG_BEND noncore/unsupported/mail2/bend bend.pro
-CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro
+CONFIG_BIGSCREEN_EXAMPLE unsupported/libopie/big-screen/example osplitter_mail.pro
CONFIG_BINARY noncore/tools/calc2/binary binary.pro
CONFIG_BLUE-PIN noncore/net/opietooth/blue-pin blue-pin.pro
CONFIG_BOUNCE noncore/games/bounce bounce.pro
CONFIG_BRIGHTNESSAPPLET noncore/applets/brightnessapplet brightnessapplet.pro
CONFIG_BUTTON-SETTINGS core/settings/button button.pro
CONFIG_BUZZWORD noncore/games/buzzword buzzword.pro
@@ -82,15 +82,14 @@ CONFIG_LIBOPIE2DB libopie2/opiedb opiedb.pro
CONFIG_LIBOPIE2EXAMPLES libopie2/examples examples.pro
CONFIG_LIBOPIE2MM libopie2/opiemm opiemm.pro
CONFIG_LIBOPIE2NET libopie2/opienet opienet.pro
CONFIG_LIBOPIE2PIM libopie2/opiepim opiepim.pro
CONFIG_LIBOPIE2SECURITY libopie2/opiesecurity opiesecurity.pro
CONFIG_LIBOPIE2UI libopie2/opieui opieui.pro
-CONFIG_LIBOPIE libopie libopie.pro
-CONFIG_LIBOPIE_PIM libopie/pim pim.pro
CONFIG_LIBOPIETOOTH noncore/net/opietooth/lib lib.pro
+CONFIG_LIBOPIE noncore/unsupported/libopie libopie.pro
CONFIG_LIBQPE library library.pro
CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro
CONFIG_LIBQRSYNC rsync rsync.pro
CONFIG_LIBQTAUX libqtaux libqtaux.pro
CONFIG_LIBSLCOMPAT libslcompat libslcompat.pro
CONFIG_LIBSQL libsql libsql.pro