[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=7ba7daa

The following commit has been merged in the master branch:
commit 7ba7daa5f66be4f9b92b266d0889ee758104a90f
Author: Andreas Huggel <ahuggel at gmx.net>
Date:   Wed Dec 30 06:26:57 2009 +0000

    Minor doc update.
---
 README | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/README b/README
index 65c2031..d052ea0 100644
--- a/README
+++ b/README
@@ -58,7 +58,7 @@ Feature                     Package   Configure options
 PNG image support           zlib      --without-zlib
                                       --with-zlib=DIR
 Native language support     gettext   --disable-nls
-Converting Windows XP tags  libiconv  --without-libiconv-prefix
+Characterset conversions    libiconv  --without-libiconv-prefix
                                       --with-libiconv-prefix[=DIR]
 XMP support                 expat     --disable-xmp
                                       --with-expat=DIR
@@ -160,10 +160,9 @@ MA 02110-1301 USA.
 Commercial version
 ==================
 
-If you have a commercial license, you must disable NLS support, 
-conversion of UCS2 characters in XP tags and the conversion of
-Nikon lens data to readable lens names to build a commercial 
-version of the Exiv2 library.
+If you have a commercial license, you must disable NLS support and
+the conversion of Nikon lens data to readable lens names to build a
+commercial version of the Exiv2 library.
 
 To do this on Windows, compile the library with the preprocessor
 symbol EXV_COMMERCIAL_VERSION defined in the file src\exv_msvc.h.

-- 
exiv2 packaging