2 files changed, 20 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index db5c0ef..6b05a99 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,15 +1,15 @@
-        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)
@@ -17,22 +17,25 @@
         * #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
         
         
diff --git a/README b/README
index 0c6ef68..91164d5 100644
--- a/README
+++ b/README
@@ -13,9 +13,9 @@ 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
 
@@ -68,9 +68,9 @@ For a successful Opie build, you need to install the following libraries and hea
 
 * 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/
@@ -86,8 +86,17 @@ For a successful Opie build, you need to install the following libraries and hea
 
 * 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:
@@ -97,9 +106,9 @@ For a successful usage of Opie, you should install the following programs:
 
 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