2 files changed, 20 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index db5c0ef..6b05a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,82 +1,85 @@
-        2005-??-??Opie 1.2.2
+        2006-05-28Opie 1.2.2
         
         
         New Features
         ------------
         * Appearance: Added configuration options to set smallIconSize, bigIconSize, useBigPixmaps (hrw, drw)
         * Opie-Notes: Notes application based on NoteZ (hrw)
         * Opie-PackageManager: Added two configuration options: "Force recursive", "Verbose fetch" (hrw)
-        * Added hardware support for HTC Universal (ljp)
+        * Added platform support for HTC Universal (ljp)
         * Made Opie-Bluetooth subsystem actually usable (korovkin)
-        * Added hardware support for the Motorola EZX platform (mickeyl)
+        * Added platform support for the Motorola EZX platform (mickeyl)
 
         Fixed Bugs
         ----------
         * #1695 - Date selector use too small fontsize on VGA screen (hrw)
         * #1686 - opie-console lack UI setting for switching scrollbar (hrw)
         * #1647 - Opie-console doesn't respect scroll-bar on left side (hrw)
         * #1624 - Button settngs changes are applied only after restart (hrw)
         * #1492 - Backup and Restore does not show list of backups to restore on start (hrw)
         * n.a.  - remove hardcoded font size from wellenreiter (hrw)
-        * n.a.  - added patch to build QT/E 2.3.10 with gcc 4.x.x (hrw)
+        * n.a.  - added patch to build Qt/E 2.3.10 with gcc 4.x.x (hrw)
         * n.a.  - make blue-pin UI resizable to looks good in any resolution (hrw)
         * n.a.  - fix a problem with vCard send to Sony Ericsson k600i (ar)
         * n.a.  - add a patch to build Qt/E 2.3.10 on amd64 with gcc 4.x.x (ar)
         * n.a.  - Opie-console fallback to FixedFont settings from qpe.conf in config (hrw)
-        * n.a.  - Set version to 1.2.1 in About applet (hrw)
+        * n.a.  - Update version in About applet (hrw)
         * n.a.  - add firstusage and background pictures for 480x640 devices (mickeyl)
         * n.a.  - many bluetooth fixes (korovkin)
 
         Internal
         --------
         * libopiecore: /etc/oz_version renamed to /etc/openzaurus-version (hrw)
         * libopiecore: SL6000 (tosa) now uses corgi-bl (Dirk Opfer)
         * library/version.h: introduce integer version code in OPIE_VERSION for conditional compilation
+        * g++ 4.1.1 fixes all around (no extra qualifiers allowed) (mickeyl)
+        * update README (mickeyl)
+        * remove libslcompat - it never worked and we don't support Sharp closed source anymore anyway (mickeyl)
         
         2005-09-11Opie 1.2.1
         
         
         New Features
         ------------
         * OpieStumbler: Scans WiFi networks using the wireless extension scanning (skyhusker)
         * Opie-Reader: Support for document formats ArriereGo and Reb, add flite output (tim,pohly)
         * Opie-Networksettings: Add support for wlan-ng devices and improve WEP handling (Dirk Opfer)
         * Wellenreiter: Remove Joining networks - use OpieStumbler for that (mickeyl)
         * Opie-Mobilemsg has gone unsupported - it never really worked and there will be a replacement (mickeyl)
         * Opie-Tabmanager has gone unsupported - it barely works and there is not much of a use of it anyway (mickeyl)
         * Checkbook: Added configuration option to use smaller font for checkbook transaction tab (hrw)
         * ZSafe: Made UI conform to Opie standards (drw)
         * Today Addressbook plugin: Fixed configuration to show/not show birthdays, use checkboxes for selection (hrw)
         * Opie-Console: Read initial fixed font configuration from qpe.conf (mickeyl)
         * Opie-PcmciaApplet: Configure insert/resume actions and bind unsupported cards (mickeyl)
         * SysInfo: Remove CPU tab and add Devices tab instead (mickeyl)
         * Opie-smb: Added Opie front end for Samba (ljp)
         * Opie-Bluetooth: Replace obex send implementation and patch libopieobex and the bluetoothapplet (Michael Haynie)
         * Opieplayer: rudimentary podcast support (ljp)
         
         Fixed Bugs
         ----------
         * #1377 - Suspend Powermanagement when switched to another VT (mickeyl)
                 - We actually suspend the complete Opie now in that case.
         * #1384 - Battery status updated improperly when charging (skyhusker)
         * #1476 - Wrong order of application entries in the O-menu (skyhusker)
         * #1514 - Remove usage of cardmon/pcmcia picture in applications. pcmcia is now an inline picture (mickeyl)
                 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
         * #1543 - Time Settings: "predict" tab is displayed twice after reopen (hrw)
         * #1546 - Battery applet popup is not always large enough to show jacket remaining info (skyhusker)
         * #1557 - Light&Power-Settings don't store warning intervall and warning levels (skyhusker)
         * #1565 - crash-fix in odevice.cpp while scanning the distribution table (deller)
         * #1614 - Make Opie-console start in $HOME instead of / (skyhusker)
         * #1635 - opie-today, datebook-plugin does not show notes (skyhusker)
         * #1665 - Opie-IRC displays the host prepended to the message when peer is using and ipv6 address (skyhusker)
                 * #1666 - Opie-IRC does not allow to add !channels in config asautojoin ones (skyhusker)
         * #1667 - Opie-IRC does not show messages from !channel (skyhusker)
         * #1679 - Security PIN plugin is QVGA sized (hrw)
         * #1682 - Properly resize tab control in OTabWidget (drw)
         * n.a.  - always show volume and wireless applet popups inside visible screen (deller)
         * n.a.  - scale O-Menu-Applets appropriately (mickeyl)
         * n.a.  - libopienet: fix bugs in wireless scanning and setting SSID (skyhusker)
         * n.a.  - Wellenreiter: relax WE version matching test a bit (mickeyl)
         * n.a.  - scale BluezApplet appropriately and use larger icons (mickeyl)
         * n.a.  - memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
         * n.a.  - networksettings: ignore hostap control interfaces wifi* (mickeyl)
diff --git a/README b/README
index 0c6ef68..91164d5 100644
--- a/README
+++ b/README
@@ -1,112 +1,121 @@
 1. How to use the Opie build system
 ====================================
 There's a tutorial document at:
 http://www.uv-ac.de/opiedev/opiedev.html
 
 The API reference currently is at:
 http://handhelds.org/~zecke/apidocs/index.html
 
 You will need qvfb, uic and
 (if you want to develop applications) designer
 compiled and linked against Qt/X11.
 That means you must download and configure/make it:
 wget ftp://ftp.trolltech.com/qt/source/qt-x11-2.3.2.tar.gz
 (Alternatively, you can get static binaries from http://www.vanille.de/tools)
 
 You will need Qt/Embedded 2.3.10. Note that we don't support any
-other Qt/Embedded version anymore.
+other Qt/Embedded version anymore. Qt/Embedded 2.3.12 is not recommended atm.
 
 You can get it from:
 ftp://ftp.trolltech.com/qt/source/qt-embedded-2.3.10-free.tar.bz2
 
 Set QTDIR to point to your qt/embedded source tree, such as:
 export QTDIR=/opt/qt-2.3.10
 
 You need to do set the OPIEDIR environment variable:
 export OPIEDIR=`pwd`
 or
 export OPIEDIR=~/projects/sources/opie
 or wherever you placed the Opie sources.
 
 You need to adjust your runtime library search path,
 so that the Qt/Embedded and Opie libraries can be found:
 export LD_LIBRARY_PATH=$OPIEDIR/lib:$QTDIR/lib:$LD_LIBRARY_PATH
 
 You have to apply the patches corresponding to your Qt/Embedded version
 and copy the qconfig-qpe.h file to $QTDIR/src/tools:
 cd $QTDIR; cat $OPIEDIR/qt/qt-<version>.patch/qte<version>-all.patch | patch -p1
 cp $OPIEDIR/qt/qconfig-qpe.h $QTDIR/src/tools
 
 You are now ready to configure and build Qt/Embedded
 
 cd $QTDIR
 echo 'yes' | ./configure -qconfig qpe -depths 4,16,24,32 -system-jpeg -system-libpng -system-zlib -no-xkb -no-sm -no-xft -qvfb
 make
 
 Note that the above command ( -qvfb ) compiles in the Virtual 
 Framebuffer and is mostly meant for development on your host system.
 For cross compiling, you will need to use the -xplatform switch.
 See ./configure --help for details about the possible options.
 
 Once you have these compiled, be sure to set the PATH to ensure your (cross)compiler
 is available.
 
 Then do the following in the opie source tree:
 
 make clean
 make menuconfig
 
 Now you can move through the menu and select or deselect anything..
 Exit and save the configuration and enter "make" to build everything selected.
 
 Have fun!
 
 2. Required Libraries
 =====================
 
 For a successful Opie build, you need to install the following libraries and headers:
 
 * libsdl >= 1.2.0
   http://www.libsdl.org/download-1.2.php
 
-* libxine >= 1.0
+* libxine >= 1.0 && <= 1.1
   http://prdownloads.sourceforge.net/xine/
 
 * libpcap >= 0.7.2
   http://www.tcpdump.org/release/
 
 * libetpan >= 0.34
   http://prdownloads.sourceforge.net/libetpan/
 
 * libsqlite >= 3.0.0
   http://www.sqlite.org/download.html
 
 * libipk >= 138
   ftp://handhelds.org/linux/packages/ipkg
 
 * libobexftp >= 0.19
   http://triq.net/obexftp.html
 
+* libsword >= 1.5.8
+  http://www.crossfire.org/sword
+
+* libbluez >= 2.25
+  http://www.bluez.org
+
+* libfreetype6 >= 2.21
+  http://www.freetype.org
+
 3. Required Programs
 ====================
 
 For a successful usage of Opie, you should install the following programs:
 
 * obexftpd
 * obextool
 
 4. Supported Devices
 ====================
 
-Sharp Zaurus SL-5x00, SL-B500, SL-C7x0, SL-C8x0, SL-C1000, SL-C3000, SL-C3100, SL-6000
+Sharp Zaurus SL-5x00, SL-B500, SL-Cxx0, SL-Cxx00, SL-6000
 
 HP iPAQ 36xx, 37xx, 38xx, 39xx, 54xx, 55xx
 
 SIEMENS SIMpad CL4, SL4, SLC, T-SinusPAD
 
 MasterIA Beagle, Tradesquare.NL Tuxpad 1
 
 GMate Yopy 3x00
 
 Motorola EZX A780, E680