Merge branch 'master' of ssh://kiao.no-ip.info:443/~/pakxe

16 files changed, 752 insertions, 1517 deletions

diff --git a/extra/amarok/.footprint.i686 b/extra/amarok/.footprint.i686
index 538a30bfe..703d54926 100644
--- a/extra/amarok/.footprint.i686
+++ b/extra/amarok/.footprint.i686
@@ -3,17 +3,14 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/amarok
 -rwxr-xr-x	root/root	usr/bin/amarok_afttagger
 -rwxr-xr-x	root/root	usr/bin/amarokcollectionscanner
--rwxr-xr-x	root/root	usr/bin/amarokmp3tunesharmonydaemon
 -rwxr-xr-x	root/root	usr/bin/amarokpkg
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_appletscript_simple_javascript.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-audiocdcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-daapcollection.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-mtpcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-mysqlecollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-mysqlservercollection.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-playdarcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-umscollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-upnpcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_containment_vertical.so
@@ -41,11 +38,9 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_ampache.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_jamendo.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_magnatunestore.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_mp3tunes.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_opmldirectory.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_amarok_service_ampache.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_amarok_service_magnatunestore.so
--rwxr-xr-x	root/root	usr/lib/kde4/kcm_amarok_service_mp3tunes.so
 lrwxrwxrwx	root/root	usr/lib/libamarok-sqlcollection.so -> libamarok-sqlcollection.so.1
 lrwxrwxrwx	root/root	usr/lib/libamarok-sqlcollection.so.1 -> libamarok-sqlcollection.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamarok-sqlcollection.so.1.0.0
@@ -59,8 +54,8 @@ lrwxrwxrwx	root/root	usr/lib/libamaroklib.so -> libamaroklib.so.1
 lrwxrwxrwx	root/root	usr/lib/libamaroklib.so.1 -> libamaroklib.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamaroklib.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so -> libamarokocsclient.so.4
-lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.6.0
--rwxr-xr-x	root/root	usr/lib/libamarokocsclient.so.4.6.0
+lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.7.0
+-rwxr-xr-x	root/root	usr/lib/libamarokocsclient.so.4.7.0
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so -> libamarokpud.so.1
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so.1 -> libamarokpud.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamarokpud.so.1.0.0
@@ -479,27 +474,6 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/images/
 -rw-r--r--	root/root	usr/share/apps/amarok/images/volume_icon.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/volume_muted_icon.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/web_applet_background.svg
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/librivox_service/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/COPYING
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxEmblem.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxIcon.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxLogo.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxScalableEmblem.svgz
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxService.html
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/README
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/audio_book128.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/script.spec
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/lyrics_lyricwiki/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/lyrics_lyricwiki/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/lyrics_lyricwiki/script.spec
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/radio_station_service/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/radio_station_service/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/radio_station_service/script.spec
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/script_console/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/script_console/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/script_console/script.spec
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/colors
@@ -544,8 +518,6 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/de/amarok/common -> /usr/share/doc/k
 -rw-r--r--	root/root	usr/share/doc/kde/html/de/amarok/index.docbook
 drwxr-xr-x	root/root	usr/share/doc/kde/html/en/
 drwxr-xr-x	root/root	usr/share/doc/kde/html/en/amarok/
--rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Addingmusic.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-addingmusic2.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-context.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-contextadd.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-removefromplaylist.png
@@ -557,7 +529,12 @@ drwxr-xr-x	root/root	usr/share/doc/kde/html/en/amarok/
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.1rating.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.1right.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.1scriptmanager.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.4.1ConfigureDialogCollection.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.4.1SavePlaylistChoices.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/AmarokNew2.4.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok_-_internet_services.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok_addtoplaylist.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok_addtoplaylist1.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarokbreadcrumb.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarokcollection.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarokfull.png
@@ -662,6 +639,48 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/it/amarok/common -> /usr/share/doc/k
 -rw-r--r--	root/root	usr/share/doc/kde/html/it/amarok/quick.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/it/amarok/requirements.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/it/amarok/using.docbook
+drwxr-xr-x	root/root	usr/share/doc/kde/html/nl/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/nl/amarok/
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/add_dynamic.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/amarok_playlist.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/analyzer.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/buttons.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/collection.png
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/nl/amarok/common -> /usr/share/doc/kde/html/nl/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_appearance.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_collection.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_engine.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_general.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_osd.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_playback.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_scrobbler.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/context.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/coverman.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/dynamic_bar.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/dynamic_settings.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/equalizer.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/file_browser.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/logo.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/media_device.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/menubar.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/musicbrainz.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/pl_browser.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/pl_tip1.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/play_list.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/player_window.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/playlist_browser.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/playlist_window.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/queue_manager.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/rmb_menu.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/script_manager.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/status_bar.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_lyrics.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_lyrics1.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_music.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_wiki.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/vis_window.png
 drwxr-xr-x	root/root	usr/share/doc/kde/html/pt/
 drwxr-xr-x	root/root	usr/share/doc/kde/html/pt/amarok/
 lrwxrwxrwx	root/root	usr/share/doc/kde/html/pt/amarok/common -> /usr/share/doc/kde/html/pt/common
@@ -764,10 +783,8 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/amarok.protocol
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-audiocdcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-daapcollection.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-mtpcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-mysqlecollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-mysqlservercollection.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-playdarcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-umscollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-upnpcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_device_massstorage.desktop
@@ -778,8 +795,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_jamendo.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_magnatunestore.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_magnatunestore_config.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_service_mp3tunes.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_service_mp3tunes_config.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_opmldirectory.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarokitpc.protocol
 drwxr-xr-x	root/root	usr/share/kde4/servicetypes/
diff --git a/extra/amarok/.footprint.x86_64 b/extra/amarok/.footprint.x86_64
index 538a30bfe..703d54926 100644
--- a/extra/amarok/.footprint.x86_64
+++ b/extra/amarok/.footprint.x86_64
@@ -3,17 +3,14 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/amarok
 -rwxr-xr-x	root/root	usr/bin/amarok_afttagger
 -rwxr-xr-x	root/root	usr/bin/amarokcollectionscanner
--rwxr-xr-x	root/root	usr/bin/amarokmp3tunesharmonydaemon
 -rwxr-xr-x	root/root	usr/bin/amarokpkg
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_appletscript_simple_javascript.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-audiocdcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-daapcollection.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-mtpcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-mysqlecollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-mysqlservercollection.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-playdarcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-umscollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_collection-upnpcollection.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_containment_vertical.so
@@ -41,11 +38,9 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_ampache.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_jamendo.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_magnatunestore.so
--rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_mp3tunes.so
 -rwxr-xr-x	root/root	usr/lib/kde4/amarok_service_opmldirectory.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_amarok_service_ampache.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kcm_amarok_service_magnatunestore.so
--rwxr-xr-x	root/root	usr/lib/kde4/kcm_amarok_service_mp3tunes.so
 lrwxrwxrwx	root/root	usr/lib/libamarok-sqlcollection.so -> libamarok-sqlcollection.so.1
 lrwxrwxrwx	root/root	usr/lib/libamarok-sqlcollection.so.1 -> libamarok-sqlcollection.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamarok-sqlcollection.so.1.0.0
@@ -59,8 +54,8 @@ lrwxrwxrwx	root/root	usr/lib/libamaroklib.so -> libamaroklib.so.1
 lrwxrwxrwx	root/root	usr/lib/libamaroklib.so.1 -> libamaroklib.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamaroklib.so.1.0.0
 lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so -> libamarokocsclient.so.4
-lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.6.0
--rwxr-xr-x	root/root	usr/lib/libamarokocsclient.so.4.6.0
+lrwxrwxrwx	root/root	usr/lib/libamarokocsclient.so.4 -> libamarokocsclient.so.4.7.0
+-rwxr-xr-x	root/root	usr/lib/libamarokocsclient.so.4.7.0
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so -> libamarokpud.so.1
 lrwxrwxrwx	root/root	usr/lib/libamarokpud.so.1 -> libamarokpud.so.1.0.0
 -rwxr-xr-x	root/root	usr/lib/libamarokpud.so.1.0.0
@@ -479,27 +474,6 @@ drwxr-xr-x	root/root	usr/share/apps/amarok/images/
 -rw-r--r--	root/root	usr/share/apps/amarok/images/volume_icon.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/volume_muted_icon.png
 -rw-r--r--	root/root	usr/share/apps/amarok/images/web_applet_background.svg
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/librivox_service/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/COPYING
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxEmblem.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxIcon.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxLogo.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxScalableEmblem.svgz
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/LibrivoxService.html
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/README
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/audio_book128.png
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/librivox_service/script.spec
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/lyrics_lyricwiki/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/lyrics_lyricwiki/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/lyrics_lyricwiki/script.spec
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/radio_station_service/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/radio_station_service/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/radio_station_service/script.spec
-drwxr-xr-x	root/root	usr/share/apps/amarok/scripts/script_console/
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/script_console/main.js
--rw-r--r--	root/root	usr/share/apps/amarok/scripts/script_console/script.spec
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/
 drwxr-xr-x	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/
 -rw-r--r--	root/root	usr/share/apps/desktoptheme/Amarok-Mockup/colors
@@ -544,8 +518,6 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/de/amarok/common -> /usr/share/doc/k
 -rw-r--r--	root/root	usr/share/doc/kde/html/de/amarok/index.docbook
 drwxr-xr-x	root/root	usr/share/doc/kde/html/en/
 drwxr-xr-x	root/root	usr/share/doc/kde/html/en/amarok/
--rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Addingmusic.png
--rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-addingmusic2.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-context.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-contextadd.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok-removefromplaylist.png
@@ -557,7 +529,12 @@ drwxr-xr-x	root/root	usr/share/doc/kde/html/en/amarok/
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.1rating.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.1right.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.1scriptmanager.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.4.1ConfigureDialogCollection.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok2.4.1SavePlaylistChoices.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/AmarokNew2.4.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok_-_internet_services.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok_addtoplaylist.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarok_addtoplaylist1.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarokbreadcrumb.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarokcollection.png
 -rw-r--r--	root/root	usr/share/doc/kde/html/en/amarok/Amarokfull.png
@@ -662,6 +639,48 @@ lrwxrwxrwx	root/root	usr/share/doc/kde/html/it/amarok/common -> /usr/share/doc/k
 -rw-r--r--	root/root	usr/share/doc/kde/html/it/amarok/quick.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/it/amarok/requirements.docbook
 -rw-r--r--	root/root	usr/share/doc/kde/html/it/amarok/using.docbook
+drwxr-xr-x	root/root	usr/share/doc/kde/html/nl/
+drwxr-xr-x	root/root	usr/share/doc/kde/html/nl/amarok/
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/add_dynamic.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/amarok_playlist.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/analyzer.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/buttons.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/collection.png
+lrwxrwxrwx	root/root	usr/share/doc/kde/html/nl/amarok/common -> /usr/share/doc/kde/html/nl/common
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_appearance.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_collection.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_engine.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_general.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_osd.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_playback.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/config_scrobbler.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/context.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/coverman.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/dynamic_bar.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/dynamic_settings.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/equalizer.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/file_browser.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/index.cache.bz2
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/index.docbook
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/logo.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/media_device.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/menubar.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/musicbrainz.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/pl_browser.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/pl_tip1.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/play_list.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/player_window.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/playlist_browser.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/playlist_window.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/queue_manager.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/rmb_menu.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/script_manager.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/status_bar.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_lyrics.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_lyrics1.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_music.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/tab_wiki.png
+-rw-r--r--	root/root	usr/share/doc/kde/html/nl/amarok/vis_window.png
 drwxr-xr-x	root/root	usr/share/doc/kde/html/pt/
 drwxr-xr-x	root/root	usr/share/doc/kde/html/pt/amarok/
 lrwxrwxrwx	root/root	usr/share/doc/kde/html/pt/amarok/common -> /usr/share/doc/kde/html/pt/common
@@ -764,10 +783,8 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/amarok.protocol
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-audiocdcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-daapcollection.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-mtpcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-mysqlecollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-mysqlservercollection.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-playdarcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-umscollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_collection-upnpcollection.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_device_massstorage.desktop
@@ -778,8 +795,6 @@ drwxr-xr-x	root/root	usr/share/kde4/services/ServiceMenus/
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_jamendo.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_magnatunestore.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_magnatunestore_config.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_service_mp3tunes.desktop
--rw-r--r--	root/root	usr/share/kde4/services/amarok_service_mp3tunes_config.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarok_service_opmldirectory.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/amarokitpc.protocol
 drwxr-xr-x	root/root	usr/share/kde4/servicetypes/
diff --git a/extra/amarok/.md5sum.i686 b/extra/amarok/.md5sum.i686
index 533242256..f522d55b5 100644
--- a/extra/amarok/.md5sum.i686
+++ b/extra/amarok/.md5sum.i686
@@ -1,2 +1,2 @@
-4c65c5cd4d7bd267bdbef8e912fd6cb6  amarok-2.4.1.tar.bz2
+24e8141bcbd065448911fa872c50197d  amarok-2.4.3.tar.bz2
 5595074ec080ede76f366496f4fc0ff7  splash_screen.jpg
diff --git a/extra/amarok/.md5sum.x86_64 b/extra/amarok/.md5sum.x86_64
index 533242256..f522d55b5 100644
--- a/extra/amarok/.md5sum.x86_64
+++ b/extra/amarok/.md5sum.x86_64
@@ -1,2 +1,2 @@
-4c65c5cd4d7bd267bdbef8e912fd6cb6  amarok-2.4.1.tar.bz2
+24e8141bcbd065448911fa872c50197d  amarok-2.4.3.tar.bz2
 5595074ec080ede76f366496f4fc0ff7  splash_screen.jpg
diff --git a/extra/amarok/Pkgfile b/extra/amarok/Pkgfile
index 826a4647f..eb69d46a6 100755
--- a/extra/amarok/Pkgfile
+++ b/extra/amarok/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: kde-runtime,mysql,qtscriptgenerator,taglib-extras,libmtp,loudmouth
 
 name=amarok
-version=2.4.1
+version=2.4.3
 release=1
 source=(ftp://kde.mirrors.pair.com/stable/$name/$version/src/$name-$version.tar.bz2
 	http://nutyx.meticul.eu/files/patchs/$name/splash_screen.jpg
diff --git a/extra/calligra/.footprint.i686 b/extra/calligra/.footprint.i686
index 48b1322e1..605e1e4d7 100644
--- a/extra/calligra/.footprint.i686
+++ b/extra/calligra/.footprint.i686
@@ -130,7 +130,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/KoID.h
 -rw-r--r--	root/root	usr/include/KoImageCollection.h
 -rw-r--r--	root/root	usr/include/KoImageData.h
--rw-r--r--	root/root	usr/include/KoImageSelectionWidget.h
 -rw-r--r--	root/root	usr/include/KoInlineObject.h
 -rw-r--r--	root/root	usr/include/KoInlineObjectFactoryBase.h
 -rw-r--r--	root/root	usr/include/KoInlineObjectRegistry.h
@@ -584,6 +583,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kopabackgroundtool.so
 -rwxr-xr-x	root/root	usr/lib/kde4/koreport_barcodeplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/koreport_chartplugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/koreport_webplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kounavailpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kplatorcpsscheduler.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kpr_pageeffect_barwipe.so
@@ -810,8 +810,9 @@ lrwxrwxrwx	root/root	usr/lib/libkexicore.so.8 -> libkexicore.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libkexidatatable.so -> libkexidatatable.so.8
 lrwxrwxrwx	root/root	usr/lib/libkexidatatable.so.8 -> libkexidatatable.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libkexidatatable.so.8.0.0
-lrwxrwxrwx	root/root	usr/lib/libkexidataviewcommon.so -> libkexidataviewcommon.so.SOVERSION
--rwxr-xr-x	root/root	usr/lib/libkexidataviewcommon.so.SOVERSION
+lrwxrwxrwx	root/root	usr/lib/libkexidataviewcommon.so -> libkexidataviewcommon.so.8
+lrwxrwxrwx	root/root	usr/lib/libkexidataviewcommon.so.8 -> libkexidataviewcommon.so.8.0.0
+-rwxr-xr-x	root/root	usr/lib/libkexidataviewcommon.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libkexidb.so -> libkexidb.so.8
 lrwxrwxrwx	root/root	usr/lib/libkexidb.so.8 -> libkexidb.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libkexidb.so.8.0.0
@@ -902,7 +903,6 @@ lrwxrwxrwx	root/root	usr/lib/libkritaui.so.8 -> libkritaui.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libkundo2.so -> libkundo2.so.8
 lrwxrwxrwx	root/root	usr/lib/libkundo2.so.8 -> libkundo2.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libkundo2.so.8.0.0
--rwxr-xr-x	root/root	usr/lib/liblibrcps_plan.so
 lrwxrwxrwx	root/root	usr/lib/liblibwmf.so -> liblibwmf.so.8
 lrwxrwxrwx	root/root	usr/lib/liblibwmf.so.8 -> liblibwmf.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/liblibwmf.so.8.0.0
@@ -921,6 +921,9 @@ lrwxrwxrwx	root/root	usr/lib/libplanworkapp.so.8 -> libplanworkapp.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libplanworkfactory.so -> libplanworkfactory.so.8
 lrwxrwxrwx	root/root	usr/lib/libplanworkfactory.so.8 -> libplanworkfactory.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libplanworkfactory.so.8.0.0
+lrwxrwxrwx	root/root	usr/lib/librcps_plan.so -> librcps_plan.so.8
+lrwxrwxrwx	root/root	usr/lib/librcps_plan.so.8 -> librcps_plan.so.8.0.0
+-rwxr-xr-x	root/root	usr/lib/librcps_plan.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libtextlayout.so -> libtextlayout.so.8
 lrwxrwxrwx	root/root	usr/lib/libtextlayout.so.8 -> libtextlayout.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libtextlayout.so.8.0.0
@@ -1035,6 +1038,8 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/over.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/paren.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/prod.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/report_barcode_element.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/report_web_element.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/rsub.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/rsup.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/send_backward.png
@@ -1048,7 +1053,6 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/tool-paragraph.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/tool-text.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/under.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view-barcode.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view-sort-ascending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view-sort-descending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view_orientation.png
@@ -1167,6 +1171,8 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/raise.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/remcol.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/remrow.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/report_barcode_element.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/report_web_element.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/rsub.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/rsup.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/select.png
@@ -1188,7 +1194,6 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/toggle_docbrowser.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/under.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/ungroup.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/view-barcode.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/view-sort-ascending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/view-sort-descending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/zoom-page.png
@@ -1223,15 +1228,14 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/over.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/paren.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/prod.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/report_barcode_element.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/rsub.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/rsup.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/send_backward.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/shapes.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/spreadsheetshape.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/sqrt.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/sum.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/under.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/view-barcode.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/view-sort-ascending.png
 drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/32x32/apps/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/apps/go.png
@@ -5370,7 +5374,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/clear_table_contents.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/combo.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/delete_table_row.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/form.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/form_newobj.png
@@ -5385,7 +5389,6 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/lineedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/macro.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/macro_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/map-browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/mouse_pointer.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/multiple_obj.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/new_sign.png
@@ -5408,12 +5411,12 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/subform.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/table.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/tabwidget-tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/tabwidget.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/tabwidget_tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/test_it.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/textedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/unknown_widget.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/web-browser.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/web_browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/widgets.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
@@ -5438,7 +5441,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/dateedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/datetimeedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/delete_table_row.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/form.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/form_edit.png
@@ -5458,7 +5461,6 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/lower.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/macro.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/macro_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/map-browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/mouse_pointer.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/multiple_obj.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/new_sign.png
@@ -5479,14 +5481,14 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/subform.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/table.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/tabwidget-tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/tabwidget.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/tabwidget_tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/test_it.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/textedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/timeedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/unknown_widget.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/urlrequest.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/web-browser.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/web_browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/widgets.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/widgetstack.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/32x32/
@@ -5494,7 +5496,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/business_user.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/clear_table_contents.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/delete_table_row.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/form.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/form_newobj.png
@@ -5515,7 +5517,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/table_newobj.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/key.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/64x64/
@@ -5593,36 +5595,6 @@ drwxr-xr-x	root/root	usr/share/apps/koproperty/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/apps/koproperty/icons/hicolor/16x16/
 drwxr-xr-x	root/root	usr/share/apps/koproperty/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/128x128/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/128x128/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/128x128/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/16x16/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/16x16/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/16x16/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/22x22/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/22x22/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/22x22/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/32x32/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/32x32/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/32x32/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/48x48/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/48x48/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/48x48/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/64x64/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/64x64/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/64x64/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/scalable/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/scalable/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/scalable/actions/template_empty.svgz
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/templates/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/templates/Simple/
--rw-r--r--	root/root	usr/share/apps/kplatowork/templates/Simple/.directory
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/templates/Simple/.source/
--rw-r--r--	root/root	usr/share/apps/kplatowork/templates/Simple/.source/Empty.kplatoworkt
--rw-r--r--	root/root	usr/share/apps/kplatowork/templates/Simple/Empty.desktop
 drwxr-xr-x	root/root	usr/share/apps/krita/
 drwxr-xr-x	root/root	usr/share/apps/krita/backgrounds/
 -rw-r--r--	root/root	usr/share/apps/krita/backgrounds/old_paper.png
@@ -6192,9 +6164,38 @@ drwxr-xr-x	root/root	usr/share/apps/plan/templates/Simple/.source/
 -rw-r--r--	root/root	usr/share/apps/plan/templates/Simple/Basicproject.desktop
 -rw-r--r--	root/root	usr/share/apps/plan/templates/Simple/Plain.desktop
 drwxr-xr-x	root/root	usr/share/apps/planwork/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/128x128/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/128x128/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/128x128/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/16x16/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/16x16/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/22x22/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/22x22/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/22x22/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/32x32/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/32x32/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/48x48/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/48x48/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/64x64/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/64x64/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/64x64/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/scalable/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/scalable/actions/template_empty.svgz
 -rw-r--r--	root/root	usr/share/apps/planwork/planwork.rc
 -rw-r--r--	root/root	usr/share/apps/planwork/planwork_mainwindow.rc
 -rw-r--r--	root/root	usr/share/apps/planwork/planwork_readonly.rc
+drwxr-xr-x	root/root	usr/share/apps/planwork/templates/
+drwxr-xr-x	root/root	usr/share/apps/planwork/templates/Simple/
+-rw-r--r--	root/root	usr/share/apps/planwork/templates/Simple/.directory
+drwxr-xr-x	root/root	usr/share/apps/planwork/templates/Simple/.source/
+-rw-r--r--	root/root	usr/share/apps/planwork/templates/Simple/.source/Empty.planworkt
+-rw-r--r--	root/root	usr/share/apps/planwork/templates/Simple/Empty.desktop
 drwxr-xr-x	root/root	usr/share/apps/stage/
 drwxr-xr-x	root/root	usr/share/apps/stage/icons/
 drwxr-xr-x	root/root	usr/share/apps/stage/icons/hicolor/
@@ -6929,6 +6930,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/kformdesigner/
 -rw-r--r--	root/root	usr/share/kde4/services/kopabackgroundtool.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/koreport_barcodeplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/koreport_chartplugin.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/koreport_webplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kounavail.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kpr_pageeffect_barwipe.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kpr_pageeffect_clockwipe.desktop
diff --git a/extra/calligra/.footprint.x86_64 b/extra/calligra/.footprint.x86_64
index 48b1322e1..605e1e4d7 100644
--- a/extra/calligra/.footprint.x86_64
+++ b/extra/calligra/.footprint.x86_64
@@ -130,7 +130,6 @@ drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/KoID.h
 -rw-r--r--	root/root	usr/include/KoImageCollection.h
 -rw-r--r--	root/root	usr/include/KoImageData.h
--rw-r--r--	root/root	usr/include/KoImageSelectionWidget.h
 -rw-r--r--	root/root	usr/include/KoInlineObject.h
 -rw-r--r--	root/root	usr/include/KoInlineObjectFactoryBase.h
 -rw-r--r--	root/root	usr/include/KoInlineObjectRegistry.h
@@ -584,6 +583,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kopabackgroundtool.so
 -rwxr-xr-x	root/root	usr/lib/kde4/koreport_barcodeplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/koreport_chartplugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/koreport_webplugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kounavailpart.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kplatorcpsscheduler.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kpr_pageeffect_barwipe.so
@@ -810,8 +810,9 @@ lrwxrwxrwx	root/root	usr/lib/libkexicore.so.8 -> libkexicore.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libkexidatatable.so -> libkexidatatable.so.8
 lrwxrwxrwx	root/root	usr/lib/libkexidatatable.so.8 -> libkexidatatable.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libkexidatatable.so.8.0.0
-lrwxrwxrwx	root/root	usr/lib/libkexidataviewcommon.so -> libkexidataviewcommon.so.SOVERSION
--rwxr-xr-x	root/root	usr/lib/libkexidataviewcommon.so.SOVERSION
+lrwxrwxrwx	root/root	usr/lib/libkexidataviewcommon.so -> libkexidataviewcommon.so.8
+lrwxrwxrwx	root/root	usr/lib/libkexidataviewcommon.so.8 -> libkexidataviewcommon.so.8.0.0
+-rwxr-xr-x	root/root	usr/lib/libkexidataviewcommon.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libkexidb.so -> libkexidb.so.8
 lrwxrwxrwx	root/root	usr/lib/libkexidb.so.8 -> libkexidb.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libkexidb.so.8.0.0
@@ -902,7 +903,6 @@ lrwxrwxrwx	root/root	usr/lib/libkritaui.so.8 -> libkritaui.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libkundo2.so -> libkundo2.so.8
 lrwxrwxrwx	root/root	usr/lib/libkundo2.so.8 -> libkundo2.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libkundo2.so.8.0.0
--rwxr-xr-x	root/root	usr/lib/liblibrcps_plan.so
 lrwxrwxrwx	root/root	usr/lib/liblibwmf.so -> liblibwmf.so.8
 lrwxrwxrwx	root/root	usr/lib/liblibwmf.so.8 -> liblibwmf.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/liblibwmf.so.8.0.0
@@ -921,6 +921,9 @@ lrwxrwxrwx	root/root	usr/lib/libplanworkapp.so.8 -> libplanworkapp.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libplanworkfactory.so -> libplanworkfactory.so.8
 lrwxrwxrwx	root/root	usr/lib/libplanworkfactory.so.8 -> libplanworkfactory.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libplanworkfactory.so.8.0.0
+lrwxrwxrwx	root/root	usr/lib/librcps_plan.so -> librcps_plan.so.8
+lrwxrwxrwx	root/root	usr/lib/librcps_plan.so.8 -> librcps_plan.so.8.0.0
+-rwxr-xr-x	root/root	usr/lib/librcps_plan.so.8.0.0
 lrwxrwxrwx	root/root	usr/lib/libtextlayout.so -> libtextlayout.so.8
 lrwxrwxrwx	root/root	usr/lib/libtextlayout.so.8 -> libtextlayout.so.8.0.0
 -rwxr-xr-x	root/root	usr/lib/libtextlayout.so.8.0.0
@@ -1035,6 +1038,8 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/over.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/paren.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/prod.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/report_barcode_element.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/report_web_element.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/rsub.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/rsup.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/send_backward.png
@@ -1048,7 +1053,6 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/tool-paragraph.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/tool-text.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/under.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view-barcode.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view-sort-ascending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view-sort-descending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/16x16/actions/view_orientation.png
@@ -1167,6 +1171,8 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/raise.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/remcol.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/remrow.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/report_barcode_element.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/report_web_element.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/rsub.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/rsup.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/select.png
@@ -1188,7 +1194,6 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/toggle_docbrowser.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/under.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/ungroup.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/view-barcode.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/view-sort-ascending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/view-sort-descending.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/22x22/actions/zoom-page.png
@@ -1223,15 +1228,14 @@ drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/over.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/paren.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/prod.png
+-rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/report_barcode_element.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/rsub.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/rsup.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/send_backward.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/shapes.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/spreadsheetshape.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/sqrt.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/sum.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/under.png
--rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/view-barcode.png
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/actions/view-sort-ascending.png
 drwxr-xr-x	root/root	usr/share/apps/calligra/icons/hicolor/32x32/apps/
 -rw-r--r--	root/root	usr/share/apps/calligra/icons/hicolor/32x32/apps/go.png
@@ -5370,7 +5374,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/clear_table_contents.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/combo.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/delete_table_row.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/form.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/form_newobj.png
@@ -5385,7 +5389,6 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/lineedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/macro.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/macro_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/map-browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/mouse_pointer.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/multiple_obj.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/new_sign.png
@@ -5408,12 +5411,12 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/subform.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/table.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/table_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/tabwidget-tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/tabwidget.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/tabwidget_tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/test_it.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/textedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/unknown_widget.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/web-browser.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/web_browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/16x16/actions/widgets.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
@@ -5438,7 +5441,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/dateedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/datetimeedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/delete_table_row.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/form.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/form_edit.png
@@ -5458,7 +5461,6 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/lower.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/macro.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/macro_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/map-browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/mouse_pointer.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/multiple_obj.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/new_sign.png
@@ -5479,14 +5481,14 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/subform.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/table.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/table_newobj.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/tabwidget-tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/tabwidget.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/tabwidget_tab.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/test_it.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/textedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/timeedit.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/unknown_widget.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/urlrequest.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/web-browser.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/web_browser.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/widgets.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/22x22/actions/widgetstack.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/32x32/
@@ -5494,7 +5496,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/business_user.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/clear_table_contents.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/delete_table_row.png
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/form.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/form_newobj.png
@@ -5515,7 +5517,7 @@ drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/32x32/actions/table_newobj.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/
--rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/document-import-database.png
+-rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/document_import_database.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/form_action.png
 -rw-r--r--	root/root	usr/share/apps/kexi/icons/hicolor/48x48/actions/key.png
 drwxr-xr-x	root/root	usr/share/apps/kexi/icons/hicolor/64x64/
@@ -5593,36 +5595,6 @@ drwxr-xr-x	root/root	usr/share/apps/koproperty/icons/hicolor/
 drwxr-xr-x	root/root	usr/share/apps/koproperty/icons/hicolor/16x16/
 drwxr-xr-x	root/root	usr/share/apps/koproperty/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/apps/koproperty/icons/hicolor/16x16/actions/button_no.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/128x128/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/128x128/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/128x128/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/16x16/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/16x16/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/16x16/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/22x22/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/22x22/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/22x22/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/32x32/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/32x32/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/32x32/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/48x48/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/48x48/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/48x48/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/64x64/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/64x64/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/64x64/actions/template_empty.png
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/scalable/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/icons/hicolor/scalable/actions/
--rw-r--r--	root/root	usr/share/apps/kplatowork/icons/hicolor/scalable/actions/template_empty.svgz
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/templates/
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/templates/Simple/
--rw-r--r--	root/root	usr/share/apps/kplatowork/templates/Simple/.directory
-drwxr-xr-x	root/root	usr/share/apps/kplatowork/templates/Simple/.source/
--rw-r--r--	root/root	usr/share/apps/kplatowork/templates/Simple/.source/Empty.kplatoworkt
--rw-r--r--	root/root	usr/share/apps/kplatowork/templates/Simple/Empty.desktop
 drwxr-xr-x	root/root	usr/share/apps/krita/
 drwxr-xr-x	root/root	usr/share/apps/krita/backgrounds/
 -rw-r--r--	root/root	usr/share/apps/krita/backgrounds/old_paper.png
@@ -6192,9 +6164,38 @@ drwxr-xr-x	root/root	usr/share/apps/plan/templates/Simple/.source/
 -rw-r--r--	root/root	usr/share/apps/plan/templates/Simple/Basicproject.desktop
 -rw-r--r--	root/root	usr/share/apps/plan/templates/Simple/Plain.desktop
 drwxr-xr-x	root/root	usr/share/apps/planwork/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/128x128/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/128x128/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/128x128/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/16x16/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/16x16/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/16x16/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/22x22/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/22x22/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/22x22/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/32x32/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/32x32/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/32x32/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/48x48/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/48x48/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/48x48/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/64x64/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/64x64/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/64x64/actions/template_empty.png
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/scalable/
+drwxr-xr-x	root/root	usr/share/apps/planwork/icons/hicolor/scalable/actions/
+-rw-r--r--	root/root	usr/share/apps/planwork/icons/hicolor/scalable/actions/template_empty.svgz
 -rw-r--r--	root/root	usr/share/apps/planwork/planwork.rc
 -rw-r--r--	root/root	usr/share/apps/planwork/planwork_mainwindow.rc
 -rw-r--r--	root/root	usr/share/apps/planwork/planwork_readonly.rc
+drwxr-xr-x	root/root	usr/share/apps/planwork/templates/
+drwxr-xr-x	root/root	usr/share/apps/planwork/templates/Simple/
+-rw-r--r--	root/root	usr/share/apps/planwork/templates/Simple/.directory
+drwxr-xr-x	root/root	usr/share/apps/planwork/templates/Simple/.source/
+-rw-r--r--	root/root	usr/share/apps/planwork/templates/Simple/.source/Empty.planworkt
+-rw-r--r--	root/root	usr/share/apps/planwork/templates/Simple/Empty.desktop
 drwxr-xr-x	root/root	usr/share/apps/stage/
 drwxr-xr-x	root/root	usr/share/apps/stage/icons/
 drwxr-xr-x	root/root	usr/share/apps/stage/icons/hicolor/
@@ -6929,6 +6930,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/kformdesigner/
 -rw-r--r--	root/root	usr/share/kde4/services/kopabackgroundtool.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/koreport_barcodeplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/koreport_chartplugin.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/koreport_webplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kounavail.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kpr_pageeffect_barwipe.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kpr_pageeffect_clockwipe.desktop
diff --git a/extra/calligra/.md5sum.i686 b/extra/calligra/.md5sum.i686
index f6132938a..3231a39aa 100644
--- a/extra/calligra/.md5sum.i686
+++ b/extra/calligra/.md5sum.i686
@@ -1,2 +1,2 @@
-7f475e22fa3740b2da2f6478880d6341  calligra-2.3.81.tar.bz2
-de061bcb7d0db5568fb5746ebd00ca7a  calligra-l10n-fr-2.3.81.tar.bz2
+21653ffa13d68afbc760e34e8e9a71a2  calligra-2.3.82.tar.bz2
+c5e2c0ad177489fd536f0b8fb03fc20d  calligra-l10n-fr-2.3.82.tar.bz2
diff --git a/extra/calligra/.md5sum.x86_64 b/extra/calligra/.md5sum.x86_64
index f6132938a..3231a39aa 100644
--- a/extra/calligra/.md5sum.x86_64
+++ b/extra/calligra/.md5sum.x86_64
@@ -1,2 +1,2 @@
-7f475e22fa3740b2da2f6478880d6341  calligra-2.3.81.tar.bz2
-de061bcb7d0db5568fb5746ebd00ca7a  calligra-l10n-fr-2.3.81.tar.bz2
+21653ffa13d68afbc760e34e8e9a71a2  calligra-2.3.82.tar.bz2
+c5e2c0ad177489fd536f0b8fb03fc20d  calligra-l10n-fr-2.3.82.tar.bz2
diff --git a/extra/calligra/Pkgfile b/extra/calligra/Pkgfile
index 8a2c5475d..aba151714 100644
--- a/extra/calligra/Pkgfile
+++ b/extra/calligra/Pkgfile
@@ -6,7 +6,7 @@
 # Run on: kdelibs,okular,,sqlite3,lcms2,eigen2,kdepimlibs,boost,avahi,aspell,libxslt,shared-mime-info,upower,udisks,enchant,jasper,openexr,strigi,xorg-libxtst,soprano,ca-certificates,xdg-utils,qca,polkit-qt,xscreensaver,phonon,shared-desktop-ontologies,attica,xorg-libxcursor,hicolor-icon-theme,docbook-xsl,docbook-xml,libdbusmenu-qt,grantlee,pstoedit,libmysql,glew,libgsf,libkdcraw,libwpg 
 
 name=calligra
-version=2.3.81
+version=2.3.82
 release=1
 source=(ftp://ftp.kde.org/pub/kde/unstable/$name-$version/$name-$version.tar.bz2
         ftp://ftp.kde.org/pub/kde/unstable/$name-$version/$name-l10n/$name-l10n-fr-$version.tar.bz2)
diff --git a/extra/calligra/koffice-libwpg02.patch b/extra/calligra/koffice-libwpg02.patch
deleted file mode 100644
index e2a55a216..000000000
--- a/extra/calligra/koffice-libwpg02.patch
+++ /dev/null
@@ -1,1323 +0,0 @@
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt
---- koffice-2.3.1/filters/karbon/wpg/import/CMakeLists.txt	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/CMakeLists.txt	2011-01-18 07:40:25.000000000 +0100
-@@ -1,16 +1,11 @@
- 
--
- include_directories(${CMAKE_BINARY_DIR}/filters/ ${WPD_INCLUDE_DIR} ${LIBWPG_INCLUDE_DIR}/)
- 
--set(wpgimport_PART_SRCS 
--WPGImport.cpp 
--OdgExporter.cxx
--FileOutputHandler.cxx
--GraphicsElement.cxx)
-+set(wpgimport_PART_SRCS WPGImport.cpp)
- 
- kde4_add_plugin(wpgimport ${wpgimport_PART_SRCS})
- 
--target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES})
-+target_link_libraries(wpgimport komain ${LIBWPG_LIBRARIES} ${LIBWPG_STREAM_LIBRARIES} ${WPD_LIBRARIES})
- 
- install(TARGETS wpgimport DESTINATION ${PLUGIN_INSTALL_DIR})
- install(FILES karbon_wpg_import.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,95 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "FileOutputHandler.hxx"
--
--FileOutputHandler::FileOutputHandler(std::ostringstream &contentStream) :
--	mbIsTagOpened(false),
--	mContentStream(contentStream)
--{
--}
--
--void FileOutputHandler::startDocument()
--{
--}
--
--void FileOutputHandler::startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << "<" << psName;
--
--	for (std::vector<std::pair<std::string, std::string> >::const_iterator i = xPropList.begin(); i != xPropList.end(); i++)
--	{
--		mContentStream << " " <<  (*i).first.c_str() << "=\"" << (*i).second.c_str() << "\"";
--	}
--	mbIsTagOpened = true;
--	msOpenedTagName = psName;
--}
--
--void FileOutputHandler::endElement(const char *psName)
--{
--	if (mbIsTagOpened)
--	{
--		if( msOpenedTagName == psName )
--		{
--			mContentStream << "/>";
--			mbIsTagOpened = false;
--		}
--		else // should not happen, but handle it
--		{
--			mContentStream << ">";
--			mContentStream << "</" << psName << ">";
--			mbIsTagOpened = false;
--		}
--	}
--	else
--	{
--		mContentStream << "</" << psName << ">";
--		mbIsTagOpened = false;
--	}
--}
--
--void FileOutputHandler::characters(const std::string &sCharacters)
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--	mContentStream << sCharacters.c_str();
--}
--
--void FileOutputHandler::endDocument()
--{
--	if (mbIsTagOpened)
--	{
--		mContentStream << ">";
--		mbIsTagOpened = false;
--	}
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/FileOutputHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/FileOutputHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,49 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef FILEOUTPUTHANDLER_H
--#define FILEOUTPUTHANDLER_H
--
--#include <iostream>
--#include <sstream>
--#include <string>
--#include "GraphicsHandler.hxx"
--
--class FileOutputHandler : public GraphicsHandler
--{
--  public:
--        explicit FileOutputHandler(std::ostringstream &contentStream);
--        virtual void startDocument();
--        virtual void endDocument();
--        virtual void startElement(const char *psName, const std::vector<std::pair<std::string, std::string> > &xPropList);
--        virtual void endElement(const char *psName);
--        virtual void characters(const std::string &sCharacters);
--
--  private:
--	bool mbIsTagOpened;
--	std::string msOpenedTagName;
--	std::ostringstream &mContentStream;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,66 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <string.h>
--
--#define ASCII_SPACE 0x0020
--
--void TagGraphicsElement::print() const
--{
--}
--
--void OpenTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->startElement(getTagName().c_str(), maAttrList);
--}
--
--void OpenTagGraphicsElement::print() const
--{ 
--	TagGraphicsElement::print(); 	
--}
--
--void OpenTagGraphicsElement::addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue)
--{
--	std::pair<std::string, std::string> tmpAttribute;
--	tmpAttribute.first = szAttributeName;
--	tmpAttribute.second = sAttributeValue;
--        maAttrList.push_back(tmpAttribute);
--}
--
--void CloseTagGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--
--	pHandler->endElement(getTagName().c_str());
--}
--
--void CharDataGraphicsElement::write(GraphicsHandler *pHandler) const
--{
--	pHandler->characters(msData);
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsElement.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsElement.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,84 +0,0 @@
--/* GraphicsElement: The items we are collecting to be put into the Writer
-- * document: paragraph and spans of text, as well as section breaks.
-- *
-- * Copyright (C) 2002-2003 William Lachance (william.lachance@sympatico.ca)
-- * 
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Lesser General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpd.sourceforge.net
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by 
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef _GRAPHICSELEMENT_H
--#define _GRAPHICSELEMENT_H
--#include <string>
--#include <map>
--#include <vector>
--
--#include "GraphicsHandler.hxx"
--
--class GraphicsElement
--{
--public:	
--	virtual ~GraphicsElement() {}
--	virtual void write(GraphicsHandler *pHandler) const = 0;
--	virtual void print() const {}
--};
--
--class TagGraphicsElement : public GraphicsElement
--{
--public:
--	explicit TagGraphicsElement(const char *szTagName) : msTagName(szTagName) {}
--	const std::string &getTagName() const { return msTagName; }
--	virtual void print() const;
--private:
--	const std::string msTagName;
--};
--
--class OpenTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit OpenTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	~OpenTagGraphicsElement() {}
--	void addAttribute(const std::string &szAttributeName, const std::string &sAttributeValue);
--	virtual void write(GraphicsHandler *pHandler) const;
--	virtual void print () const;
--private:
--	std::vector<std::pair<std::string, std::string> > maAttrList;
--};
--
--class CloseTagGraphicsElement : public TagGraphicsElement
--{
--public:
--	explicit CloseTagGraphicsElement(const char *szTagName) : TagGraphicsElement(szTagName) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--};
--
--class CharDataGraphicsElement : public GraphicsElement
--{
--public:
--	CharDataGraphicsElement(const char *sData) : GraphicsElement(), msData(sData) {}
--	virtual void write(GraphicsHandler *pHandler) const;
--private:
--	std::string msData;
--};
--
--
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/GraphicsHandler.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/GraphicsHandler.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,43 +0,0 @@
--/*
-- * Copyright (C) 2004 William Lachance (wlach@interlog.com)
-- * Copyright (C) 2004 Net Integration Technologies (http://www.net-itech.com)
-- *
-- * This program is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU General Public License
-- * as published by the Free Software Foundation; either version 2
-- * of the License, or (at your option) any later version.
-- *
-- * This program is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-- * GNU General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- *  Contributor(s): Martin Gallwey (gallwey@sun.com)
-- *
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--#ifndef _GRAPHICSHANDLER_H
--#define _GRAPHICSHANDLER_H
--#include <string>
--#include <map>
--#include <vector>
--
--class GraphicsHandler
--{
--public:
--	virtual ~GraphicsHandler() {}
--        virtual void startDocument() = 0;
--        virtual void endDocument() = 0;
--        virtual void startElement(const char *psName, const std::vector< std::pair <std::string, std::string> > &xPropList) = 0;
--        virtual void endElement(const char *psName) = 0;
--        virtual void characters(const std::string &sCharacters) = 0;
--};
--#endif
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.cxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.cxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,662 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- * Copyright (C) 2006 Fridrich Strba (fridrich.strba@bluewin.ch)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#include "OdgExporter.hxx"
--#include "GraphicsElement.hxx"
--#include "GraphicsHandler.hxx"
--#include <locale.h>
--
--static std::string doubleToString(const double value)
--{
--  std::ostringstream tempStream;
--  tempStream << value;
--  std::string decimalPoint(localeconv()->decimal_point);
--  if ((decimalPoint.size() == 0) || (decimalPoint == "."))
--    return tempStream.str();
--  std::string stringValue(tempStream.str());
--  if (!stringValue.empty())
--  {
--    std::string::size_type pos;
--    while ((pos = stringValue.find(decimalPoint)) != std::string::npos)
--          stringValue.replace(pos,decimalPoint.size(),".");
--  }
--  return stringValue;
--}
--
--
--OdgExporter::OdgExporter(GraphicsHandler *pHandler, const bool isFlatXML):
--        mpHandler(pHandler),
--        m_fillRule(AlternatingFill),
--        m_gradientIndex(1),
--        m_dashIndex(1),
--        m_styleIndex(1),
--        m_width(0.0f),
--        m_height(0.0f),
--        m_isFlatXML(isFlatXML)
--{
--}
--
--OdgExporter::~OdgExporter()
--{
--        for (std::vector <GraphicsElement *>::iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                delete (*iterStroke);
--
--        for (std::vector <GraphicsElement *>::iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                delete (*iterGradient);
--
--        for (std::vector <GraphicsElement *>::iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                delete (*iterAutomaticStyles);
--
--        for (std::vector<GraphicsElement *>::iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--                delete (*bodyIter);
--}
--
--void OdgExporter::startGraphics(double width, double height)
--{
--        m_gradientIndex = 1;
--        m_dashIndex = 1;
--        m_styleIndex = 1;
--        m_width = width;
--        m_height = height;
--
--
--        mpHandler->startDocument();
--        OpenTagGraphicsElement tmpOfficeDocumentContent("office:document");
--        tmpOfficeDocumentContent.addAttribute("xmlns:office", "urn:oasis:names:tc:opendocument:xmlns:office:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:style", "urn:oasis:names:tc:opendocument:xmlns:style:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:text", "urn:oasis:names:tc:opendocument:xmlns:text:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:draw", "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:dc", "http://purl.org/dc/elements/1.1/");
--        tmpOfficeDocumentContent.addAttribute("xmlns:svg", "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:fo", "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:config", "urn:oasis:names:tc:opendocument:xmlns:config:1.0");
--        tmpOfficeDocumentContent.addAttribute("xmlns:ooo", "http://openoffice.org/2004/office");
--        tmpOfficeDocumentContent.addAttribute("office:version", "1.0");
--        if (m_isFlatXML)
--                        tmpOfficeDocumentContent.addAttribute("office:mimetype", "application/x-vnd.oasis.openoffice.drawing");
--        tmpOfficeDocumentContent.write(mpHandler);
--
--        OpenTagGraphicsElement("office:settings").write(mpHandler);
--
--        OpenTagGraphicsElement configItemSetOpenElement("config:config-item-set");
--        configItemSetOpenElement.addAttribute("config:name", "ooo:view-settings");
--        configItemSetOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement configItemOpenElement1("config:config-item");
--        configItemOpenElement1.addAttribute("config:name", "VisibleAreaTop");
--        configItemOpenElement1.addAttribute("config:type", "int");
--        configItemOpenElement1.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement2("config:config-item");
--        configItemOpenElement2.addAttribute("config:name", "VisibleAreaLeft");
--        configItemOpenElement2.addAttribute("config:type", "int");
--        configItemOpenElement2.write(mpHandler);
--        mpHandler->characters("0");
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement3("config:config-item");
--        configItemOpenElement3.addAttribute("config:name", "VisibleAreaWidth");
--        configItemOpenElement3.addAttribute("config:type", "int");
--        configItemOpenElement3.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * width);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        OpenTagGraphicsElement configItemOpenElement4("config:config-item");
--        configItemOpenElement4.addAttribute("config:name", "VisibleAreaHeight");
--        configItemOpenElement4.addAttribute("config:type", "int");
--        configItemOpenElement4.write(mpHandler);
--        m_value.str("");
--        m_value << (unsigned)(2540 * height);
--        mpHandler->characters(m_value.str());
--        mpHandler->endElement("config:config-item");
--
--        mpHandler->endElement("config:config-item-set");
--
--        mpHandler->endElement("office:settings");
--
--}
--
--void OdgExporter::endGraphics()
--{
--        OpenTagGraphicsElement("office:styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterStroke = mStrokeDashElements.begin();
--                iterStroke != mStrokeDashElements.end(); iterStroke++)
--                (*iterStroke)->write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterGradient = mGradientElements.begin();
--                iterGradient != mGradientElements.end(); iterGradient++)
--                (*iterGradient)->write(mpHandler);
--
--        mpHandler->endElement("office:styles");
--
--        OpenTagGraphicsElement("office:automatic-styles").write(mpHandler);
--
--        for (std::vector <GraphicsElement *>::const_iterator iterAutomaticStyles = mAutomaticStylesElements.begin();
--                iterAutomaticStyles != mAutomaticStylesElements.end(); iterAutomaticStyles++)
--                (*iterAutomaticStyles)->write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutOpenElement("style:page-layout");
--        tmpStylePageLayoutOpenElement.addAttribute("style:name", "PM0");
--        tmpStylePageLayoutOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStylePageLayoutPropertiesOpenElement("style:page-layout-properties");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-top", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-bottom", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-left", "0in");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:margin-right", "0in");
--        m_value.str("");
--        m_value <<  doubleToString(m_width) << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(m_height)  << "in";
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("fo:page-height", m_value.str());
--        m_value.str("");
--        tmpStylePageLayoutPropertiesOpenElement.addAttribute("style:print-orientation", "portrait");
--        tmpStylePageLayoutPropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:page-layout-properties");
--
--        mpHandler->endElement("style:page-layout");
--
--        OpenTagGraphicsElement tmpStyleStyleOpenElement("style:style");
--        tmpStyleStyleOpenElement.addAttribute("style:name", "dp1");
--        tmpStyleStyleOpenElement.addAttribute("style:family", "drawing-page");
--        tmpStyleStyleOpenElement.write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleDrawingPagePropertiesOpenElement("style:drawing-page-properties");
--        // tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:background-size", "border");
--        tmpStyleDrawingPagePropertiesOpenElement.addAttribute("draw:fill", "none");
--        tmpStyleDrawingPagePropertiesOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:drawing-page-properties");
--
--        mpHandler->endElement("style:style");
--
--        mpHandler->endElement("office:automatic-styles");
--
--        OpenTagGraphicsElement("office:master-styles").write(mpHandler);
--
--        OpenTagGraphicsElement tmpStyleMasterPageOpenElement("style:master-page");
--        tmpStyleMasterPageOpenElement.addAttribute("style:name", "Default");
--        tmpStyleMasterPageOpenElement.addAttribute("style:page-layout-name", "PM0");
--        tmpStyleMasterPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpStyleMasterPageOpenElement.write(mpHandler);
--
--        mpHandler->endElement("style:master-page");
--
--        mpHandler->endElement("office:master-styles");
--
--        OpenTagGraphicsElement("office:body").write(mpHandler);
--
--        OpenTagGraphicsElement("office:drawing").write(mpHandler);
--
--        OpenTagGraphicsElement tmpDrawPageOpenElement("draw:page");
--        tmpDrawPageOpenElement.addAttribute("draw:name", "page1");
--        tmpDrawPageOpenElement.addAttribute("draw:style-name", "dp1");
--        tmpDrawPageOpenElement.addAttribute("draw:master-page-name", "Default");
--        tmpDrawPageOpenElement.write(mpHandler);
--
--        for (std::vector<GraphicsElement *>::const_iterator bodyIter = mBodyElements.begin();
--                bodyIter != mBodyElements.end(); bodyIter++)
--        {
--                (*bodyIter)->write(mpHandler);
--        }
--
--        mpHandler->endElement("draw:page");
--        mpHandler->endElement("office:drawing");
--        mpHandler->endElement("office:body");
--        mpHandler->endElement("office:document");
--
--        mpHandler->endDocument();
--}
--
--void OdgExporter::setPen(const libwpg::WPGPen& pen)
--{
--        m_pen = pen;
--}
--
--void OdgExporter::setBrush(const libwpg::WPGBrush& brush)
--{
--        m_brush = brush;
--}
--
--void OdgExporter::setFillRule(FillRule rule)
--{
--        m_fillRule = rule;
--}
--
--void OdgExporter::startLayer(unsigned int)
--{
--}
--
--void OdgExporter::endLayer(unsigned int)
--{
--}
--
--void OdgExporter::drawRectangle(const libwpg::WPGRect& rect, double rx, double )
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawRectElement = new OpenTagGraphicsElement("draw:rect");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawRectElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.x2-rect.x1) << "in";
--        pDrawRectElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rect.y2-rect.y1) << "in";
--        pDrawRectElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(rx) << "in";
--        // FIXME: what to do when rx != ry ?
--        pDrawRectElement->addAttribute("draw:corner-radius", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawRectElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:rect")));
--}
--
--void OdgExporter::drawEllipse(const libwpg::WPGPoint& center, double rx, double ry)
--{
--        writeStyle();
--        OpenTagGraphicsElement *pDrawEllipseElement = new OpenTagGraphicsElement("draw:ellipse");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawEllipseElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.x - rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(center.y - ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * rx) << "in";
--        pDrawEllipseElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(2 * ry) << "in";
--        pDrawEllipseElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawEllipseElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:ellipse")));
--}
--
--void OdgExporter::drawPolygon(const libwpg::WPGPointArray& vertices)
--{
--        if(vertices.count() < 2)
--                return;
--
--        if(vertices.count() == 2)
--        {
--                const libwpg::WPGPoint& p1 = vertices[0];
--                const libwpg::WPGPoint& p2 = vertices[1];
--
--                writeStyle();
--                OpenTagGraphicsElement *pDrawLineElement = new OpenTagGraphicsElement("draw:line");
--                m_value.str("");
--                m_value << "gr" << m_styleIndex-1;
--                pDrawLineElement->addAttribute("draw:style-name", m_value.str());
--                m_value.str("");
--                pDrawLineElement->addAttribute("draw:text-style-name", "P1");
--                pDrawLineElement->addAttribute("draw:layer", "layout");
--                m_value << doubleToString(p1.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x1", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p1.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y1", m_value.str());
--                m_value.str("");
--                m_value  << doubleToString(p2.x)  << "in";
--                pDrawLineElement->addAttribute("svg:x2", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(p2.y)  << "in";
--                pDrawLineElement->addAttribute("svg:y2", m_value.str());
--                m_value.str("");
--                mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawLineElement));
--                mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:line")));
--        }
--        else
--        {
--                // draw as path
--                libwpg::WPGPath path;
--                path.moveTo(vertices[0]);
--                for(unsigned long ii = 1; ii < vertices.count(); ii++)
--                        path.lineTo(vertices[ii]);
--                path.closed = true;
--                drawPath(path);
--        }
--}
--
--void OdgExporter::drawPath(const libwpg::WPGPath& path)
--{
--        if(path.count() == 0)
--                return;
--
--        // try to find the bounding box
--        // this is simple convex hull technique, the bounding box might not be
--        // accurate but that should be enough for this purpose
--        libwpg::WPGPoint p = path.element(0).point;
--        libwpg::WPGPoint q = path.element(0).point;
--        for(unsigned k = 0; k < path.count(); k++)
--        {
--                libwpg::WPGPathElement element = path.element(k);
--                p.x = (p.x > element.point.x) ? element.point.x : p.x;
--                p.y = (p.y > element.point.y) ? element.point.y : p.y;
--                q.x = (q.x < element.point.x) ? element.point.x : q.x;
--                q.y = (q.y < element.point.y) ? element.point.y : q.y;
--                if(element.type == libwpg::WPGPathElement::CurveToElement)
--                {
--                        p.x = (p.x > element.extra1.x) ? element.extra1.x : p.x;
--                        p.y = (p.y > element.extra1.y) ? element.extra1.y : p.y;
--                        q.x = (q.x < element.extra1.x) ? element.extra1.x : q.x;
--                        q.y = (q.y < element.extra1.y) ? element.extra1.y : q.y;
--                        p.x = (p.x > element.extra2.x) ? element.extra2.x : p.x;
--                        p.y = (p.y > element.extra2.y) ? element.extra2.y : p.y;
--                        q.x = (q.x < element.extra2.x) ? element.extra2.x : q.x;
--                        q.y = (q.y < element.extra2.y) ? element.extra2.y : q.y;
--                }
--        }
--        double vw = q.x - p.x;
--        double vh = q.y - p.y;
--
--        writeStyle();
--
--        OpenTagGraphicsElement *pDrawPathElement = new OpenTagGraphicsElement("draw:path");
--        m_value.str("");
--        m_value << "gr" << m_styleIndex-1;
--        pDrawPathElement->addAttribute("draw:style-name", m_value.str());
--        m_value.str("");
--        pDrawPathElement->addAttribute("draw:text-style-name", "P1");
--        pDrawPathElement->addAttribute("draw:layer", "layout");
--        m_value << doubleToString(p.x)  << "in";
--        pDrawPathElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(p.y)  << "in";
--        pDrawPathElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vw) << "in";
--        pDrawPathElement->addAttribute("svg:width", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(vh) << "in";
--        pDrawPathElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << "0 0 " << (int)(vw*2540) << " " << (int)(vh*2540);
--        pDrawPathElement->addAttribute("svg:viewBox", m_value.str());
--        m_value.str("");
--
--        for(unsigned i = 0; i < path.count(); i++)
--        {
--                libwpg::WPGPathElement element = path.element(i);
--                libwpg::WPGPoint point = element.point;
--                switch(element.type)
--                {
--                        // 2540 is 2.54*1000, 2.54 in = 1 in
--                        case libwpg::WPGPathElement::MoveToElement:
--                                m_value << "M" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::LineToElement:
--                                m_value << "L" << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        case libwpg::WPGPathElement::CurveToElement:
--                                m_value << "C" << (int)((element.extra1.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra1.y-p.y)*2540) << " ";
--                                m_value << (int)((element.extra2.x-p.x)*2540) << " ";
--                                m_value << (int)((element.extra2.y-p.y)*2540) << " ";
--                                m_value << (int)((point.x-p.x)*2540) << " ";
--                                m_value << (int)((point.y-p.y)*2540);
--                                break;
--
--                        default:
--                                break;
--                }
--        }
--        if(path.closed)
--                m_value << " Z";
--        pDrawPathElement->addAttribute("svg:d", m_value.str());
--        m_value.str("");
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawPathElement));
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:path")));
--}
--
--
--void OdgExporter::drawBitmap(const libwpg::WPGBitmap& bitmap)
--{
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(bitmap.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary;
--        bitmap.generateBase64DIB(base64Binary);
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--void OdgExporter::drawImageObject(const libwpg::WPGBinaryData& binaryData)
--{
--        if (binaryData.mimeType.length() <= 0)
--                return;
--        OpenTagGraphicsElement *pDrawFrameElement = new OpenTagGraphicsElement("draw:frame");
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.x1) << "in";
--        pDrawFrameElement->addAttribute("svg:x", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.y1) << "in";
--        pDrawFrameElement->addAttribute("svg:y", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.height()) << "in";
--        pDrawFrameElement->addAttribute("svg:height", m_value.str());
--        m_value.str("");
--        m_value << doubleToString(binaryData.rect.width()) << "in";
--        pDrawFrameElement->addAttribute("svg:width", m_value.str());
--        mBodyElements.push_back(static_cast<GraphicsElement *>(pDrawFrameElement));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new OpenTagGraphicsElement("office:binary-data")));
--
--        libwpg::WPGString base64Binary = binaryData.getBase64Data();
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CharDataGraphicsElement(base64Binary.cstr())));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("office:binary-data")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:image")));
--
--        mBodyElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:frame")));
--}
--
--
--static std::string colorToHex(const libwpg::WPGColor& color)
--{
--        char hexdigits[] = "0123456789abcdef";
--        char buffer[] = "123456";
--        buffer[0] = hexdigits[(color.red >> 4) & 15];
--        buffer[1] = hexdigits[color.red & 15];
--        buffer[2] = hexdigits[(color.green >> 4) & 15];
--        buffer[3] = hexdigits[color.green & 15];
--        buffer[4] = hexdigits[(color.blue >> 4) & 15];
--        buffer[5] = hexdigits[color.blue & 15];
--        return std::string(buffer);
--}
--
--void OdgExporter::writeStyle()
--{
--        m_value.str("");
--        m_name.str("");
--
--        if(!m_pen.solid && (m_pen.dashArray.count() >=2 ) )
--        {
--                // ODG only supports dashes with the same length of spaces inbetween
--                // here we take the first space and assume everything else the same
--                // note that dash length is written in percentage
--                double distance = m_pen.dashArray.at(1);
--                OpenTagGraphicsElement *tmpDrawStrokeDashElement = new OpenTagGraphicsElement("draw:stroke-dash");
--                tmpDrawStrokeDashElement->addAttribute("draw:style", "rect");
--                m_value << "Dash_" << m_dashIndex++;
--                tmpDrawStrokeDashElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--                m_value << doubleToString(distance*100) << "%";
--                tmpDrawStrokeDashElement->addAttribute("draw:distance", m_value.str());
--                m_value.str("");
--                for(unsigned i = 0; i < m_pen.dashArray.count()/2; i++)
--                {
--                        m_name << "draw:dots" << i+1;
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), "1");
--                        m_name.str("");
--                        m_name << "draw:dots" << i+1 << "-length";
--                        m_value << doubleToString(100*m_pen.dashArray.at(i*2)) << "%";
--                        tmpDrawStrokeDashElement->addAttribute(m_name.str(), m_value.str());
--                        m_name.str("");
--                        m_value.str("");
--                }
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(tmpDrawStrokeDashElement));
--                mStrokeDashElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:stroke-dash")));
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                OpenTagGraphicsElement *tmpDrawGradientElement = new OpenTagGraphicsElement("draw:gradient");
--                tmpDrawGradientElement->addAttribute("draw:style", "linear");
--                m_value << "Gradient_" << m_gradientIndex++;
--                tmpDrawGradientElement->addAttribute("draw:name", m_value.str());
--                m_value.str("");
--
--                // ODG angle unit is 0.1 degree
--                double angle = -m_brush.gradient.angle();
--                while(angle < 0)
--                        angle += 360;
--                while(angle > 360)
--                        angle -= 360;
--
--                m_value << (unsigned)(angle*10);
--                tmpDrawGradientElement->addAttribute("draw:angle", m_value.str());
--                m_value.str("");
--
--                libwpg::WPGColor startColor = m_brush.gradient.stopColor(0);
--                libwpg::WPGColor stopColor = m_brush.gradient.stopColor(1);
--                m_value << "#" << colorToHex(startColor);
--                tmpDrawGradientElement->addAttribute("draw:start-color", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(stopColor);
--                tmpDrawGradientElement->addAttribute("draw:end-color", m_value.str());
--                m_value.str("");
--                tmpDrawGradientElement->addAttribute("draw:start-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:end-intensity", "100%");
--                tmpDrawGradientElement->addAttribute("draw:border", "0%");
--                mGradientElements.push_back(static_cast<GraphicsElement *>(tmpDrawGradientElement));
--                mGradientElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("draw:gradient")));
--        }
--
--        OpenTagGraphicsElement *tmpStyleStyleElement = new OpenTagGraphicsElement("style:style");
--        m_value << "gr" << m_styleIndex;
--        tmpStyleStyleElement->addAttribute("style:name", m_value.str());
--        m_value.str("");
--        tmpStyleStyleElement->addAttribute("style:family", "graphic");
--        tmpStyleStyleElement->addAttribute("style:parent-style-name", "standard");
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleStyleElement));
--
--        OpenTagGraphicsElement *tmpStyleGraphicPropertiesElement = new OpenTagGraphicsElement("style:graphic-properties");
--
--        if(m_pen.width > 0.0)
--        {
--                m_value << doubleToString(m_pen.width) << "in";
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-width", m_value.str());
--                m_value.str("");
--                m_value << "#" << colorToHex(m_pen.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("svg:stroke-color", m_value.str());
--                m_value.str("");
--
--                if(!m_pen.solid)
--                {
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "dash");
--                        m_value << "Dash_" << m_dashIndex-1;
--                        tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke-dash", m_value.str());
--                        m_value.str("");
--                }
--        }
--        else
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:stroke", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::NoBrush)
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "none");
--
--        if(m_brush.style == libwpg::WPGBrush::Solid)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "solid");
--                m_value << "#" << colorToHex(m_brush.foreColor);
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-color", m_value.str());
--                m_value.str("");
--        }
--
--        if(m_brush.style == libwpg::WPGBrush::Gradient)
--        {
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill", "gradient");
--                m_value << "Gradient_" << m_gradientIndex-1;
--                tmpStyleGraphicPropertiesElement->addAttribute("draw:fill-gradient-name", m_value.str());
--                m_value.str("");
--        }
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(tmpStyleGraphicPropertiesElement));
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:graphic-properties")));
--
--        mAutomaticStylesElements.push_back(static_cast<GraphicsElement *>(new CloseTagGraphicsElement("style:style")));
--        m_styleIndex++;
--}
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx
---- koffice-2.3.1/filters/karbon/wpg/import/OdgExporter.hxx	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/OdgExporter.hxx	1970-01-01 01:00:00.000000000 +0100
-@@ -1,116 +0,0 @@
--/* libwpg
-- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
-- *
-- * This library is free software; you can redistribute it and/or
-- * modify it under the terms of the GNU Library General Public
-- * License as published by the Free Software Foundation; either
-- * version 2 of the License, or (at your option) any later version.
-- *
-- * This library is distributed in the hope that it will be useful,
-- * but WITHOUT ANY WARRANTY; without even the implied warranty of
-- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-- * Library General Public License for more details.
-- *
-- * You should have received a copy of the GNU Library General Public
-- * License along with this library; if not, write to the 
-- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, 
-- * Boston, MA  02111-1301 USA
-- *
-- * For further information visit http://libwpg.sourceforge.net
-- */
--
--/* "This product is not manufactured, approved, or supported by
-- * Corel Corporation or Corel Corporation Limited."
-- */
--
--#ifndef __ODGEXPORTER_H__
--#define __ODGEXPORTER_H__
--
--#include <iostream>
--#include <sstream>
--#include <string>
--
--#include <libwpg/libwpg.h>
--#include "GraphicsElement.hxx"
--
--class OdgExporter : public libwpg::WPGPaintInterface {
--public:
--	explicit OdgExporter(GraphicsHandler *pHandler,
--			     const bool isFlatXML = false);
--	~OdgExporter();
--
--#if LIBWPG_VERSION_MINOR<2
--	void startGraphics(double imageWidth, double imageHeight);
--	void endGraphics();
--	void startLayer(unsigned int id);
--	void endLayer(unsigned int id);
--
--	void setPen(const libwpg::WPGPen& pen);
--	void setBrush(const libwpg::WPGBrush& brush);
--	void setFillRule(FillRule rule);
--
--	void drawRectangle(const libwpg::WPGRect& rect, double rx, double ry);
--	void drawEllipse(const libwpg::WPGPoint& center, double rx, double ry);
--	void drawPolygon(const libwpg::WPGPointArray& vertices);
--	void drawPath(const libwpg::WPGPath& path);
--	void drawBitmap(const libwpg::WPGBitmap& bitmap);
--	void drawImageObject(const libwpg::WPGBinaryData& binaryData);
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	libwpg::WPGPen m_pen;
--	libwpg::WPGBrush m_brush;
--	FillRule m_fillRule;
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#else
--	virtual void startGraphics(const ::WPXPropertyList &propList);
--	virtual void endGraphics();
--	virtual void setStyle(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &gradient);
--	virtual void startLayer(const ::WPXPropertyList &propList);
--	virtual void endLayer();
--	virtual void drawRectangle(const ::WPXPropertyList& propList);
--	virtual void drawEllipse(const ::WPXPropertyList& propList);
--	virtual void drawPolygon(const ::WPXPropertyListVector &vertices);
--	virtual void drawPath(const ::WPXPropertyListVector &path);
--	virtual void drawGraphicObject(const ::WPXPropertyList &propList, const ::WPXBinaryData &binaryData);
--	virtual void startEmbeddedGraphics(const ::WPXPropertyList &propList);
--	virtual void endEmbeddedGraphics();
--	virtual void drawPolyline(const ::WPXPropertyListVector &vertices);
--	virtual void startTextObject(const ::WPXPropertyList &propList, const ::WPXPropertyListVector &path);
--	virtual void endTextObject();
--	virtual void startTextLine(const ::WPXPropertyList &propList);
--	virtual void endTextLine();
--	virtual void startTextSpan(const ::WPXPropertyList &propList);
--	virtual void endTextSpan();
--	virtual void insertText(const ::WPXString &str);
--
--
--private:
--	std::vector <GraphicsElement *> mBodyElements;
--	std::vector <GraphicsElement *> mAutomaticStylesElements;
--	std::vector <GraphicsElement *> mStrokeDashElements;
--	std::vector <GraphicsElement *> mGradientElements;
--	GraphicsHandler *mpHandler;
--
--	int m_gradientIndex;
--	int m_dashIndex;
--	int m_styleIndex;
--	void writeStyle();
--	std::ostringstream m_value, m_name;
--	double m_width, m_height;
--	const bool m_isFlatXML;
--#endif
--};
--
--#endif // __ODGEXPORTER_H__
-diff -Nur koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp
---- koffice-2.3.1/filters/karbon/wpg/import/WPGImport.cpp	2011-01-15 21:05:35.000000000 +0100
-+++ koffice-2.3.1-libwpg02/filters/karbon/wpg/import/WPGImport.cpp	2011-01-02 17:46:15.000000000 +0100
-@@ -20,28 +20,26 @@
- #include <WPGImport.h>
- #include <WPGImport.moc>
- 
--#include <QBuffer>
--#include <QByteArray>
--#include <QString>
--
--#include <kdebug.h>
- #include <KoFilterChain.h>
- #include <KoGlobal.h>
- #include <KoUnit.h>
-+#include <KoXmlWriter.h>
-+
- #include <kpluginfactory.h>
-+#include <KDebug>
- 
--#include <KoXmlWriter.h>
-+
-+#include <QtCore/QString>
-+#include <QtCore/QFile>
- 
- #include <libwpg/libwpg.h>
- #if LIBWPG_VERSION_MINOR<2
- #include <libwpg/WPGStreamImplementation.h>
- #else
- #include <libwpd-stream/libwpd-stream.h>
-+#include <libwpd/libwpd.h>
- #endif
- 
--#include "FileOutputHandler.hxx"
--#include "OdgExporter.hxx"
--
- #include <iostream>
- 
- K_PLUGIN_FACTORY(WPGImportFactory, registerPlugin<WPGImport>();)
-@@ -56,35 +54,13 @@
- {
- }
- 
--static QByteArray createManifest()
--{
--    KoXmlWriter* manifestWriter;
--    QByteArray manifestData;
--    QBuffer manifestBuffer(&manifestData);
--
--    manifestBuffer.open(QIODevice::WriteOnly);
--    manifestWriter = new KoXmlWriter(&manifestBuffer);
--
--    manifestWriter->startDocument("manifest:manifest");
--    manifestWriter->startElement("manifest:manifest");
--    manifestWriter->addAttribute("xmlns:manifest", "urn:oasis:names:tc:openoffice:xmlns:manifest:1.0");
--    manifestWriter->addManifestEntry("/", "application/vnd.oasis.opendocument.graphics");
--    //manifestWriter->addManifestEntry( "styles.xml", "text/xml" );
--    manifestWriter->addManifestEntry("content.xml", "text/xml");
--    manifestWriter->endElement();
--    manifestWriter->endDocument();
--    delete manifestWriter;
--
--    return manifestData;
--}
--
- 
- KoFilter::ConversionStatus WPGImport::convert(const QByteArray& from, const QByteArray& to)
- {
-     if (from != "application/x-wpg")
-         return KoFilter::NotImplemented;
- 
--    if (to != "application/vnd.oasis.opendocument.graphics")
-+    if (to != "image/svg+xml")
-         return KoFilter::NotImplemented;
- 
- #if LIBWPG_VERSION_MINOR<2
-@@ -96,6 +72,7 @@
-             input = olestream;
-         }
-     }
-+    libwpg::WPGString output;
- #else
-     WPXInputStream* input = new WPXFileStream(m_chain->inputFile().toLocal8Bit());
-     if (input->isOLEStream()) {
-@@ -105,59 +82,31 @@
-             input = olestream;
-         }
-      }
-+     ::WPXString output;
- #endif
- 
-     if (!libwpg::WPGraphics::isSupported(input)) {
--        std::cerr << "ERROR: Unsupported file format (unsupported version) or file is encrypted!" << std::endl;
-+        kWarning() << "ERROR: Unsupported file format (unsupported version) or file is encrypted!";
-         delete input;
-         return KoFilter::NotImplemented;
-     }
- 
--    // do the conversion
--    std::ostringstream tmpStringStream;
--    FileOutputHandler tmpHandler(tmpStringStream);
--    OdgExporter exporter(&tmpHandler);
--    libwpg::WPGraphics::parse(input, &exporter);
--    delete input;
--
--
--    // create output store
--    KoStore* storeout;
--    storeout = KoStore::createStore(m_chain->outputFile(), KoStore::Write,
--                                    "application/vnd.oasis.opendocument.graphics", KoStore::Zip);
--
--    if (!storeout) {
--        kWarning() << "Couldn't open the requested file.";
--        return KoFilter::FileNotFound;
--    }
--
--#if 0
--    if (!storeout->open("styles.xml")) {
--        kWarning() << "Couldn't open the file 'styles.xml'.";
--        return KoFilter::CreationError;
-+    if (!libwpg::WPGraphics::generateSVG(input, output)) {
-+        kWarning() << "ERROR: SVG Generation failed!";
-+        delete input;
-+        return KoFilter::ParsingError;
-     }
--    //storeout->write( createStyles() );
--    storeout->close();
--#endif
- 
--    if (!storeout->open("content.xml")) {
--        kWarning() << "Couldn't open the file 'content.xml'.";
--        return KoFilter::CreationError;
--    }
--    storeout->write(tmpStringStream.str().c_str());
--    storeout->close();
-+    delete input;
- 
--    // store document manifest
--    storeout->enterDirectory("META-INF");
--    if (!storeout->open("manifest.xml")) {
--        kWarning() << "Couldn't open the file 'META-INF/manifest.xml'.";
--        return KoFilter::CreationError;
-+    QFile outputFile(m_chain->outputFile());
-+    if(!outputFile.open(QIODevice::WriteOnly | QIODevice::Text)) {
-+        kWarning() << "ERROR: Could not open output file" << m_chain->outputFile();
-+        return KoFilter::InternalError;
-     }
--    storeout->write(createManifest());
--    storeout->close();
- 
--    // we are done!
--    delete storeout;
-+    outputFile.write(output.cstr());
-+    outputFile.close();
- 
-     return KoFilter::OK;
- }
-
diff --git a/extra/kde-workspace/.footprint.i686 b/extra/kde-workspace/.footprint.i686
index 0c8e1af22..5b8778d86 100644
--- a/extra/kde-workspace/.footprint.i686
+++ b/extra/kde-workspace/.footprint.i686
@@ -413,7 +413,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/plugins/styles/
 -rwxr-xr-x	root/root	usr/lib/kde4/powerdevilsuspendsessionaction_config.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_fakenet.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_modemmanager04.so
--rwxr-xr-x	root/root	usr/lib/kde4/solid_networkmanager07.so
+-rwxr-xr-x	root/root	usr/lib/kde4/solid_networkmanager09_fake.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_wicd.so
 lrwxrwxrwx	root/root	usr/lib/libkdecorations.so -> libkdecorations.so.4
 lrwxrwxrwx	root/root	usr/lib/libkdecorations.so.4 -> libkdecorations.so.4.7.0
@@ -2168,7 +2168,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/kfontview.png
--rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/
@@ -2176,7 +2175,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kfontview.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kwin.png
--rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/
@@ -2190,7 +2188,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/kfontview.png
--rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/
@@ -2525,7 +2522,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/kwin/
 drwxr-xr-x	root/root	usr/share/kde4/services/solidbackends/
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_fakenet.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_modemmanager04.desktop
--rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_networkmanager09_fake.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_wicd.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/standard_actions.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/style.desktop
diff --git a/extra/kde-workspace/.footprint.x86_64 b/extra/kde-workspace/.footprint.x86_64
index 0c8e1af22..5b8778d86 100644
--- a/extra/kde-workspace/.footprint.x86_64
+++ b/extra/kde-workspace/.footprint.x86_64
@@ -413,7 +413,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/plugins/styles/
 -rwxr-xr-x	root/root	usr/lib/kde4/powerdevilsuspendsessionaction_config.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_fakenet.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_modemmanager04.so
--rwxr-xr-x	root/root	usr/lib/kde4/solid_networkmanager07.so
+-rwxr-xr-x	root/root	usr/lib/kde4/solid_networkmanager09_fake.so
 -rwxr-xr-x	root/root	usr/lib/kde4/solid_wicd.so
 lrwxrwxrwx	root/root	usr/lib/libkdecorations.so -> libkdecorations.so.4
 lrwxrwxrwx	root/root	usr/lib/libkdecorations.so.4 -> libkdecorations.so.4.7.0
@@ -2168,7 +2168,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/kfontview.png
--rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/22x22/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/
@@ -2176,7 +2175,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kfontview.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/kwin.png
--rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/
@@ -2190,7 +2188,6 @@ drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/apps/
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/kcmkwm.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/kfontview.png
--rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/networkmanager.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/64x64/mimetypes/
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/mimetypes/fonts-package.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/
@@ -2525,7 +2522,7 @@ drwxr-xr-x	root/root	usr/share/kde4/services/kwin/
 drwxr-xr-x	root/root	usr/share/kde4/services/solidbackends/
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_fakenet.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_modemmanager04.desktop
--rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_networkmanager07.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_networkmanager09_fake.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/solidbackends/solid_wicd.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/standard_actions.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/style.desktop
diff --git a/extra/kde-workspace/Pkgfile b/extra/kde-workspace/Pkgfile
index 13f5d8df3..6cdc19285 100755
--- a/extra/kde-workspace/Pkgfile
+++ b/extra/kde-workspace/Pkgfile
@@ -7,7 +7,7 @@
 
 name=kde-workspace
 version=4.7.2
-release=1
+release=2
 source=(ftp://ftp.kde.org/pub/kde/stable/$version/src/$name-$version.tar.bz2 \
 	http://nutyx.meticul.eu/files/patchs/$name/Pakxe.tar.bz2 \
 	http://nutyx.meticul.eu/files/patchs/$name/nutyx-pakxe-01.tar.bz2
@@ -29,7 +29,8 @@ build() {
                  -DWITH_Googlegadgets=OFF \
 		 -DKDE_DEFAULT_HOME=.kde \
 		 -DSYSCONF_INSTALL_DIR=/etc \
-                 -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed'
+                 -DCMAKE_{SHARED,MODULE,EXE}_LINKER_FLAGS='-Wl,--no-undefined -Wl,--as-needed' \
+                 -DPYTHON_EXECUTABLE=/usr/bin/python2
 
         make
         make DESTDIR=$PKG install
diff --git a/extra/webkit/.footprint.i686 b/extra/webkit/.footprint.i686
index 82a8ba3d9..a863e241e 100644
--- a/extra/webkit/.footprint.i686
+++ b/extra/webkit/.footprint.i686
@@ -1,7 +1,186 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
+-rwxr-xr-x	root/root	usr/bin/jsc-1
 -rwxr-xr-x	root/root	usr/bin/jsc-3
 drwxr-xr-x	root/root	usr/include/
+drwxr-xr-x	root/root	usr/include/webkit-1.0/
+drwxr-xr-x	root/root	usr/include/webkit-1.0/JavaScriptCore/
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSBase.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSContextRef.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSObjectRef.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSStringRef.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSStringRefBSTR.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSStringRefCF.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JSValueRef.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JavaScript.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/JavaScriptCore.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/JavaScriptCore/WebKitAvailability.h
+drwxr-xr-x	root/root	usr/include/webkit-1.0/webkit/
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMAttr.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMBarInfo.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMBlob.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCDATASection.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCSSRule.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCSSRuleList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCSSStyleDeclaration.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCSSStyleSheet.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCSSValue.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCharacterData.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMComment.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMConsole.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMCustom.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMApplicationCache.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMImplementation.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMMimeType.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMMimeTypeArray.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMPlugin.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMPluginArray.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMSelection.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMSettableTokenList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMStringList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMStringMap.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMTokenList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDOMWindow.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDatabase.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDocument.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDocumentFragment.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMDocumentType.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMEntityReference.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMEvent.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMEventTarget.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMFile.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMFileList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLAnchorElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLAppletElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLAreaElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLAudioElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLBRElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLBaseElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLBaseFontElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLBodyElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLButtonElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLCanvasElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLCollection.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLDListElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLDetailsElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLDirectoryElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLDivElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLDocument.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLEmbedElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLFieldSetElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLFontElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLFormElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLFrameElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLFrameSetElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLHRElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLHeadElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLHeadingElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLHtmlElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLIFrameElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLImageElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLInputElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLIsIndexElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLKeygenElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLLIElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLLabelElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLLegendElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLLinkElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLMapElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLMarqueeElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLMediaElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLMenuElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLMetaElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLModElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLOListElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLObjectElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLOptGroupElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLOptionElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLOptionsCollection.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLParagraphElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLParamElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLPreElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLQuoteElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLScriptElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLSelectElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLStyleElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTableCaptionElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTableCellElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTableColElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTableElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTableRowElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTableSectionElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTextAreaElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLTitleElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLUListElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHTMLVideoElement.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMHistory.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMLocation.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMMediaError.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMMediaList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMMediaQueryList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMMemoryInfo.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMMessagePort.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMMouseEvent.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMNamedNodeMap.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMNavigator.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMNode.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMNodeFilter.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMNodeIterator.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMNodeList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMObject.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMProcessingInstruction.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMRange.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMScreen.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMStorage.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMStyleMedia.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMStyleSheet.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMStyleSheetList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMText.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMTimeRanges.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMTreeWalker.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMUIEvent.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMValidityState.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMWebKitAnimation.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMWebKitAnimationList.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMWebKitPoint.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMXPathExpression.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMXPathNSResolver.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/WebKitDOMXPathResult.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkit.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitapplicationcache.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitdefines.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitdom.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitdomdefines.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitdownload.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitenumtypes.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkiterror.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitgeolocationpolicydecision.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitglobals.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkithittestresult.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkiticondatabase.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitnetworkrequest.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitnetworkresponse.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitsecurityorigin.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitsoupauthdialog.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitspellchecker.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitversion.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitviewportattributes.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebbackforwardlist.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebdatabase.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebdatasource.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebframe.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebhistoryitem.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebinspector.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebnavigationaction.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebplugin.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebplugindatabase.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebpolicydecision.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebresource.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebsettings.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebview.h
+-rw-r--r--	root/root	usr/include/webkit-1.0/webkit/webkitwebwindowfeatures.h
 drwxr-xr-x	root/root	usr/include/webkit-3.0/
 drwxr-xr-x	root/root	usr/include/webkit-3.0/JavaScriptCore/
 -rw-r--r--	root/root	usr/include/webkit-3.0/JavaScriptCore/JSBase.h
@@ -182,31 +361,360 @@ drwxr-xr-x	root/root	usr/include/webkit-3.0/webkit/
 -rw-r--r--	root/root	usr/include/webkit-3.0/webkit/webkitwebwindowfeatures.h
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/girepository-1.0/
+-rw-r--r--	root/root	usr/lib/girepository-1.0/JSCore-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/JSCore-3.0.typelib
+-rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-1.0.typelib
 -rw-r--r--	root/root	usr/lib/girepository-1.0/WebKit-3.0.typelib
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.la
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so -> libjavascriptcoregtk-1.0.so.0.11.0
+lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0 -> libjavascriptcoregtk-1.0.so.0.11.0
+-rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-1.0.so.0.11.0
 -rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.la
 lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so -> libjavascriptcoregtk-3.0.so.0.11.0
 lrwxrwxrwx	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0 -> libjavascriptcoregtk-3.0.so.0.11.0
 -rwxr-xr-x	root/root	usr/lib/libjavascriptcoregtk-3.0.so.0.11.0
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.la
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so -> libwebkitgtk-1.0.so.0.11.0
+lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-1.0.so.0 -> libwebkitgtk-1.0.so.0.11.0
+-rwxr-xr-x	root/root	usr/lib/libwebkitgtk-1.0.so.0.11.0
 -rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.la
 lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so -> libwebkitgtk-3.0.so.0.11.0
 lrwxrwxrwx	root/root	usr/lib/libwebkitgtk-3.0.so.0 -> libwebkitgtk-3.0.so.0.11.0
 -rwxr-xr-x	root/root	usr/lib/libwebkitgtk-3.0.so.0.11.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
+-rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/javascriptcoregtk-3.0.pc
+-rw-r--r--	root/root	usr/lib/pkgconfig/webkit-1.0.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/webkitgtk-3.0.pc
+drwxr-xr-x	root/root	usr/lib/webkit/
+-rwxr-xr-x	root/root	usr/lib/webkit/GtkLauncher
+drwxr-xr-x	root/root	usr/lib/webkit3/
+-rwxr-xr-x	root/root	usr/lib/webkit3/GtkLauncher
 drwxr-xr-x	root/root	usr/libexec/
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/gir-1.0/
+-rw-r--r--	root/root	usr/share/gir-1.0/JSCore-1.0.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/JSCore-3.0.gir
+-rw-r--r--	root/root	usr/share/gir-1.0/WebKit-1.0.gir
 -rw-r--r--	root/root	usr/share/gir-1.0/WebKit-3.0.gir
 drwxr-xr-x	root/root	usr/share/glib-2.0/
 drwxr-xr-x	root/root	usr/share/glib-2.0/schemas/
+-rw-r--r--	root/root	usr/share/glib-2.0/schemas/org.webkitgtk-1.0.gschema.xml
 -rw-r--r--	root/root	usr/share/glib-2.0/schemas/org.webkitgtk-3.0.gschema.xml
 drwxr-xr-x	root/root	usr/share/locale/
 drwxr-xr-x	root/root	usr/share/locale/fr/
 drwxr-xr-x	root/root	usr/share/locale/fr/LC_MESSAGES/
+-rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/webkit-2.0.mo
 -rw-r--r--	root/root	usr/share/locale/fr/LC_MESSAGES/webkit-3.0.mo
+drwxr-xr-x	root/root	usr/share/webkitgtk-1.0/
+drwxr-xr-x	root/root	usr/share/webkitgtk-1.0/images/
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/deleteButton.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/inputSpeech.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/missingImage.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/nullPlugin.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/panIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/textAreaResizeCorner.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/images/urlIcon.png
+drwxr-xr-x	root/root	usr/share/webkitgtk-1.0/resources/
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/resources/error.html
+drwxr-xr-x	root/root	usr/share/webkitgtk-1.0/webinspector/
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ApplicationCacheItemsView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/AuditCategories.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/AuditFormatters.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/AuditLauncherView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/AuditResultView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/AuditRules.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/AuditsPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/BinarySearch.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/BottomUpProfileDataGridTree.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/BreakpointManager.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/BreakpointsSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CSSCompletions.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CSSKeywordCompletions.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CSSStyleModel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CallStackSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Checkbox.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Color.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CompilerSourceMapping.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ConsoleMessage.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ConsoleModel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ConsolePanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ConsoleView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ContextMenu.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CookieItemsView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CookieParser.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/CookiesTable.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DOMAgent.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DOMBreakpointsSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DOMStorage.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DOMStorageItemsView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DOMSyntaxHighlighter.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DataGrid.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Database.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DatabaseQueryView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DatabaseTableView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DebuggerModel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DebuggerPresentationModel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DetailedHeapshotGridNodes.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/DetailedHeapshotView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Drawer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ElementsPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ElementsTreeOutline.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/EmptyView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/EventListenersSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ExtensionAPI.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ExtensionAuditCategory.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ExtensionPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ExtensionRegistryStub.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ExtensionServer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/FontView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/GoToLineDialog.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/HAREntry.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/HeapSnapshot.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/HeapSnapshotProxy.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/HeapSnapshotWorker.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/HeapSnapshotWorkerDispatcher.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/HelpScreen.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/IFrameView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ImageView.js
+drwxr-xr-x	root/root	usr/share/webkitgtk-1.0/webinspector/Images/
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/applicationCache.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/back.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/breakpointBorder.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/breakpointConditionalBorder.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/breakpointConditionalCounterBorder.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/breakpointCounterBorder.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/checker.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/closeButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/cookie.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/database.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/databaseTable.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/debuggerContinue.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/debuggerPause.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/debuggerStepInto.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/debuggerStepOut.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/debuggerStepOver.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/deleteIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDown.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownBlack.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallDownWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRight.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightBlack.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDown.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownBlack.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightDownWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/disclosureTriangleSmallRightWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/errorIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/errorMediumIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/errorRedDot.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/forward.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/frame.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/glossyHeader.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/glossyHeaderPressed.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelected.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/glossyHeaderSelectedPressed.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/goArrow.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutLeft.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/graphLabelCalloutRight.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/localStorage.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneAddButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneBottomGrow.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneBottomGrowActive.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneElementStateButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneFilterButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneGrowHandleLine.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneRefreshButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/paneSettingsButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/popoverArrows.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/popoverBackground.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/profileGroupIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/profileIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/profileSmallIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/profilesSilhouette.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/programCounterBorder.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/radioDot.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourceCSSIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourceDocumentIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourceDocumentIconSmall.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourceJSIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourcePlainIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourcePlainIconSmall.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourcesSizeGraphIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/resourcesTimeGraphIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/scriptsSilhouette.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/searchSmallBlue.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/searchSmallBrightBlue.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/searchSmallGray.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/searchSmallWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/segment.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/segmentEnd.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/segmentHover.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/segmentHoverEnd.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/segmentSelected.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/segmentSelectedEnd.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/sessionStorage.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/spinner.gif
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/spinnerActive.gif
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/spinnerActiveSelected.gif
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/spinnerInactive.gif
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/spinnerInactiveSelected.gif
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/splitviewDimple.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/splitviewDividerBackground.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarBackground.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarBottomBackground.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarButtonGlyphs.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarButtons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarMenuButton.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarMenuButtonSelected.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarResizerHorizontal.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/statusbarResizerVertical.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/successGreenDot.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/thumbActiveHoriz.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/thumbActiveVert.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/thumbHoriz.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/thumbHoverHoriz.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/thumbHoverVert.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/thumbVert.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarBlue.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarGray.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarGreen.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarOrange.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarPurple.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarRed.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineBarYellow.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineCheckmarks.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineDots.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillBlue.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGray.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillGreen.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillOrange.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillPurple.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillRed.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelineHollowPillYellow.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillBlue.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillGray.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillGreen.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillOrange.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillPurple.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillRed.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/timelinePillYellow.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/toolbarIcons.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/toolbarIconsSmall.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/toolbarItemSelected.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/trackHoriz.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/trackVert.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/treeDownTriangleBlack.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/treeDownTriangleWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/treeRightTriangleBlack.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/treeRightTriangleWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/treeUpTriangleBlack.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/treeUpTriangleWhite.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/userInputIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/userInputPreviousIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/userInputResultIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/warningIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/warningMediumIcon.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/warningOrangeDot.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Images/warningsErrors.png
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/InjectedFakeWorker.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/InspectorBackendStub.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/InspectorFrontendHostStub.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/JavaScriptContextManager.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/JavaScriptFormatter.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/JavaScriptSourceFrame.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/KeyboardShortcut.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/MetricsSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/NetworkItemView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/NetworkLog.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/NetworkManager.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/NetworkPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Object.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ObjectPropertiesSection.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Panel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/PanelEnablerView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/PartialQuickSort.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Placard.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Popover.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ProfileDataGridTree.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ProfileView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ProfilesPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/PropertiesSection.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/PropertiesSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/RemoteObject.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Resource.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceCategory.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceCookiesView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceHTMLView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceHeadersView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceJSONView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourcePreviewView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceResponseView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceTimingView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceTreeModel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourceView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ResourcesPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ScopeChainSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Script.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ScriptFormatter.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ScriptFormatterWorker.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ScriptsPanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SearchController.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Section.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Settings.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SettingsScreen.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ShortcutsScreen.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/ShowMoreDataGridNode.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SidebarTreeElement.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SoftContextMenu.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SourceCSSTokenizer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SourceFile.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SourceFrame.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SourceHTMLTokenizer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SourceJavaScriptTokenizer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/SourceTokenizer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/StatusBarButton.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/StylesSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TabbedPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TestController.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TextEditorHighlighter.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TextEditorModel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TextPrompt.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TextViewer.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TimelineAgent.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TimelineGrid.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TimelineManager.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TimelineOverviewPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TimelinePanel.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/Toolbar.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/TopDownProfileDataGridTree.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/UISourceCode.js
+drwxr-xr-x	root/root	usr/share/webkitgtk-1.0/webinspector/UglifyJS/
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/UglifyJS/parse-js.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/UserMetrics.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/View.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/WatchExpressionsSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/WelcomeView.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/WorkerManager.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/WorkersSidebarPane.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/audits.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/dataGrid.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/externs.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/goToLineDialog.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/heapProfiler.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/helpScreen.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/inspector.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/inspector.html
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/inspector.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/inspectorCommon.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/inspectorSyntaxHighlight.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/localizedStrings.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/networkLogView.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/networkPanel.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/popover.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/textViewer.css
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/treeoutline.js
+-rw-r--r--	root/root	usr/share/webkitgtk-1.0/webinspector/utilities.js
 drwxr-xr-x	root/root	usr/share/webkitgtk-3.0/
 drwxr-xr-x	root/root	usr/share/webkitgtk-3.0/images/
 -rw-r--r--	root/root	usr/share/webkitgtk-3.0/images/deleteButton.png
diff --git a/extra/webkit/Pkgfile b/extra/webkit/Pkgfile
index d4205aa2c..012b37f63 100755
--- a/extra/webkit/Pkgfile
+++ b/extra/webkit/Pkgfile
@@ -7,22 +7,46 @@
 
 name=webkit
 version=1.6.1
-release=1
+release=2
 source=(http://webkitgtk.org/$name-$version.tar.gz)
 
 build() {
-	unset MAKEFLAGS
-	cd $name-$version
+	export PYTHON=/usr/bin/python2
+	cp -r $name-$version $name-3-$version
 
-	PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
+	cd $name-$version
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
 		--localstatedir=/var \
 		--enable-introspection \
-		--with-font-backend=freetype \
-		--disable-gtk-doc \
+		--enable-video \
 		--enable-jit \
-		--sysconfdir=/etc \
+		--disable-schemas-compile \
+		--with-font-backend=freetype \
 		--with-unicode-backend=icu \
+		--with-gtk=2.0
+	make
+	make DESTDIR=$PKG install
+	mkdir $PKG/usr/lib/$name
+	install -m755 Programs/GtkLauncher $PKG/usr/lib/$name
+
+	cd $SRC/$name-3-$version
+	./configure --prefix=/usr \
+		--sysconfdir=/etc \
+		--localstatedir=/var \
+		--enable-introspection \
+		--enable-video \
+		--enable-jit \
 		--disable-schemas-compile \
+		--with-font-backend=freetype \
+		--with-unicode-backend=icu \
+		--with-gtk=3.0
+	make
+	make DESTDIR=$PKG install
+	mkdir $PKG/usr/lib/${name}3
+	install -m755 Programs/GtkLauncher $PKG/usr/lib/${name}3
+}
+
 #		--enable-3d-rendering \
 #		--enable-webgl \
 #		--enable-channel-messaging \
@@ -77,6 +101,3 @@ build() {
 #		--enable-video-track \
 #		--enable-media-stream
 #		--enable-web-audio \
-	make -j1
-	make DESTDIR=$PKG install
-}