bye bye libopie1

4 files changed, 12 insertions, 17 deletions

diff --git a/ChangeLog b/ChangeLog
index d343f54..5ccad50 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,82 +1,89 @@
         2004-??-??Opie 1.1.8
 
         New Features
         ------------
         * PackageManager supports installation of local ipkg files (drw)
 
         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-14Opie 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)
         * OpiePlayer2 gained adding of Directories to the playlist (zecke)
         * OpiePlayer2 better error handling (zecke)
         * OpiePlayer2 progress indication while streaming (zecke)
         * OpiePlayer2 ported to use libxine 1.0.0-rc6a (brad,zecke)
         * Ported brightnessapplet from Qtopia 1.7 (mickeyl)
         * Opie-Eye got a Digital Camera File Backend (alwin,zecke)
         * Support for Tuxpad1 of Tradesquare.NL (mickeyl,zecke)
         * Opie-Console use Custom Font and Size in a Profile (harlekin)
         * Opie-Console transparently log the Output and Input to a file (harlekin)
         * Added new O-menu icon to lock the PDA immediately: opie-lockapplet (clem)
         * Opie-Security now hides the plugin-based authentication tabs if no auth. plugin package is installed (clem)
         * Opie-Security gained a 'test authentication' button (clem)
         * Opie-Eye  got a more unique layout (menubar), a slideshow, user can setup some defaults
         * Opie-Mail improve the handling of POP mail boxes (alwin)
         * Both Opie-Eye and Opie-Mail were greatly improved due the hard work of Rajko Albrecht(alwin)
         * Opie IRC - backports of the 'NeIRC fork' (zecke)
 
         Fixed Bugs
         ----------
         * #501  - Pickboard is able to show 'Umlaute' (TT,zecke)
         * #608  - Make Opie usable for left handed users (zecke)
         * #957  - Import of VCards/VTodos/VEvents with BASE64 encoding (ljp,zecke)
         * #1245 - Opie-Go 'paused' (zecke)
         * #1358 - DocTab didn't show any MimeTypes (was fixed earlier) (zecke)
         * #1380 - QDateBookAccess::remove() doesn't remove entries (eilers, zecke)
         * #1395 - Build VNC Backend with gcc3.4
         * #1440 - The icon of opie-mobilemsg is missing (CoreDump)
         * #1426 - Add missing opie-bartender Icon (CoreDump)
         * #1445 - Opie-Sheet Has No Icon (CoreDump)
         * #1448 - Brightness Applet added (mickeyl)
         * #1450 - ZSame didn't clear the bonus item after winning a game (zecke)
         * #1482 - Fix OFileSelector to be able to sort by size (zecke)
         * 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-17Opie 1.1.6
 
         New Features
         ------------
         * Fifteen gained configurable number of items (zecke)
         * Fifteen can have custom background images (zecke)
         * Added daemonizing capabilities to QWS Server [via Qt/Embedded] (mickeyl)
         * Integrated the new security framework into libopie2 (zecke,clem)
         * Converted the launcher to use the new security framework (zecke)
         * Backup can now handle custom locations for backup and restore (ar)
         * Implemented right-on-hold feedback (wimpie,zecke)
         * Lots of new features in opie-reader (tim,pohly)
         * Build system cleanups (schurig)
 
         Fixed Bugs
         --------
         * #1005 - Fixed backup to CompactFlash (ar)
         * #1167 - Fixed Opie write crashing on more text than one page (ar)
         * #1225 - Fixed repeated light flashing on Zaurus with keyz (mickeyl)
         * #1359 - Fixed bookmarks in Gutenbrowser (ljp)
         * #1361 - Fixed auto upercase in Opie-Addressbook (eilers)
         * #1370 - Pimconverter now reacts on cancel key (eilers)
         * #1376 - Bring back the capslock/numlock display (zecke)
diff --git a/Rules.make b/Rules.make
index c025d72..644a6cf 100644
--- a/Rules.make
+++ b/Rules.make
@@ -144,79 +144,70 @@ $(QTDIR)/stamp-headers :
         @-rm -f $(QTDIR)/stamp-headers*
         ( cd $(QTDIR)/include; \
                 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
                 qcopchannel_qws.h qwindowsystem_qws.h \
                 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
         touch $@
 
 $(QTDIR)/stamp-headers-x11 :
         @-rm -f $(QTDIR)/stamp-headers*
         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)
         touch $@
 
 $(OPIEDIR)/stamp-headers :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe \
                 $(TOPDIR)/include/qtopia \
                 $(TOPDIR)/include/opie \
                 $(TOPDIR)/include/opie2 \
                 $(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 .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiepim/core/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiepim/backend/*.h .; )
         ( cd include/opie2/private && ln -sf ../../../libopie2/opiepim/private/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiepim/ui/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opieui/fileselector/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opieui/big-screen/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiesecurity/*.h .; )
         # auxilliary libraries
         ( 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 $@
 
 $(OPIEDIR)/stamp-headers-x11 :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
                 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
         ( 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 .; )
         ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
         ( cd include/opie &&  ln -sf ../../libsql/*.h .; )
         ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
         ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
         ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
         ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
         touch $@
 
 $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
diff --git a/config.in b/config.in
index 372ecfb..8cffa38 100644
--- a/config.in
+++ b/config.in
@@ -160,50 +160,48 @@ config OPIE_TASKBAR_LOCK_KEY_STATE
   default y if TARGET_SHARP
   default n if !TARGET_SHARP
 
 config LIBQPE_WITHROHFEEDBACK
   boolean "Build libqpe with Right-On-Hold feedback"
   default y
 
 config OPIE_NO_SOUND_PCM_READ_BITS
   boolean "There is not a pcm_read_bits io control"
   default y if TARGET_SHARP
   default n if ! TARGET_SHARP
 endmenu
 
 menu "Dependencies"
     source dependencies.in
 endmenu
 
 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
   source core/launcher/config.in
   source core/symlinker/config.in
 endmenu
 
 comment ""
 
 menu "Applets"
   source core/applets/config.in
   source noncore/applets/config.in
 endmenu
 
 menu "Apps"
   source core/apps/config.in
   source noncore/apps/config.in
 endmenu
 
 menu "Communications and Networking"
   source noncore/comm/config.in
diff --git a/packages b/packages
index ac614f2..e84184c 100644
--- a/packages
+++ b/packages
@@ -1,38 +1,38 @@
         CONFIG_ABOUTAPPLET      core/applets/aboutappletaboutapplet.pro
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
 CONFIG_APPLET_EXAMPLE   examples/applet example.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/settings/aqpkgaqpkg.pro
         CONFIG_AUTOROTATEAPPLET         noncore/applets/autorotateappletautorotateapplet.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BARTENDER noncore/apps/opie-bartenderbartender.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/unsupported/mail2/bendbend.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/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BRIGHTNESSAPPLET         noncore/applets/brightnessappletbrightnessapplet.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALC2    noncore/tools/calc2calc.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CAMERA   noncore/multimedia/cameracamera.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
 CONFIG_DAGGER noncore/apps/dagger dagger.pro
         CONFIG_DASHER   inputmethods/dasherdasher.pro
         CONFIG_DATEBOOK2        core/pim/datebook2datebook2.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
@@ -64,51 +64,50 @@ CONFIG_JUMPX	inputmethods/jumpx	jumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER                 core/launcherserver.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LIBFFMPEG        core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         CONFIG_LIBFLASH         core/multimedia/opieplayer/libflashlibflash.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/unsupported/mail2/libmaillibmail.pro
 CONFIG_LIBMAILWRAPPER   noncore/net/mail/libmailwrapper  libmailwrapper.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE2CORE     libopie2/opiecoreopiecore.pro
         CONFIG_LIBOPIE2DB       libopie2/opiedbopiedb.pro
         CONFIG_LIBOPIE2EXAMPLES         libopie2/examplesexamples.pro
         CONFIG_LIBOPIE2MM       libopie2/opiemmopiemm.pro
         CONFIG_LIBOPIE2NET      libopie2/opienetopienet.pro
         CONFIG_LIBOPIE2PIM      libopie2/opiepimopiepim.pro
         CONFIG_LIBOPIE2SECURITYlibopie2/opiesecurity opiesecurity.pro
         CONFIG_LIBOPIE2UI       libopie2/opieuiopieui.pro
-        CONFIG_LIBOPIE  libopielibopie.pro
-        CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
+        CONFIG_LIBOPIEnoncore/unsupported/libopie libopie.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
 CONFIG_LIBQRSYNC    rsync   rsync.pro
         CONFIG_LIBQTAUX         libqtauxlibqtaux.pro
         CONFIG_LIBSLCOMPAT      libslcompatlibslcompat.pro
         CONFIG_LIBSQL   libsqllibsql.pro
 CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
 CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOCKAPPLET       core/applets/lockappletlockapplet.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_MAIL3            noncore/net/mail        mail.pro
 CONFIG_MAILAPPLET     noncore/net/mail/taskbarapplet  taskbarapplet.pro
         CONFIG_MAILIT           noncore/unsupported/mailit      mailit.pro
 CONFIG_MAIN_TAB_EXAMPLE examples/main-tab       example.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
         CONFIG_MEMORYAPPLET     noncore/applets/memoryappletmemoryapplet.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
 CONFIG_MULTIAUTH_BLUEPING     noncore/securityplugins/blueping        bluepingplugin.pro