From owner-svn-ports-head@FreeBSD.ORG Thu Jun 13 11:25:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B230A178; Thu, 13 Jun 2013 11:25:15 +0000 (UTC) (envelope-from wg@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A3FAD1758; Thu, 13 Jun 2013 11:25:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5DBPFus023730; Thu, 13 Jun 2013 11:25:15 GMT (envelope-from wg@svn.freebsd.org) Received: (from wg@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5DBPEig023719; Thu, 13 Jun 2013 11:25:14 GMT (envelope-from wg@svn.freebsd.org) Message-Id: <201306131125.r5DBPEig023719@svn.freebsd.org> From: William Grzybowski Date: Thu, 13 Jun 2013 11:25:14 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r320757 - in head/graphics/shotwell: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 13 Jun 2013 11:25:15 -0000 Author: wg Date: Thu Jun 13 11:25:14 2013 New Revision: 320757 URL: http://svnweb.freebsd.org/changeset/ports/320757 Log: graphics/shotwell: update to 0.14.1 - Update to 0.14.1 - Use shebangfix instead of manual replace PR: ports/178014 Submitted by: Christoph Moench-Tegeder Approved by: culot / jpaetzel (mentors, implicit), maintainer (timeout) Deleted: head/graphics/shotwell/files/patch-src-photos-GRaw.vala head/graphics/shotwell/files/patch-src__Dialogs.vala head/graphics/shotwell/files/patch-src__DirectoryMonitor.vala head/graphics/shotwell/files/patch-src__EditingTools.vala head/graphics/shotwell/files/patch-src__Photo.vala head/graphics/shotwell/files/patch-src__Printing.vala head/graphics/shotwell/files/patch-src__VideoSupport.vala head/graphics/shotwell/files/patch-src__db__PhotoTable.vala head/graphics/shotwell/files/patch-src__main.vala head/graphics/shotwell/files/patch-src__sidebar__Tree.vala head/graphics/shotwell/files/patch-src__util__file.vala head/graphics/shotwell/files/patch-vapi-libraw.vapi Modified: head/graphics/shotwell/Makefile head/graphics/shotwell/distinfo head/graphics/shotwell/files/patch-Makefile head/graphics/shotwell/files/patch-src-camera-CameraTable.vala head/graphics/shotwell/pkg-plist Modified: head/graphics/shotwell/Makefile ============================================================================== --- head/graphics/shotwell/Makefile Thu Jun 13 11:19:10 2013 (r320756) +++ head/graphics/shotwell/Makefile Thu Jun 13 11:25:14 2013 (r320757) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= shotwell -PORTVERSION= 0.11.6 -PORTREVISION= 3 +PORTVERSION= 0.14.1 CATEGORIES= graphics gnome MASTER_SITES= http://www.yorba.org/download/shotwell/${PORTVERSION:R}/ @@ -12,7 +11,8 @@ COMMENT= Open source photo manager for G LICENSE= LGPL21 -BUILD_DEPENDS= vala>=0.12.0:${PORTSDIR}/lang/vala +BUILD_DEPENDS= vala>=0.18.0:${PORTSDIR}/lang/vala \ + bash:${PORTSDIR}/shells/bash LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/devel/dbus-glib \ gee:${PORTSDIR}/devel/libgee06 \ json-glib-1.0:${PORTSDIR}/devel/json-glib \ @@ -20,35 +20,29 @@ LIB_DEPENDS= dbus-glib-1:${PORTSDIR}/dev gexiv2:${PORTSDIR}/graphics/gexiv2 \ exif:${PORTSDIR}/graphics/libexif \ gphoto2:${PORTSDIR}/graphics/libgphoto2 \ - webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2 \ + webkitgtk-3.0:${PORTSDIR}/www/webkit-gtk3 \ unique-1.0:${PORTSDIR}/x11-toolkits/unique \ - raw:${PORTSDIR}/graphics/libraw + raw:${PORTSDIR}/graphics/libraw \ + rest:${PORTSDIR}/devel/librest -USE_BZIP2= yes -USES= gettext -USE_GNOME= gnomehier gconf2 gtk20 desktopfileutils librsvg2 +USE_XZ= yes +USES= shebangfix gettext desktop-file-utils +USE_GNOME= gnomehier gconf2 gtk20 librsvg2 USE_SQLITE= 3 USE_GMAKE= yes +USE_GSTREAMER1= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS= --prefix=${PREFIX} \ - --disable-icon-update \ - --with-gconf-schema-file-dir=${PREFIX}/etc/gconf/schemas +CONFIGURE_ARGS= --prefix=${PREFIX} --disable-icon-update CONFIGURE_ENV+= --define=NO_CAMERA INSTALLS_ICONS= yes -GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml +SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver -post-patch: - @${REINPLACE_CMD} -E \ - -e 's|/bin/bash|${SH}|g ; s|/usr/bin/env.*bash|${SH}|g' \ - ${WRKSRC}/${CONFIGURE_SCRIPT} \ - ${WRKSRC}/libraw-config +GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml post-configure: @${REINPLACE_CMD} -E \ - -e 's|share/shotwell|${DATADIR_REL}|g ; \ - s|--fatal-warnings||g ; \ - s|%%GCONF_CONFIG_SOURCE%%|${GCONF_CONFIG_SOURCE}|g' \ + -e 's|share/shotwell|${DATADIR_REL}|g' \ ${WRKSRC}/${MAKEFILE} @${REINPLACE_CMD} -E \ Modified: head/graphics/shotwell/distinfo ============================================================================== --- head/graphics/shotwell/distinfo Thu Jun 13 11:19:10 2013 (r320756) +++ head/graphics/shotwell/distinfo Thu Jun 13 11:25:14 2013 (r320757) @@ -1,2 +1,2 @@ -SHA256 (shotwell-0.11.6.tar.bz2) = fab71137f336536565ea18b94591eb81c4ac696f627fe3d5ff361c9a55397af8 -SIZE (shotwell-0.11.6.tar.bz2) = 1570860 +SHA256 (shotwell-0.14.1.tar.xz) = 045c4833e23374b649e735661cedbbff8368624b6719547013db2c21c8402fef +SIZE (shotwell-0.14.1.tar.xz) = 1624784 Modified: head/graphics/shotwell/files/patch-Makefile ============================================================================== --- head/graphics/shotwell/files/patch-Makefile Thu Jun 13 11:19:10 2013 (r320756) +++ head/graphics/shotwell/files/patch-Makefile Thu Jun 13 11:25:14 2013 (r320757) @@ -1,31 +1,32 @@ ---- Makefile.orig 2011-11-03 14:39:05.000000000 -0700 -+++ Makefile 2012-03-14 14:07:24.000000000 -0700 -@@ -273,7 +273,6 @@ - gstreamer-base-0.10 \ - gstreamer-pbutils-0.10 \ - gtk+-2.0 \ +--- Makefile.orig 2013-04-03 16:16:24.000000000 -0300 ++++ Makefile 2013-06-12 22:39:11.000000000 -0300 +@@ -300,7 +300,6 @@ + gstreamer-base-1.0 \ + gstreamer-pbutils-1.0 \ + gtk+-3.0 \ - gudev-1.0 \ libexif \ libgphoto2 \ - libsoup-2.4 \ -@@ -309,7 +308,6 @@ - gstreamer-base-0.10 >= 0.10.28 \ - gstreamer-pbutils-0.10 >= 0.10.32 \ - gtk+-2.0 >= 2.18.0 \ + json-glib-1.0 \ +@@ -332,7 +331,6 @@ + gstreamer-plugins-base-1.0 >= 1.0.0 \ + gstreamer-pbutils-1.0 >= 1.0.0 \ + gtk+-3.0 >= 3.0.11 \ - gudev-1.0 >= 145 \ libexif >= 0.6.16 \ libgphoto2 >= 2.4.2 \ - libsoup-2.4 >= 2.26.0 \ -@@ -434,7 +432,7 @@ - # if not available. - LIBRAW_CONFIG=./libraw-config - --define check_valac_version -+define xcheck_valac_version - @ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ) - $(if $(MAX_VALAC_VERSION),\ - @ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Shotwell cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater. You are running' $(VALAC_VERSION) '\b.'; exit 1 ),) -@@ -556,8 +554,8 @@ + libraw >= 0.13.2 \ +@@ -453,6 +451,9 @@ + # Required for gudev-1.0 + CFLAGS += -DG_UDEV_API_IS_SUBJECT_TO_CHANGE + ++# do not forget about libintl ++LDFLAGS += -lintl ++ + define check_valadate_version + @ pkg-config $(VALADATE_PKG_NAME) --atleast-version=$(MIN_VALADATE_VERSION) || ( echo 'Shotwell testing requires Valadate $(MIN_VALADATE_VERSION) or greater. You are running' `pkg-config --modversion $(VALADATE_PKG_NAME)` '\b.'; exit 1 ) + endef +@@ -570,8 +571,8 @@ glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas endif ifndef DISABLE_GSETTINGS_CONVERT_INSTALL @@ -36,50 +37,3 @@ endif ifndef DISABLE_ICON_UPDATE -gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || : -@@ -640,7 +638,7 @@ - glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas - endif - ifndef DISABLE_GSETTINGS_CONVERT_INSTALL -- rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert -+ rm -f $(DESTDIR)$(PREFIX)/share/GConf/gsettings/shotwell.convert - endif - - $(PC_FILE): $(PC_INPUT) $(MAKE_FILES) -@@ -660,7 +658,6 @@ - - # EXPANDED_SRC_FILES includes UNITIZE_INITS and UNITIZE_ENTRY - $(VALA_STAMP): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) -- $(call check_valac_version) - @echo Compiling Vala code... - @mkdir -p $(BUILD_DIR) - @$(VALAC) --ccode --directory=$(BUILD_DIR) --basedir=src \ -@@ -677,10 +674,10 @@ - @ - - $(EXPANDED_OBJ_FILES): %.o: %.c $(CONFIG_IN) Makefile -- $(CC) -c $(VALA_CFLAGS) `$(LIBRAW_CONFIG) --cflags` $(CFLAGS) -o $@ $< -+ $(CC) -c $(VALA_CFLAGS) `pkg-config --cflags libraw` -o $@ $< - - $(PROGRAM): $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) $(THUMBNAILER_BIN) -- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -o $@ -+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -o $@ - glib-compile-schemas misc - - $(THUMBNAILER_BIN): $(EXPANDED_THUMBNAILER_SRC_FILES) -@@ -691,7 +688,6 @@ - - .PHONY: $(PLUGINS_DIR) - $(PLUGINS_DIR): $(PLUGIN_VAPI) $(PLUGIN_HEADER) $(PLUGIN_DEPS) -- $(call check_valac_version) - @$(MAKE) --directory=$@ PLUGINS_VERSION="$(VERSION)" USER_VALAFLAGS="$(USER_VALAFLAGS)" \ - PLUGIN_CFLAGS="$(PLUGIN_CFLAGS)" - -@@ -709,7 +705,7 @@ - glade: lib$(PROGRAM).so - - lib$(PROGRAM).so: $(EXPANDED_OBJ_FILES) $(RESOURCES) $(LANG_STAMP) -- $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `$(LIBRAW_CONFIG) --libs` $(EXPORT_FLAGS) -shared -o $@ -+ $(CC) $(EXPANDED_OBJ_FILES) $(CFLAGS) $(LDFLAGS) $(RESOURCES) $(VALA_LDFLAGS) `pkg-config --libs libraw` $(EXPORT_FLAGS) -shared -o $@ - - .PHONY: pkgcheck - pkgcheck: Modified: head/graphics/shotwell/files/patch-src-camera-CameraTable.vala ============================================================================== --- head/graphics/shotwell/files/patch-src-camera-CameraTable.vala Thu Jun 13 11:19:10 2013 (r320756) +++ head/graphics/shotwell/files/patch-src-camera-CameraTable.vala Thu Jun 13 11:25:14 2013 (r320757) @@ -1,8 +1,6 @@ -$NetBSD: patch-ab,v 1.4 2011/07/12 19:00:57 drochner Exp $ - ---- src/camera/CameraTable.vala.orig 2011-03-22 20:46:15.000000000 +0000 -+++ src/camera/CameraTable.vala -@@ -26,7 +26,6 @@ public class CameraTable { +--- ./src/camera/CameraTable.vala.orig 2013-04-20 21:27:30.000000000 +0200 ++++ ./src/camera/CameraTable.vala 2013-04-20 21:31:02.000000000 +0200 +@@ -26,7 +26,6 @@ private static CameraTable instance = null; @@ -10,7 +8,7 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00 private OneShotScheduler camera_update_scheduler = null; private GPhoto.Context null_context = new GPhoto.Context(); private GPhoto.CameraAbilitiesList abilities_list; -@@ -44,7 +43,6 @@ public class CameraTable { +@@ -44,7 +43,6 @@ on_update_cameras); // listen for interesting events on the specified subsystems @@ -18,18 +16,8 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00 volume_monitor = VolumeMonitor.get(); volume_monitor.volume_changed.connect(on_volume_changed); volume_monitor.volume_added.connect(on_volume_changed); -@@ -96,43 +94,18 @@ public class CameraTable { - if (res != GPhoto.Result.OK) - throw new GPhotoError.LIBRARY("[%d] Unable to %s: %s", (int) res, op, res.as_string()); - } -- -+ - private void init_camera_table() throws GPhotoError { - do_op(GPhoto.CameraAbilitiesList.create(out abilities_list), "create camera abilities list"); - do_op(abilities_list.load(null_context), "load camera abilities list"); - } -- -+ +@@ -111,32 +109,7 @@ + private string[] get_all_usb_cameras() { string[] cameras = new string[0]; - @@ -58,96 +46,17 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00 - } - } - -+ ++ // this would require udev, so we'll just return an empty array return cameras; } -- -+ - // USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera), - // then a single camera is detected at port usb:. However, if multiple USB devices are - // present (including non-cameras), then the first attached camera will be listed twice, -@@ -141,59 +114,59 @@ public class CameraTable { - // - // This function gleans the full port name of a particular port, even if it's the unadorned - // "usb:", by using GUdev. -- private bool usb_esp(int current_camera_count, string[] usb_cameras, string port, -+ private bool usb_esp(int current_camera_count, string[] usb_cameras, string port, - out string full_port) { - // sanity - assert(current_camera_count > 0); -- -+ - debug("USB ESP: current_camera_count=%d port=%s", current_camera_count, port); -- -+ - // if GPhoto detects one camera, and USB reports one camera, all is swell - if (current_camera_count == 1 && usb_cameras.length == 1) { - full_port = usb_cameras[0]; -- -+ - debug("USB ESP: port=%s full_port=%s", port, full_port); -- -+ - return true; - } - - // with more than one camera, skip the mirrored "usb:" port - if (port == "usb:") { - debug("USB ESP: Skipping %s", port); -- -+ - return false; - } -- -+ - // parse out the bus and device ID - int bus, device; - if (port.scanf("usb:%d,%d", out bus, out device) < 2) { - critical("USB ESP: Failed to scanf %s", port); -- -+ - return false; - } -- -+ - foreach (string usb_camera in usb_cameras) { - int camera_bus, camera_device; - if (usb_camera.scanf("usb:%d,%d", out camera_bus, out camera_device) < 2) { - critical("USB ESP: Failed to scanf %s", usb_camera); -- -+ - continue; - } -- -+ - if ((bus == camera_bus) && (device == camera_device)) { - full_port = port; -- -+ - debug("USB ESP: port=%s full_port=%s", port, full_port); - - return true; - } - } -- -+ - debug("USB ESP: No matching bus/device found for port=%s", port); -- -+ - return false; - } -- -+ - public static string get_port_uri(string port) { - return "gphoto2://[%s]/".printf(port); - } -@@ -204,24 +177,6 @@ public class CameraTable { + +@@ -213,23 +186,7 @@ "/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null; } - private string? get_name_for_uuid(string uuid) { - foreach (Volume volume in volume_monitor.get_volumes()) { -- if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) { +- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) { - return volume.get_name(); - } - } @@ -156,107 +65,20 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00 - - private GLib.Icon? get_icon_for_uuid(string uuid) { - foreach (Volume volume in volume_monitor.get_volumes()) { -- if (volume.get_identifier(VOLUME_IDENTIFIER_KIND_UUID) == uuid) { +- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) { - return volume.get_icon(); - } - } - return null; - } -- ++ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal) + private void update_camera_table() throws GPhotoError { // need to do this because virtual ports come and go in the USB world (and probably others) - GPhoto.PortInfoList port_info_list; -@@ -231,13 +186,13 @@ public class CameraTable { - GPhoto.CameraList camera_list; - do_op(GPhoto.CameraList.create(out camera_list), "create camera list"); - do_op(abilities_list.detect(port_info_list, camera_list, null_context), "detect cameras"); -- -+ - Gee.HashMap detected_map = new Gee.HashMap(str_hash, str_equal, - str_equal); -- -+ - // walk the USB chain and find all PTP cameras; this is necessary for usb_esp - string[] usb_cameras = get_all_usb_cameras(); -- -+ - // go through the detected camera list and glean their ports - for (int ctr = 0; ctr < camera_list.count(); ctr++) { - string name; -@@ -245,55 +200,55 @@ public class CameraTable { - - string port; - do_op(camera_list.get_value(ctr, out port), "get detected camera port"); -- -+ - debug("Detected %d/%d %s @ %s", ctr + 1, camera_list.count(), name, port); -- -+ - // do some USB ESP, skipping ports that cannot be deduced - if (port.has_prefix("usb:")) { - string full_port; - if (!usb_esp(camera_list.count(), usb_cameras, port, out full_port)) - continue; -- -+ - port = full_port; - } - - detected_map.set(port, name); - } -- -+ - // find cameras that have disappeared - DiscoveredCamera[] missing = new DiscoveredCamera[0]; - foreach (DiscoveredCamera camera in camera_map.values) { - GPhoto.PortInfo port_info; -- do_op(camera.gcamera.get_port_info(out port_info), -+ do_op(camera.gcamera.get_port_info(out port_info), - "retrieve missing camera port information"); -- -+ - GPhoto.CameraAbilities abilities; - do_op(camera.gcamera.get_abilities(out abilities), "retrieve camera abilities"); -- -+ - if (detected_map.has_key(port_info.path)) { - debug("Found camera for %s @ %s in detected map", abilities.model, port_info.path); -- -+ - continue; - } -- -+ - debug("%s @ %s missing", abilities.model, port_info.path); -- -+ - missing += camera; - } -- -+ - // have to remove from hash map outside of iterator - foreach (DiscoveredCamera camera in missing) { - GPhoto.PortInfo port_info; - do_op(camera.gcamera.get_port_info(out port_info), - "retrieve missing camera port information"); -- -+ - GPhoto.CameraAbilities abilities; - do_op(camera.gcamera.get_abilities(out abilities), "retrieve missing camera abilities"); - - debug("Removing from camera table: %s @ %s", abilities.model, port_info.path); - - camera_map.unset(get_port_uri(port_info.path)); -- -+ - camera_removed(camera); - } - -@@ -311,23 +266,6 @@ public class CameraTable { - continue; +@@ -336,22 +293,7 @@ } -- // Get display name for camera. + // Get display name for camera. - string path = get_port_path(port); - if (null != path) { - GUdev.Device device = client.query_by_device_file(path); @@ -273,10 +95,11 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00 - display_name = device.get_property("ID_MODEL"); - } - } ++ // we use a default name, as everything else requires udev if (null == display_name) { // Default to GPhoto detected name. display_name = name; -@@ -365,13 +303,6 @@ public class CameraTable { +@@ -396,13 +338,7 @@ } } @@ -287,6 +110,7 @@ $NetBSD: patch-ab,v 1.4 2011/07/12 19:00 - // update to occur when they come in all at once - camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); - } ++ // on_udev_event() removed as "udev related" public void on_volume_changed(Volume volume) { camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true); Modified: head/graphics/shotwell/pkg-plist ============================================================================== --- head/graphics/shotwell/pkg-plist Thu Jun 13 11:19:10 2013 (r320756) +++ head/graphics/shotwell/pkg-plist Thu Jun 13 11:25:14 2013 (r320757) @@ -1,17 +1,28 @@ bin/shotwell bin/shotwell-video-thumbnailer +lib/shotwell/plugins/builtin/f-spot-24.png lib/shotwell/plugins/builtin/facebook.png +lib/shotwell/plugins/builtin/facebook_publishing_options_pane.glade lib/shotwell/plugins/builtin/flickr.png +lib/shotwell/plugins/builtin/flickr_pin_entry_pane.glade +lib/shotwell/plugins/builtin/flickr_publishing_options_pane.glade lib/shotwell/plugins/builtin/picasa.png +lib/shotwell/plugins/builtin/picasa_auth_code_entry_pane.glade +lib/shotwell/plugins/builtin/picasa_not_set_up_pane.glade +lib/shotwell/plugins/builtin/picasa_publishing_options_pane.glade lib/shotwell/plugins/builtin/piwigo.png lib/shotwell/plugins/builtin/piwigo_authentication_pane.glade lib/shotwell/plugins/builtin/piwigo_publishing_options_pane.glade +lib/shotwell/plugins/builtin/shotwell-data-imports.so lib/shotwell/plugins/builtin/shotwell-publishing-extras.so lib/shotwell/plugins/builtin/shotwell-publishing.so lib/shotwell/plugins/builtin/shotwell-transitions.so lib/shotwell/plugins/builtin/slideshow-plugin.png +lib/shotwell/plugins/builtin/tumblr.png lib/shotwell/plugins/builtin/yandex_publish_model.glade lib/shotwell/plugins/builtin/youtube.png +lib/shotwell/plugins/builtin/youtube_publishing_options_pane.glade +libexec/shotwell/shotwell-settings-migrator share/applications/shotwell-viewer.desktop share/applications/shotwell.desktop share/gnome/help/shotwell/C/edit-adjustments.page @@ -21,6 +32,7 @@ share/gnome/help/shotwell/C/edit-externa share/gnome/help/shotwell/C/edit-nondestructive.page share/gnome/help/shotwell/C/edit-redeye.page share/gnome/help/shotwell/C/edit-rotate.page +share/gnome/help/shotwell/C/edit-straighten.page share/gnome/help/shotwell/C/edit-time-date.page share/gnome/help/shotwell/C/edit-undo.page share/gnome/help/shotwell/C/figures/crop_thirds.jpg @@ -44,6 +56,8 @@ share/gnome/help/shotwell/C/organize-tit share/gnome/help/shotwell/C/other-files.page share/gnome/help/shotwell/C/other-missing.page share/gnome/help/shotwell/C/other-multiple.page +share/gnome/help/shotwell/C/other-plugins.page +share/gnome/help/shotwell/C/raw.page share/gnome/help/shotwell/C/running.page share/gnome/help/shotwell/C/share-background.page share/gnome/help/shotwell/C/share-export.page @@ -54,12 +68,14 @@ share/gnome/help/shotwell/C/share-upload share/gnome/help/shotwell/C/view-displaying.page share/gnome/help/shotwell/C/view-information.page share/gnome/help/shotwell/C/view-sidebar.page -share/GConf/gsettings/shotwell.convert share/icons/hicolor/16x16/apps/shotwell.svg share/icons/hicolor/24x24/apps/shotwell.svg share/icons/hicolor/scalable/apps/shotwell.svg +share/locale/af/LC_MESSAGES/shotwell.mo share/locale/ar/LC_MESSAGES/shotwell-extras.mo share/locale/ar/LC_MESSAGES/shotwell.mo +share/locale/as/LC_MESSAGES/shotwell-extras.mo +share/locale/as/LC_MESSAGES/shotwell.mo share/locale/ast/LC_MESSAGES/shotwell-extras.mo share/locale/ast/LC_MESSAGES/shotwell.mo share/locale/bg/LC_MESSAGES/shotwell-extras.mo @@ -78,6 +94,7 @@ share/locale/el/LC_MESSAGES/shotwell-ext share/locale/el/LC_MESSAGES/shotwell.mo share/locale/en_GB/LC_MESSAGES/shotwell-extras.mo share/locale/en_GB/LC_MESSAGES/shotwell.mo +share/locale/eo/LC_MESSAGES/shotwell-extras.mo share/locale/es/LC_MESSAGES/shotwell-extras.mo share/locale/es/LC_MESSAGES/shotwell.mo share/locale/et/LC_MESSAGES/shotwell-extras.mo @@ -90,12 +107,16 @@ share/locale/fr/LC_MESSAGES/shotwell-ext share/locale/fr/LC_MESSAGES/shotwell.mo share/locale/gl/LC_MESSAGES/shotwell-extras.mo share/locale/gl/LC_MESSAGES/shotwell.mo +share/locale/gu/LC_MESSAGES/shotwell.mo share/locale/he/LC_MESSAGES/shotwell-extras.mo share/locale/he/LC_MESSAGES/shotwell.mo +share/locale/hi/LC_MESSAGES/shotwell-extras.mo +share/locale/hi/LC_MESSAGES/shotwell.mo share/locale/hr/LC_MESSAGES/shotwell-extras.mo share/locale/hr/LC_MESSAGES/shotwell.mo share/locale/hu/LC_MESSAGES/shotwell-extras.mo share/locale/hu/LC_MESSAGES/shotwell.mo +share/locale/ia/LC_MESSAGES/shotwell.mo share/locale/id/LC_MESSAGES/shotwell-extras.mo share/locale/id/LC_MESSAGES/shotwell.mo share/locale/it/LC_MESSAGES/shotwell-extras.mo @@ -104,6 +125,9 @@ share/locale/ja/LC_MESSAGES/shotwell-ext share/locale/ja/LC_MESSAGES/shotwell.mo share/locale/kk/LC_MESSAGES/shotwell-extras.mo share/locale/kk/LC_MESSAGES/shotwell.mo +share/locale/km/LC_MESSAGES/shotwell.mo +share/locale/kn/LC_MESSAGES/shotwell-extras.mo +share/locale/kn/LC_MESSAGES/shotwell.mo share/locale/ko/LC_MESSAGES/shotwell-extras.mo share/locale/ko/LC_MESSAGES/shotwell.mo share/locale/lt/LC_MESSAGES/shotwell-extras.mo @@ -112,10 +136,16 @@ share/locale/lv/LC_MESSAGES/shotwell-ext share/locale/lv/LC_MESSAGES/shotwell.mo share/locale/mk/LC_MESSAGES/shotwell-extras.mo share/locale/mk/LC_MESSAGES/shotwell.mo +share/locale/ml/LC_MESSAGES/shotwell-extras.mo +share/locale/ml/LC_MESSAGES/shotwell.mo +share/locale/mr/LC_MESSAGES/shotwell-extras.mo +share/locale/mr/LC_MESSAGES/shotwell.mo share/locale/nb/LC_MESSAGES/shotwell-extras.mo share/locale/nb/LC_MESSAGES/shotwell.mo share/locale/nl/LC_MESSAGES/shotwell-extras.mo share/locale/nl/LC_MESSAGES/shotwell.mo +share/locale/or/LC_MESSAGES/shotwell-extras.mo +share/locale/or/LC_MESSAGES/shotwell.mo share/locale/pa/LC_MESSAGES/shotwell-extras.mo share/locale/pa/LC_MESSAGES/shotwell.mo share/locale/pl/LC_MESSAGES/shotwell-extras.mo @@ -146,10 +176,12 @@ share/locale/tr/LC_MESSAGES/shotwell-ext share/locale/tr/LC_MESSAGES/shotwell.mo share/locale/uk/LC_MESSAGES/shotwell-extras.mo share/locale/uk/LC_MESSAGES/shotwell.mo +share/locale/vi/LC_MESSAGES/shotwell.mo share/locale/zh_CN/LC_MESSAGES/shotwell-extras.mo share/locale/zh_CN/LC_MESSAGES/shotwell.mo share/locale/zh_TW/LC_MESSAGES/shotwell-extras.mo share/locale/zh_TW/LC_MESSAGES/shotwell.mo +share/GConf/gsettings/shotwell.convert %%DATADIR%%/icons/all-rejected.png %%DATADIR%%/icons/crop-pivot-reticle.png %%DATADIR%%/icons/crop.svg @@ -182,8 +214,6 @@ share/locale/zh_TW/LC_MESSAGES/shotwell. %%DATADIR%%/icons/publish.png %%DATADIR%%/icons/redeye.png %%DATADIR%%/icons/rejected.svg -%%DATADIR%%/icons/searchbox-clear.svg -%%DATADIR%%/icons/searchbox-find.svg %%DATADIR%%/icons/shotwell-16.svg %%DATADIR%%/icons/shotwell-24.svg %%DATADIR%%/icons/shotwell-street.jpg @@ -191,6 +221,7 @@ share/locale/zh_TW/LC_MESSAGES/shotwell. %%DATADIR%%/icons/shotwell.svg %%DATADIR%%/icons/slideshow-extension-point.png %%DATADIR%%/icons/sprocket.png +%%DATADIR%%/icons/straighten.svg %%DATADIR%%/icons/three-star-filter-plus.svg %%DATADIR%%/icons/three-stars.svg %%DATADIR%%/icons/two-star-filter-plus.svg @@ -200,6 +231,7 @@ share/locale/zh_TW/LC_MESSAGES/shotwell. %%DATADIR%%/icons/zoom-out.png %%DATADIR%%/ui/collection.ui %%DATADIR%%/ui/direct.ui +%%DATADIR%%/ui/direct_context.ui %%DATADIR%%/ui/event.ui %%DATADIR%%/ui/events_directory.ui %%DATADIR%%/ui/fullscreen.ui @@ -208,27 +240,39 @@ share/locale/zh_TW/LC_MESSAGES/shotwell. %%DATADIR%%/ui/media.ui %%DATADIR%%/ui/offline.ui %%DATADIR%%/ui/photo.ui +%%DATADIR%%/ui/photo_context.ui %%DATADIR%%/ui/savedsearch.ui %%DATADIR%%/ui/search_bar.ui -%%DATADIR%%/ui/set_background_dialog.glade %%DATADIR%%/ui/search_sidebar_context.ui +%%DATADIR%%/ui/set_background_dialog.glade %%DATADIR%%/ui/shotwell.glade %%DATADIR%%/ui/shotwell.xml %%DATADIR%%/ui/sidebar_default_context.ui %%DATADIR%%/ui/tag_sidebar_context.ui %%DATADIR%%/ui/tags.ui +%%DATADIR%%/ui/top.ui %%DATADIR%%/ui/trash.ui @dirrm %%DATADIR%%/ui @dirrm %%DATADIR%%/icons @dirrm %%DATADIR%% +@dirrmtry share/locale/te/LC_MESSAGES +@dirrmtry share/locale/te +@dirrmtry share/locale/mr/LC_MESSAGES +@dirrmtry share/locale/mr +@dirrmtry share/locale/km/LC_MESSAGES +@dirrmtry share/locale/km @dirrmtry share/locale/kk/LC_MESSAGES @dirrmtry share/locale/kk +@dirrmtry share/locale/ia/LC_MESSAGES +@dirrmtry share/locale/ia @dirrmtry share/locale/ast/LC_MESSAGES @dirrmtry share/locale/ast +@dirrmtry share/locale/as/LC_MESSAGES +@dirrmtry share/locale/as @dirrm share/gnome/help/shotwell/C/figures @dirrm share/gnome/help/shotwell/C @dirrm share/gnome/help/shotwell -@dirrmtry share/applications +@dirrm libexec/shotwell @dirrm lib/shotwell/plugins/builtin @dirrm lib/shotwell/plugins @dirrm lib/shotwell