Merge commit 'lesibel/master'

6 files changed, 66 insertions, 12 deletions

diff --git a/kde/digikam/.footprint b/kde/digikam/.footprint
index 3c4061b23..f7694c562 100755..100644
--- a/kde/digikam/.footprint
+++ b/kde/digikam/.footprint
@@ -108,6 +108,9 @@ drwxr-xr-x	root/root	opt/kde/lib/kde4/
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kio_digikamdates.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kio_digikamsearch.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kio_digikamtags.so
+drwxr-xr-x	root/root	opt/kde/lib/kde4/plugins/
+drwxr-xr-x	root/root	opt/kde/lib/kde4/plugins/marble/
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/plugins/marble/ExternalDraw.so
 lrwxrwxrwx	root/root	opt/kde/lib/libdigikamcore.so -> libdigikamcore.so.1
 lrwxrwxrwx	root/root	opt/kde/lib/libdigikamcore.so.1 -> libdigikamcore.so.1.0.0
 -rwxr-xr-x	root/root	opt/kde/lib/libdigikamcore.so.1.0.0
diff --git a/kde/digikam/.md5sum b/kde/digikam/.md5sum
index b33a450ff..62a3b98ab 100755..100644
--- a/kde/digikam/.md5sum
+++ b/kde/digikam/.md5sum
@@ -1 +1 @@
-fd43f7aab22fc093904525ba59497e3c  digikam-1.0.0-beta4.tar.bz2
+73131d173e237caa1d952027d9679d1c  digikam-1.0.0-beta5.tar.bz2
diff --git a/kde/digikam/Pkgfile b/kde/digikam/Pkgfile
index ebb171e42..33604a0b6 100755
--- a/kde/digikam/Pkgfile
+++ b/kde/digikam/Pkgfile
@@ -5,7 +5,7 @@
 # Depends on: libgphoto2, lcms, kdegraphics, kdepimlibs, jasper, lensfun, libjpeg, kipi-plugins
 
 name=digikam
-version=1.0.0-beta4
+version=1.0.0-beta5
 release=1
 source=(http://downloads.sourceforge.net/$name/$name-$version.tar.bz2)
 
diff --git a/kde/kipi-plugins/.footprint b/kde/kipi-plugins/.footprint
index 0fc914dde..48db086f5 100755..100644
--- a/kde/kipi-plugins/.footprint
+++ b/kde/kipi-plugins/.footprint
@@ -2,6 +2,7 @@ drwxr-xr-x	root/root	opt/
 drwxr-xr-x	root/root	opt/kde/
 drwxr-xr-x	root/root	opt/kde/bin/
 -rwxr-xr-x	root/root	opt/kde/bin/dngconverter
+-rwxr-xr-x	root/root	opt/kde/bin/scangui
 drwxr-xr-x	root/root	opt/kde/lib/
 drwxr-xr-x	root/root	opt/kde/lib/kde4/
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_acquireimages.so
@@ -17,12 +18,13 @@ drwxr-xr-x	root/root	opt/kde/lib/kde4/
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_htmlexport.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_imageviewer.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_jpeglossless.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_kioexportimport.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_metadataedit.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_picasawebexport.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_printimages.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_rawconverter.so
--rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_removeredeyes.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_sendimages.so
+-rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_shwup.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_smug.so
 -rwxr-xr-x	root/root	opt/kde/lib/kde4/kipiplugin_timeadjust.so
 lrwxrwxrwx	root/root	opt/kde/lib/libkipiplugins.so -> libkipiplugins.so.1
@@ -33,9 +35,8 @@ drwxr-xr-x	root/root	opt/kde/share/applications/
 drwxr-xr-x	root/root	opt/kde/share/applications/kde4/
 -rw-r--r--	root/root	opt/kde/share/applications/kde4/dngconverter.desktop
 -rw-r--r--	root/root	opt/kde/share/applications/kde4/kipiplugins.desktop
+-rw-r--r--	root/root	opt/kde/share/applications/kde4/scangui.desktop
 drwxr-xr-x	root/root	opt/kde/share/apps/
-drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_advancedslideshow/
--rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_advancedslideshow/KIPIicon.svg
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_facebook/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_facebook/icons/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_facebook/icons/hicolor/
@@ -82,22 +83,27 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/16
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/16x16/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/16x16/actions/flickr.png
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/16x16/actions/hq.png
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/16x16/actions/zooomr.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/22x22/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/22x22/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/22x22/actions/flickr.png
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/22x22/actions/hq.png
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/22x22/actions/zooomr.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/32x32/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/32x32/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/32x32/actions/flickr.png
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/32x32/actions/hq.png
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/32x32/actions/zooomr.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/48x48/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/48x48/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/48x48/actions/flickr.png
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/48x48/actions/hq.png
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/48x48/actions/zooomr.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/scalable/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/scalable/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/scalable/actions/flickr.svgz
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/scalable/actions/hq.svgz
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_flickrexport/icons/hicolor/scalable/actions/zooomr.svgz
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_galleryexport/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_galleryexport/icons/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_galleryexport/icons/hicolor/
@@ -117,8 +123,9 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_galleryexport/icons/hicolor/s
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_galleryexport/icons/hicolor/scalable/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_galleryexport/icons/hicolor/scalable/actions/gallery.svgz
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_galleryexport/pics/
--rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_galleryexport/pics/gallery.png
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_galleryexport/pics/gallery_logo.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_htmlexport/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/THEME_HOWTO
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/classic/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/classic/classic.desktop
@@ -137,6 +144,9 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/cleanframes
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/cleanframes/star.png
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/cleanframes/template.xsl
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/cleanframes/yellow.css
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/dateframes/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/dateframes/dateframes.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/dateframes/template.xsl
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/frames/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/frames/frames.desktop
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_htmlexport/themes/frames/style.css
@@ -196,9 +206,49 @@ drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_picasawebexport/icons/hicolor
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_picasawebexport/icons/hicolor/scalable/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_picasawebexport/icons/hicolor/scalable/actions/
 -rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_picasawebexport/icons/hicolor/scalable/actions/picasa.svgz
-drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_removeredeyes/
--rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_removeredeyes/controlwidget.svg
--rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_removeredeyes/removeredeyes_classifier_eye_20_20.xml
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_printimages/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/TEMPLATE_HOWTO
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/1_photo_10.5x14.8cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/1_photo_10x15cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/1_photo_20x25cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/1_photo_8x10.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/1_photo_9x13cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/2_photos_13x18cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/2_photos_5x7.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/3_photos_10x15cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/3_photos_4x6.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/4_photos_10x13.33cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/4_photos_3.5x5.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/4_photos_4.5x5cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/4_photos_9x13cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/4x6Album.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/6_photos_3.5x4cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/8_photos_6x9cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Album-Collage.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Album-Collage1.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Album_10x15cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Album_11.5x15cm.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/FullPage.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Photoframe.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Thumbnails_5x4.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/Thumbnails_6x5.desktop
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_printimages/templates/templates.xml
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/16x16/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/16x16/actions/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/16x16/actions/shwup.png
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/22x22/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/22x22/actions/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/22x22/actions/shwup.png
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/32x32/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/32x32/actions/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/32x32/actions/shwup.png
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/48x48/
+drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/48x48/actions/
+-rw-r--r--	root/root	opt/kde/share/apps/kipiplugin_shwup/icons/hicolor/48x48/actions/shwup.png
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_smug/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_smug/icons/
 drwxr-xr-x	root/root	opt/kde/share/apps/kipiplugin_smug/icons/hicolor/
@@ -288,12 +338,13 @@ drwxr-xr-x	root/root	opt/kde/share/kde4/services/
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_htmlexport.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_imageviewer.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_jpeglossless.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_kioexportimport.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_metadataedit.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_picasawebexport.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_printimages.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_rawconverter.desktop
--rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_removeredeyes.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_sendimages.desktop
+-rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_shwup.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_smug.desktop
 -rw-r--r--	root/root	opt/kde/share/kde4/services/kipiplugin_timeadjust.desktop
 drwxr-xr-x	root/root	opt/kde/share/locale/
diff --git a/kde/kipi-plugins/.md5sum b/kde/kipi-plugins/.md5sum
index ff4c6b801..ef9dc0703 100755..100644
--- a/kde/kipi-plugins/.md5sum
+++ b/kde/kipi-plugins/.md5sum
@@ -1 +1 @@
-98835d56e3a50429b360d23c9e589673  kipi-plugins-0.4.0.tar.bz2
+2049c37dd1bff8f818e379d3c7676389  kipi-plugins-0.8.0.tar.bz2
diff --git a/kde/kipi-plugins/Pkgfile b/kde/kipi-plugins/Pkgfile
index 8325dfb5f..2d62a288c 100755
--- a/kde/kipi-plugins/Pkgfile
+++ b/kde/kipi-plugins/Pkgfile
@@ -4,7 +4,7 @@
 # Depends on: qt, kdebase, kdegraphics, libtiff, libjpeg, libpng, imagemagick, libxslt, libxml2, expat, mesa3d, opencv, kdepimlibs
 
 name=kipi-plugins
-version=0.4.0
+version=0.8.0
 release=1
 source=(http://downloads.sourceforge.net/kipi/$name-$version.tar.bz2)