generic: rename merged libraries directories for consistency

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

CMakeLists.txt

@@ -230,38 +230,39 @@ check_library_exists(socket connect "" HAVE_SOCKET_LIBRARY)
 ################# list the subdirectories #################
 
 add_subdirectory( cmake )
+
+add_subdirectory( dnssd )
+add_subdirectory( includes )
+add_subdirectory( interfaces )
+add_subdirectory( kcddb )
+add_subdirectory( kcompactdisc ) 
+add_subdirectory( kdcraw )
+add_subdirectory( kdeclarative )
 add_subdirectory( kdecore )
-add_subdirectory( kdeui )
-add_subdirectory( kpty )
-add_subdirectory( kdesu )
-add_subdirectory( kio )
-add_subdirectory( solid )
 add_subdirectory( kded )
+add_subdirectory( kdesu )
+add_subdirectory( kdeui )
+add_subdirectory( kdewebkit )
+add_subdirectory( kdewidgets )
+add_subdirectory( kexiv2 )
 add_subdirectory( kfile )
+add_subdirectory( kimgio )
+add_subdirectory( kinit )
+add_subdirectory( kio )
 add_subdirectory( kioslave )
+add_subdirectory( knotify )
 add_subdirectory( kparts )
+add_subdirectory( kpty )
+add_subdirectory( kross )
+add_subdirectory( kunitconversion )
 add_subdirectory( kutils )
 add_subdirectory( licenses )
 add_subdirectory( mimetypes )
-add_subdirectory( kinit )
-add_subdirectory( threadweaver )
-add_subdirectory( sonnet )
-add_subdirectory( interfaces )
-add_subdirectory( kdewidgets )
-add_subdirectory( knotify )
-add_subdirectory( kimgio )
-add_subdirectory( dnssd )
-add_subdirectory( kross )
-add_subdirectory( security )
 add_subdirectory( plasma )
-add_subdirectory( kunitconversion )
-add_subdirectory( kdewebkit )
-add_subdirectory( kdeclarative )
-add_subdirectory( includes )
-add_subdirectory( libkdcraw )
-add_subdirectory( libkexiv2 )
-add_subdirectory( libkcddb )
-add_subdirectory( libkcompactdisc )
+add_subdirectory( security )
+add_subdirectory( solid )
+add_subdirectory( sonnet )
+add_subdirectory( threadweaver )
 
 ################# write kdelibs package config files which will be installed #################
 

README

@@ -123,7 +123,7 @@ headings and other identifying marks.
 Common Mistakes
 ---------------
 If cmake claims Qt cannot be found, look at http://qt.nokia.com/
-to get a copy of Qt, version 4.7 or newer. If you have peeked there
+to get a copy of Qt, version 4.8 or newer. If you have peeked there
 already, grab the SVN module qt-copy from anonsvn.kde.org, or a snapshot
 thereof.  Alternatively the svn module qt-copy from svn.kde.org can also be
 used.
@@ -200,7 +200,4 @@ So, here are some tips on bug reporting:
 
 More info
 ---------
-http://www.kde.org/ is a good starting point for info on KDE. If you are a
-developer, you may also point your browser to http://techbase.kde.org/.
-There is a plethora of mailing lists available, you can gain an overview
-quickly by looking at http://lists.kde.org/.
+https://github.com/fluxer/katana/wiki is a good starting point for info on KDE.