update to 0.6.1.1

changes:
-new viewer widget
-new widget showing folders organisation
-new Preference dialog
-code cleanup
-bugfixes
-translation updates
-load .pcx files

3 files changed, 60 insertions, 21 deletions

diff --git a/graphics/f-spot/Makefile b/graphics/f-spot/Makefile
index de277b951a7..c804cf76457 100644
--- a/graphics/f-spot/Makefile
+++ b/graphics/f-spot/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2009/08/29 11:45:29 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2009/09/09 17:19:50 drochner Exp $
 #
 
-DISTNAME=	f-spot-0.5.0.3
-PKGREVISION=	4
+DISTNAME=	f-spot-0.6.1.1
 CATEGORIES=	graphics
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.5/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/f-spot/0.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -43,4 +42,5 @@ REPLACE_BASH+=	tools/f-spot-import
 .include "../../x11/gtk-sharp/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus/buildlink3.mk"
 .include "../../sysutils/ndesk-dbus-glib/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/f-spot/PLIST b/graphics/f-spot/PLIST
index 31e5fc6ac60..a30f5e24163 100644
--- a/graphics/f-spot/PLIST
+++ b/graphics/f-spot/PLIST
@@ -1,15 +1,26 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:59:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2009/09/09 17:19:50 drochner Exp $
 bin/f-spot
 bin/f-spot-import
 bin/f-spot-sqlite-upgrade
 lib/f-spot/Cms.dll
 lib/f-spot/Cms.dll.config
+lib/f-spot/Cms.dll.mdb
+lib/f-spot/FSpot.Bling.dll
+lib/f-spot/FSpot.Bling.dll.mdb
 lib/f-spot/FSpot.Core.dll
+lib/f-spot/FSpot.Core.dll.mdb
 lib/f-spot/FSpot.JobScheduler.dll
+lib/f-spot/FSpot.JobScheduler.dll.mdb
+lib/f-spot/FSpot.Platform.dll
+lib/f-spot/FSpot.Platform.dll.mdb
 lib/f-spot/FSpot.Query.dll
+lib/f-spot/FSpot.Query.dll.mdb
 lib/f-spot/FSpot.Utils.dll
 lib/f-spot/FSpot.Utils.dll.config
+lib/f-spot/FSpot.Utils.dll.mdb
 lib/f-spot/FSpot.Widgets.dll
+lib/f-spot/FSpot.Widgets.dll.config
+lib/f-spot/FSpot.Widgets.dll.mdb
 lib/f-spot/FlickrNet.dll
 lib/f-spot/Mono.Addins.Gui.dll
 lib/f-spot/Mono.Addins.Setup.dll
@@ -20,15 +31,10 @@ lib/f-spot/Mono.Tabblo.dll
 lib/f-spot/NDesk.Glitz.dll
 lib/f-spot/SemWeb.dll
 lib/f-spot/SmugMugNet.dll
-lib/f-spot/Tao.OpenGl.ExtensionLoader.dll
-lib/f-spot/Tao.OpenGl.ExtensionLoader.dll.config
-lib/f-spot/Tao.OpenGl.Glu.dll
-lib/f-spot/Tao.OpenGl.Glu.dll.config
-lib/f-spot/Tao.OpenGl.dll
-lib/f-spot/Tao.OpenGl.dll.config
 lib/f-spot/extensions/BeagleService.dll
 lib/f-spot/extensions/CDExport.dll
 lib/f-spot/extensions/ChangePhotoPath.dll
+lib/f-spot/extensions/CoverTransition.dll
 lib/f-spot/extensions/DBusService.dll
 lib/f-spot/extensions/DefaultExporters.addin.xml
 lib/f-spot/extensions/DevelopInUFRaw.dll
@@ -40,24 +46,25 @@ lib/f-spot/extensions/HashJob.dll
 lib/f-spot/extensions/MergeDb.dll
 lib/f-spot/extensions/PicasaWebExport.dll
 lib/f-spot/extensions/RawPlusJpeg.dll
+lib/f-spot/extensions/ScreensaverConfig.dll
 lib/f-spot/extensions/SmugMugExport.dll
 lib/f-spot/extensions/TabbloExport.dll
 lib/f-spot/extensions/ZipExport.dll
 lib/f-spot/f-spot.exe
 lib/f-spot/f-spot.exe.config
+lib/f-spot/f-spot.exe.mdb
 lib/f-spot/f-spot.global.addins
 lib/f-spot/gio-sharp.dll
 lib/f-spot/gio-sharp.dll.config
+lib/f-spot/gkeyfile-sharp.dll
 lib/f-spot/gnome-keyring-sharp.dll
+lib/f-spot/gtk-sharp-beans.dll
+lib/f-spot/gtk-sharp-beans.dll.config
 lib/f-spot/libfspot.la
-lib/f-spot/libfspoteog.la
 lib/f-spot/libfspotjpegtran.la
 lib/f-spot/libgphoto2-sharp.dll
 lib/f-spot/libgphoto2-sharp.dll.config
-lib/gio-sharp-unstable/gio-sharp.dll
-lib/gio-sharp-unstable/gio-sharp.dll.config
 lib/pkgconfig/f-spot.pc
-lib/pkgconfig/gio-sharp-unstable.pc
 libexec/gnome-screensaver/f-spot-screensaver
 share/applications/f-spot-import.desktop
 share/applications/f-spot-view.desktop
@@ -138,6 +145,7 @@ share/f-spot/icons/hicolor/24x24/emblems/emblem-readonly.png
 share/f-spot/icons/hicolor/24x24/places/film-roll.png
 share/f-spot/icons/hicolor/24x24/status/mode-browse.png
 share/f-spot/icons/hicolor/24x24/status/mode-image-edit.png
+share/f-spot/icons/hicolor/256x256/apps/f-spot.png
 share/f-spot/icons/hicolor/32x32/actions/object-rotate-left.png
 share/f-spot/icons/hicolor/32x32/actions/object-rotate-right.png
 share/f-spot/icons/hicolor/32x32/actions/view-fullscreen.png
@@ -153,7 +161,6 @@ share/f-spot/icons/hicolor/scalable/actions/object-rotate-left.svg
 share/f-spot/icons/hicolor/scalable/actions/object-rotate-right.svg
 share/f-spot/icons/hicolor/scalable/actions/view-fullscreen.svg
 share/f-spot/icons/hicolor/scalable/actions/view-restore.svg
-share/f-spot/icons/hicolor/scalable/apps/f-spot.svg
 share/f-spot/icons/hicolor/scalable/emblems/emblem-event.svg
 share/f-spot/icons/hicolor/scalable/emblems/emblem-places.svg
 share/f-spot/icons/hicolor/scalable/status/mode-browse.svg
@@ -168,6 +175,17 @@ share/gnome/help/f-spot/C/figures/f-spot-sepia.png
 share/gnome/help/f-spot/C/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/C/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/C/figures/f-spot-straighten.png
+share/gnome/help/f-spot/cs/f-spot.xml
+share/gnome/help/f-spot/cs/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/cs/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/cs/figures/f-spot-crop.png
+share/gnome/help/f-spot/cs/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/cs/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/cs/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/cs/figures/f-spot-sepia.png
+share/gnome/help/f-spot/cs/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/cs/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/cs/figures/f-spot-straighten.png
 share/gnome/help/f-spot/da/f-spot.xml
 share/gnome/help/f-spot/da/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/da/figures/f-spot-autocolor.png
@@ -179,6 +197,17 @@ share/gnome/help/f-spot/da/figures/f-spot-sepia.png
 share/gnome/help/f-spot/da/figures/f-spot-slideshow.png
 share/gnome/help/f-spot/da/figures/f-spot-soft-focus.png
 share/gnome/help/f-spot/da/figures/f-spot-straighten.png
+share/gnome/help/f-spot/de/f-spot.xml
+share/gnome/help/f-spot/de/figures/f-spot-adjust-colors.png
+share/gnome/help/f-spot/de/figures/f-spot-autocolor.png
+share/gnome/help/f-spot/de/figures/f-spot-crop.png
+share/gnome/help/f-spot/de/figures/f-spot-desaturate.png
+share/gnome/help/f-spot/de/figures/f-spot-fullscreen.png
+share/gnome/help/f-spot/de/figures/f-spot-red-eye.png
+share/gnome/help/f-spot/de/figures/f-spot-sepia.png
+share/gnome/help/f-spot/de/figures/f-spot-slideshow.png
+share/gnome/help/f-spot/de/figures/f-spot-soft-focus.png
+share/gnome/help/f-spot/de/figures/f-spot-straighten.png
 share/gnome/help/f-spot/es/f-spot.xml
 share/gnome/help/f-spot/es/figures/f-spot-adjust-colors.png
 share/gnome/help/f-spot/es/figures/f-spot-autocolor.png
@@ -259,9 +288,11 @@ share/gnome/help/f-spot/sv/figures/f-spot-straighten.png
 share/icons/hicolor/16x16/apps/f-spot.png
 share/icons/hicolor/22x22/apps/f-spot.png
 share/icons/hicolor/24x24/apps/f-spot.png
+share/icons/hicolor/256x256/apps/f-spot.png
 share/icons/hicolor/32x32/apps/f-spot.png
-share/icons/hicolor/scalable/apps/f-spot.svg
+share/icons/hicolor/48x48/apps/f-spot.png
 share/locale/ar/LC_MESSAGES/f-spot.mo
+share/locale/as/LC_MESSAGES/f-spot.mo
 share/locale/be@latin/LC_MESSAGES/f-spot.mo
 share/locale/bg/LC_MESSAGES/f-spot.mo
 share/locale/ca/LC_MESSAGES/f-spot.mo
@@ -279,19 +310,23 @@ share/locale/fa/LC_MESSAGES/f-spot.mo
 share/locale/fi/LC_MESSAGES/f-spot.mo
 share/locale/fr/LC_MESSAGES/f-spot.mo
 share/locale/gl/LC_MESSAGES/f-spot.mo
+share/locale/gu/LC_MESSAGES/f-spot.mo
 share/locale/he/LC_MESSAGES/f-spot.mo
 share/locale/hi/LC_MESSAGES/f-spot.mo
 share/locale/hu/LC_MESSAGES/f-spot.mo
 share/locale/it/LC_MESSAGES/f-spot.mo
 share/locale/ja/LC_MESSAGES/f-spot.mo
 share/locale/ka/LC_MESSAGES/f-spot.mo
+share/locale/kn/LC_MESSAGES/f-spot.mo
 share/locale/ko/LC_MESSAGES/f-spot.mo
 share/locale/lt/LC_MESSAGES/f-spot.mo
 share/locale/lv/LC_MESSAGES/f-spot.mo
 share/locale/mk/LC_MESSAGES/f-spot.mo
+share/locale/mr/LC_MESSAGES/f-spot.mo
 share/locale/nb/LC_MESSAGES/f-spot.mo
 share/locale/nl/LC_MESSAGES/f-spot.mo
 share/locale/oc/LC_MESSAGES/f-spot.mo
+share/locale/or/LC_MESSAGES/f-spot.mo
 share/locale/pa/LC_MESSAGES/f-spot.mo
 share/locale/pl/LC_MESSAGES/f-spot.mo
 share/locale/pt/LC_MESSAGES/f-spot.mo
@@ -302,6 +337,8 @@ share/locale/sk/LC_MESSAGES/f-spot.mo
 share/locale/sr/LC_MESSAGES/f-spot.mo
 share/locale/sr@latin/LC_MESSAGES/f-spot.mo
 share/locale/sv/LC_MESSAGES/f-spot.mo
+share/locale/ta/LC_MESSAGES/f-spot.mo
+share/locale/te/LC_MESSAGES/f-spot.mo
 share/locale/th/LC_MESSAGES/f-spot.mo
 share/locale/uk/LC_MESSAGES/f-spot.mo
 share/locale/vi/LC_MESSAGES/f-spot.mo
@@ -309,7 +346,9 @@ share/locale/zh_CN/LC_MESSAGES/f-spot.mo
 share/locale/zh_HK/LC_MESSAGES/f-spot.mo
 share/locale/zh_TW/LC_MESSAGES/f-spot.mo
 share/omf/f-spot/f-spot-C.omf
+share/omf/f-spot/f-spot-cs.omf
 share/omf/f-spot/f-spot-da.omf
+share/omf/f-spot/f-spot-de.omf
 share/omf/f-spot/f-spot-es.omf
 share/omf/f-spot/f-spot-fr.omf
 share/omf/f-spot/f-spot-it.omf
diff --git a/graphics/f-spot/distinfo b/graphics/f-spot/distinfo
index dc6b519b2b2..3498c2279c2 100644
--- a/graphics/f-spot/distinfo
+++ b/graphics/f-spot/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/11/30 23:56:48 wiz Exp $
+$NetBSD: distinfo,v 1.2 2009/09/09 17:19:50 drochner Exp $
 
-SHA1 (f-spot-0.5.0.3.tar.bz2) = 9b666c1d38ea765ddbbba56c42eaa721e2f14096
-RMD160 (f-spot-0.5.0.3.tar.bz2) = 0b02a2a5a8133e4304dfe6d0d6e971ee6ee48d0c
-Size (f-spot-0.5.0.3.tar.bz2) = 2776582 bytes
+SHA1 (f-spot-0.6.1.1.tar.bz2) = ac2abd9fabaa948c5d6dd8a418deb9b992bf46c3
+RMD160 (f-spot-0.6.1.1.tar.bz2) = 3233e0d081ebbe66ff756cb75945bcbe4176e9ce
+Size (f-spot-0.6.1.1.tar.bz2) = 2814962 bytes