kipi-plugins 2.6.0-1 maj

(cherry picked from commit b701c6feeba1f36f507e8133c29a6a0e7d6c461a)

5 files changed, 89 insertions, 19 deletions

diff --git a/kipi-plugins/.footprint.i686 b/kipi-plugins/.footprint.i686
index 963c902ab..be5a3bdc3 100644
--- a/kipi-plugins/.footprint.i686
+++ b/kipi-plugins/.footprint.i686
@@ -21,7 +21,9 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_galleryexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_gpssync.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_htmlexport.so
+-rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_imageshackexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_imageviewer.so
+-rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_imgurexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_jpeglossless.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_kioexportimport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_kmlexport.so
@@ -40,6 +42,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_smug.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_timeadjust.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_vkontakte.so
+-rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_wikimedia.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_yandexfotki.so
 -rw-r--r--	root/root	usr/lib/libPropertyBrowser.a
 lrwxrwxrwx	root/root	usr/lib/libkipiplugins.so -> libkipiplugins.so.2
@@ -115,6 +118,7 @@ drwxr-xr-x	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/back.png
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/floating_cards.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/forward.png
+-rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/image_nav.js
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/next.png
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/prev.png
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/preview.png
@@ -190,6 +194,7 @@ drwxr-xr-x	root/root	usr/share/apps/kipiplugin_printimages/templates/
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/4_photos_4.5x5cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/4_photos_9x13cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/4x6Album.desktop
+-rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/6_photos_3.5x4.5cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/6_photos_3.5x4cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/8_photos_6x9cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/Album-Collage.desktop
@@ -214,6 +219,7 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/actions/flash.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/actions/
@@ -225,14 +231,17 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/gallery.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/gpsimagetag.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/ogl.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/piwigo.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/rajce.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/smugmug.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/actions/
@@ -243,13 +252,16 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/flickr.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/gallery.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/piwigo.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/slideshow.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/smugmug.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/actions/
@@ -268,6 +280,8 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/gpsimagetag.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/grayscaleconvert.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/imageshack.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/ogl.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/piwigo.png
@@ -278,8 +292,10 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/smugmug.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/timeadjust.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/actions/
@@ -290,19 +306,25 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/flickr.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/gallery.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/imageshack.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/piwigo.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/rajce.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/smugmug.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/actions/
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/actions/imageshack.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/actions/metadataedit.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/actions/rajce.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/actions/
@@ -312,38 +334,35 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/flickr.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/gallery.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/hq.svgz
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/imgur.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/picasa.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/piwigo.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/smugmug.svgz
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/wikimedia.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/zooomr.svgz
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/dngconverter.svgz
 drwxr-xr-x	root/root	usr/share/icons/oxygen/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/128x128/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/128x128/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/128x128/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/128x128/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/16x16/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/16x16/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/16x16/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/16x16/apps/rawconverter.png
 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/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/48x48/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/48x48/apps/rawconverter.png
 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/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/scalable/apps/dngconverter.svgz
 -rw-r--r--	root/root	usr/share/icons/oxygen/scalable/apps/rawconverter.svgz
 drwxr-xr-x	root/root	usr/share/kde4/
 drwxr-xr-x	root/root	usr/share/kde4/services/
@@ -360,7 +379,9 @@ drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_galleryexport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_gpssync.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_htmlexport.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_imageshackexport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_imageviewer.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_imgurexport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_jpeglossless.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_kioexportimport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_kmlexport.desktop
@@ -379,7 +400,21 @@ drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_smug.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_timeadjust.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_vkontakte.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_wikimedia.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_yandexfotki.desktop
 drwxr-xr-x	root/root	usr/share/kde4/servicetypes/
 -rw-r--r--	root/root	usr/share/kde4/servicetypes/photolayoutseditorborderplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/servicetypes/photolayoutseditoreffectplugin.desktop
+drwxr-xr-x	root/root	usr/share/templates/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Bear boy.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Bear girl.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Flipping Tux Black.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Flipping Tux White.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Its a boy.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Its a girl.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Tux Rider.ple
diff --git a/kipi-plugins/.footprint.x86_64 b/kipi-plugins/.footprint.x86_64
index 963c902ab..be5a3bdc3 100644
--- a/kipi-plugins/.footprint.x86_64
+++ b/kipi-plugins/.footprint.x86_64
@@ -21,7 +21,9 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_galleryexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_gpssync.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_htmlexport.so
+-rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_imageshackexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_imageviewer.so
+-rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_imgurexport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_jpeglossless.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_kioexportimport.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_kmlexport.so
@@ -40,6 +42,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_smug.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_timeadjust.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_vkontakte.so
+-rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_wikimedia.so
 -rwxr-xr-x	root/root	usr/lib/kde4/kipiplugin_yandexfotki.so
 -rw-r--r--	root/root	usr/lib/libPropertyBrowser.a
 lrwxrwxrwx	root/root	usr/lib/libkipiplugins.so -> libkipiplugins.so.2
@@ -115,6 +118,7 @@ drwxr-xr-x	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/back.png
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/floating_cards.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/forward.png
+-rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/image_nav.js
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/next.png
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/prev.png
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_htmlexport/themes/floating_cards/preview.png
@@ -190,6 +194,7 @@ drwxr-xr-x	root/root	usr/share/apps/kipiplugin_printimages/templates/
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/4_photos_4.5x5cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/4_photos_9x13cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/4x6Album.desktop
+-rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/6_photos_3.5x4.5cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/6_photos_3.5x4cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/8_photos_6x9cm.desktop
 -rw-r--r--	root/root	usr/share/apps/kipiplugin_printimages/templates/Album-Collage.desktop
@@ -214,6 +219,7 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/actions/flash.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/128x128/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/128x128/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/actions/
@@ -225,14 +231,17 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/gallery.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/gpsimagetag.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/ogl.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/piwigo.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/rajce.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/smugmug.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/16x16/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/16x16/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/actions/
@@ -243,13 +252,16 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/flickr.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/gallery.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/piwigo.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/slideshow.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/smugmug.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/22x22/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/22x22/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/actions/
@@ -268,6 +280,8 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/gpsimagetag.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/grayscaleconvert.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/imageshack.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/ogl.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/piwigo.png
@@ -278,8 +292,10 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/smugmug.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/timeadjust.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/32x32/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/32x32/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/actions/
@@ -290,19 +306,25 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/flickr.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/gallery.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/hq.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/imageshack.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/imgur.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/picasa.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/piwigo.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/rajce.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/shwup.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/smugmug.png
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/wikimedia.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/actions/zooomr.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/48x48/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/48x48/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/actions/
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/actions/imageshack.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/actions/metadataedit.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/actions/rajce.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/64x64/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/hicolor/64x64/apps/photolayoutseditor.png
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/
 drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/actions/
@@ -312,38 +334,35 @@ drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/actions/
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/flickr.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/gallery.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/hq.svgz
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/imgur.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/picasa.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/piwigo.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/smugmug.svgz
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/wikimedia.svgz
 -rw-r--r--	root/root	usr/share/icons/hicolor/scalable/actions/zooomr.svgz
+drwxr-xr-x	root/root	usr/share/icons/hicolor/scalable/apps/
+-rw-r--r--	root/root	usr/share/icons/hicolor/scalable/apps/dngconverter.svgz
 drwxr-xr-x	root/root	usr/share/icons/oxygen/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/128x128/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/128x128/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/128x128/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/128x128/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/16x16/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/16x16/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/16x16/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/16x16/apps/rawconverter.png
 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/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/22x22/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/32x32/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/32x32/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/48x48/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/48x48/apps/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/48x48/apps/rawconverter.png
 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/dngconverter.png
 -rw-r--r--	root/root	usr/share/icons/oxygen/64x64/apps/rawconverter.png
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/
 drwxr-xr-x	root/root	usr/share/icons/oxygen/scalable/apps/
--rw-r--r--	root/root	usr/share/icons/oxygen/scalable/apps/dngconverter.svgz
 -rw-r--r--	root/root	usr/share/icons/oxygen/scalable/apps/rawconverter.svgz
 drwxr-xr-x	root/root	usr/share/kde4/
 drwxr-xr-x	root/root	usr/share/kde4/services/
@@ -360,7 +379,9 @@ drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_galleryexport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_gpssync.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_htmlexport.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_imageshackexport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_imageviewer.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_imgurexport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_jpeglossless.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_kioexportimport.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_kmlexport.desktop
@@ -379,7 +400,21 @@ drwxr-xr-x	root/root	usr/share/kde4/services/
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_smug.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_timeadjust.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_vkontakte.desktop
+-rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_wikimedia.desktop
 -rw-r--r--	root/root	usr/share/kde4/services/kipiplugin_yandexfotki.desktop
 drwxr-xr-x	root/root	usr/share/kde4/servicetypes/
 -rw-r--r--	root/root	usr/share/kde4/servicetypes/photolayoutseditorborderplugin.desktop
 -rw-r--r--	root/root	usr/share/kde4/servicetypes/photolayoutseditoreffectplugin.desktop
+drwxr-xr-x	root/root	usr/share/templates/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/
+drwxr-xr-x	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Bear boy.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Bear girl.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Flipping Tux Black.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Flipping Tux White.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Its a boy.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Its a girl.ple
+-rw-r--r--	root/root	usr/share/templates/kipiplugins_photolayoutseditor/data/templates/a4/h/Tux Rider.ple
diff --git a/kipi-plugins/.md5sum.i686 b/kipi-plugins/.md5sum.i686
index 3984ec78c..3b8dcb796 100644
--- a/kipi-plugins/.md5sum.i686
+++ b/kipi-plugins/.md5sum.i686
@@ -1 +1 @@
-45e635c0079a608c2d5508be8127d388  digikam-2.3.0.tar.bz2
+5caf799b9a74d3bed3490d2cf66021dd  digikam-2.6.0.tar.bz2
diff --git a/kipi-plugins/.md5sum.x86_64 b/kipi-plugins/.md5sum.x86_64
index 3984ec78c..3b8dcb796 100644
--- a/kipi-plugins/.md5sum.x86_64
+++ b/kipi-plugins/.md5sum.x86_64
@@ -1 +1 @@
-45e635c0079a608c2d5508be8127d388  digikam-2.3.0.tar.bz2
+5caf799b9a74d3bed3490d2cf66021dd  digikam-2.6.0.tar.bz2
diff --git a/kipi-plugins/Pkgfile b/kipi-plugins/Pkgfile
index b957492dd..dbfd203db 100755
--- a/kipi-plugins/Pkgfile
+++ b/kipi-plugins/Pkgfile
@@ -1,14 +1,14 @@
 # Description: Plugins graphiques 
 # URL: http://www.digikam.org/
-# Maintainer: NuTyX packager team
+# Maintainer: Caulier Gilles  caulier dot gilles at gmail dot com
 # Packager: lesibel at free dot fr
 # Depends on: cmake,automoc4,doxygen,kde-runtime,kdepimlibs,libkdcraw,libkipi,libksane,opencv,qjson,libkexiv2,mysql,marble
 # Run on: kde-runtime,kdepimlibs,libkdcraw,libkipi,libksane,opencv,qjson,libkexiv2
 
 
 name=kipi-plugins
-version=2.3.0
-release=2
+version=2.6.0
+release=1
 source=( http://downloads.sourceforge.net/digikam/digikam-$version.tar.bz2)
 
 build() {