Attachment #154923 for bug #198986

View | Details | Raw Unified | Return to bug 198986
Collapse All | Expand All




# $FreeBSD$

PORTNAME=	shotwell
PORTVERSION=	0.22.0
PORTREVISION=	2
CATEGORIES=	graphics gnome
MASTER_SITES=	GNOME/sources/shotwell/${PORTVERSION:R}


LICENSE=	LGPL21
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	vala>=0.20.1:${PORTSDIR}/lang/vala \
		bash:${PORTSDIR}/shells/bash
LIB_DEPENDS=	libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
		libgee-0.8.so:${PORTSDIR}/devel/libgee \

CONFIGURE_ARGS=	--prefix=${PREFIX} --disable-icon-update
CONFIGURE_ENV+=	--define=NO_CAMERA
INSTALLS_ICONS=	yes
PORTSCOUT=	limitw:1,even

OPTIONS_DEFINE=	OPENMP
OPTIONS_DEFAULT=
OPENMP_DESC=	libraw uses OpenMP (implies GCC 4.6+)

OPENMP_USES=		compiler:gcc-c++11-lib
OPENMP_USES_OFF=	compiler:c++11-lib

.if ${PORT_OPTIONS:MOPENMP}
USE_GCC=	yes
LDFLAGS+=	-lc++
.endif

SHEBANG_FILES=	${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver

GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (shotwell-0.20.2.tar.xz) = 37e2c89f75013b8afc045f0b7b4dbbaeca49aa1af3938237ddf4ceac3f6bb740	1	SHA256 (shotwell-0.22.0.tar.xz) = 01b192c5c1c188ecd11bfdb6143d8f177f313c7eab7fe320bd20ac3ca352f831
2	SIZE (shotwell-0.20.2.tar.xz) = 1815580	2	SIZE (shotwell-0.22.0.tar.xz) = 1872952




--- Makefile.orig	2015-03-28 15:11:25.000000000 +0100
+++ Makefile	2015-03-28 15:14:57.000000000 +0100
@@ -13,7 +13,7 @@
 VALAC := $(shell which $(VALAC))
 endif
 
-VALAC_VERSION := `$(VALAC) --version | awk '{print $$2}'`
+VALAC_VERSION := `$(VALAC) --version | cut -d' ' -f2`
 MIN_VALAC_VERSION := 0.20.1
 INSTALL_PROGRAM := install
 INSTALL_DATA := install -m 644
@@ -263,7 +263,6 @@
 	gstreamer-base-1.0 \
 	gstreamer-pbutils-1.0 \
 	gtk+-3.0 \

 	libexif \
 	libgphoto2 \
 	json-glib-1.0 \
@@ -295,7 +294,6 @@
 	gstreamer-plugins-base-1.0 >= 1.0.0 \
 	gstreamer-pbutils-1.0 >= 1.0.0 \
 	gtk+-3.0 >= 3.12.2 \
-	gudev-1.0 >= 145 \
 	libexif >= 0.6.16 \
 	libgphoto2 >= 2.4.2 \
 	libraw >= 0.13.2 \
@@ -544,8 +542,8 @@
 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 endif
 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL

Lines 1-5 Link Here

(-)files/patch-src-camera-CameraTable.vala (-16 / +27 lines)
1	--- src/camera/CameraTable.vala.orig 2014-09-28 18:49:39.000000000 +0200	1	--- src/camera/CameraTable.vala.orig 2015-03-28 15:15:28.000000000 +0100
2	+++ src/camera/CameraTable.vala 2014-09-28 19:10:01.000000000 +0200	2	+++ src/camera/CameraTable.vala 2015-03-28 15:20:51.000000000 +0100
3	@@ -26,7 +26,6 @@	3	@@ -26,7 +26,6 @@
4		4
5	private static CameraTable instance = null;	5	private static CameraTable instance = null;
Lines 16-25 Link Here
16	volume_monitor = VolumeMonitor.get();	16	volume_monitor = VolumeMonitor.get();
17	volume_monitor.volume_changed.connect(on_volume_changed);	17	volume_monitor.volume_changed.connect(on_volume_changed);
18	volume_monitor.volume_added.connect(on_volume_changed);	18	volume_monitor.volume_added.connect(on_volume_changed);
19	@@ -111,31 +109,7 @@	19	@@ -107,36 +105,10 @@
		20	do_op(GPhoto.CameraAbilitiesList.create(out abilities_list), "create camera abilities list");
		21	do_op(abilities_list.load(null_context), "load camera abilities list");
		22	}
		23	-
		24	+
		25	+ // dummy stub - the original requires udev
20	private string[] get_all_usb_cameras() {	26	private string[] get_all_usb_cameras() {
21	string[] cameras = new string[0];	27	- string[] cameras = new string[0];
22		28	-
23	- GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);	29	- GLib.List<GUdev.Device> device_list = client.query_by_subsystem(null);
24	- foreach (GUdev.Device device in device_list) {	30	- foreach (GUdev.Device device in device_list) {
25	- string device_file = device.get_device_file();	31	- string device_file = device.get_device_file();
Lines 45-58 Link Here
45	- }	51	- }
46	- }	52	- }
47	-	53	-
48	+ // this would require udev, so we'll just return an empty array	54	- return cameras;
49	return cameras;	55	+ return new string[0];
50	}	56	}
51		57
52	@@ -212,23 +186,7 @@	58	// USB (or libusb) is a funny beast; if only one USB device is present (i.e. the camera),
		59	@@ -211,24 +183,8 @@
		60	return port.has_prefix("usb:") ?
53	"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;	61	"/dev/bus/usb/%s".printf(port.substring(4).replace(",", "/")) : null;
54	}	62	}
55		63	-
56	- private string? get_name_for_uuid(string uuid) {	64	- private string? get_name_for_uuid(string uuid) {
57	- foreach (Volume volume in volume_monitor.get_volumes()) {	65	- foreach (Volume volume in volume_monitor.get_volumes()) {
58	- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {	66	- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
Lines 62-80 Link Here
62	- return null;	70	- return null;
63	- }	71	- }
64	-	72	-
65	- private GLib.Icon? get_icon_for_uuid(string uuid) {	73	- private string? get_icon_for_uuid(string uuid) {
66	- foreach (Volume volume in volume_monitor.get_volumes()) {	74	- foreach (Volume volume in volume_monitor.get_volumes()) {
67	- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {	75	- if (volume.get_identifier(VolumeIdentifier.UUID) == uuid) {
68	- return volume.get_icon();	76	- return volume.get_icon().to_string();
69	- }	77	- }
70	- }	78	- }
71	- return null;	79	- return null;
72	- }	80	- }
		81	+
73	+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal)	82	+ // get_name_for_uuid() and get_icon_for_uuid() are not used (udev removal)
74		83
75	private void update_camera_table() throws GPhotoError {	84	private void update_camera_table() throws GPhotoError {
76	// need to do this because virtual ports come and go in the USB world (and probably others)	85	// need to do this because virtual ports come and go in the USB world (and probably others)
77	@@ -334,22 +292,7 @@	86	@@ -334,22 +290,7 @@
78	}	87	}
79		88
80	// Get display name for camera.	89	// Get display name for camera.
Lines 94-107 Link Here
94	- display_name = device.get_property("ID_MODEL");	103	- display_name = device.get_property("ID_MODEL");
95	- }	104	- }
96	- }	105	- }
97	+ // we use a default name, as everything else requires udev	106	+ // in absence of udev, we fall back to the GPhoto name
98	if (null == display_name) {	107	if (null == display_name) {
99	// Default to GPhoto detected name.	108	// Default to GPhoto detected name.
100	display_name = name;	109	display_name = name;
101	@@ -394,13 +337,7 @@	110	@@ -393,14 +334,8 @@
		111	camera_added(camera);
102	}	112	}
103	}	113	}
104		114	-
105	- private void on_udev_event(string action, GUdev.Device device) {	115	- private void on_udev_event(string action, GUdev.Device device) {
106	- debug("udev event: %s on %s", action, device.get_name());	116	- debug("udev event: %s on %s", action, device.get_name());
107	-	117	-
Lines 109-115 Link Here
109	- // update to occur when they come in all at once	119	- // update to occur when they come in all at once
110	- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);	120	- camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);
111	- }	121	- }
112	+ // on_udev_event() removed as "udev related"	122	+
		123	+ // on_udev_event() removed - we do not have udev
113		124
114	public void on_volume_changed(Volume volume) {	125	public void on_volume_changed(Volume volume) {
115	camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);	126	camera_update_scheduler.after_timeout(UPDATE_DELAY_MSEC, true);




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/gnome/help/shotwell/cs/edit-adjustments.page
share/gnome/help/shotwell/cs/edit-crop.page
share/gnome/help/shotwell/cs/edit-enhance.page
share/gnome/help/shotwell/cs/edit-external.page
share/gnome/help/shotwell/cs/edit-nondestructive.page
share/gnome/help/shotwell/cs/edit-redeye.page
share/gnome/help/shotwell/cs/edit-rotate.page
share/gnome/help/shotwell/cs/edit-straighten.page
share/gnome/help/shotwell/cs/edit-time-date.page
share/gnome/help/shotwell/cs/edit-undo.page
share/gnome/help/shotwell/cs/formats.page
share/gnome/help/shotwell/cs/import-camera.page
share/gnome/help/shotwell/cs/import-f-spot.page
share/gnome/help/shotwell/cs/import-file.page
share/gnome/help/shotwell/cs/import-memorycard.page
share/gnome/help/shotwell/cs/index.page
share/gnome/help/shotwell/cs/organize-event.page
share/gnome/help/shotwell/cs/organize-flag.page
share/gnome/help/shotwell/cs/organize-rating.page
share/gnome/help/shotwell/cs/organize-remove.page
share/gnome/help/shotwell/cs/organize-search.page
share/gnome/help/shotwell/cs/organize-tag.page
share/gnome/help/shotwell/cs/organize-title.page
share/gnome/help/shotwell/cs/other-files.page
share/gnome/help/shotwell/cs/other-missing.page
share/gnome/help/shotwell/cs/other-multiple.page
share/gnome/help/shotwell/cs/other-plugins.page
share/gnome/help/shotwell/cs/raw.page
share/gnome/help/shotwell/cs/running.page
share/gnome/help/shotwell/cs/share-background.page
share/gnome/help/shotwell/cs/share-export.page
share/gnome/help/shotwell/cs/share-print.page
share/gnome/help/shotwell/cs/share-send.page
share/gnome/help/shotwell/cs/share-slideshow.page
share/gnome/help/shotwell/cs/share-upload.page
share/gnome/help/shotwell/cs/view-displaying.page
share/gnome/help/shotwell/cs/view-information.page
share/gnome/help/shotwell/cs/view-sidebar.page
share/gnome/help/shotwell/de/edit-adjustments.page
share/gnome/help/shotwell/de/edit-crop.page
share/gnome/help/shotwell/de/edit-enhance.page
share/gnome/help/shotwell/de/edit-external.page
share/gnome/help/shotwell/de/edit-nondestructive.page
share/gnome/help/shotwell/de/edit-redeye.page
share/gnome/help/shotwell/de/edit-rotate.page
share/gnome/help/shotwell/de/edit-straighten.page
share/gnome/help/shotwell/de/edit-time-date.page
share/gnome/help/shotwell/de/edit-undo.page
share/gnome/help/shotwell/de/formats.page
share/gnome/help/shotwell/de/import-camera.page
share/gnome/help/shotwell/de/import-f-spot.page
share/gnome/help/shotwell/de/import-file.page
share/gnome/help/shotwell/de/import-memorycard.page
share/gnome/help/shotwell/de/index.page
share/gnome/help/shotwell/de/organize-event.page
share/gnome/help/shotwell/de/organize-flag.page
share/gnome/help/shotwell/de/organize-rating.page
share/gnome/help/shotwell/de/organize-remove.page
share/gnome/help/shotwell/de/organize-search.page
share/gnome/help/shotwell/de/organize-tag.page
share/gnome/help/shotwell/de/organize-title.page
share/gnome/help/shotwell/de/other-files.page
share/gnome/help/shotwell/de/other-missing.page
share/gnome/help/shotwell/de/other-multiple.page
share/gnome/help/shotwell/de/other-plugins.page
share/gnome/help/shotwell/de/raw.page
share/gnome/help/shotwell/de/running.page
share/gnome/help/shotwell/de/share-background.page
share/gnome/help/shotwell/de/share-export.page
share/gnome/help/shotwell/de/share-print.page
share/gnome/help/shotwell/de/share-send.page
share/gnome/help/shotwell/de/share-slideshow.page
share/gnome/help/shotwell/de/share-upload.page
share/gnome/help/shotwell/de/view-displaying.page
share/gnome/help/shotwell/de/view-information.page
share/gnome/help/shotwell/de/view-sidebar.page
share/gnome/help/shotwell/el/edit-adjustments.page
share/gnome/help/shotwell/el/edit-crop.page
share/gnome/help/shotwell/el/edit-enhance.page

share/locale/bg/LC_MESSAGES/shotwell.mo
share/locale/bn/LC_MESSAGES/shotwell.mo
share/locale/bn_IN/LC_MESSAGES/shotwell.mo
share/locale/bs/LC_MESSAGES/shotwell.mo
share/locale/ca/LC_MESSAGES/shotwell.mo
share/locale/cs/LC_MESSAGES/shotwell.mo
share/locale/da/LC_MESSAGES/shotwell.mo

%%DATADIR%%/icons/crop-pivot-reticle.png
%%DATADIR%%/icons/crop.svg
%%DATADIR%%/icons/drag_nub.png
%%DATADIR%%/icons/enhance.png
%%DATADIR%%/icons/filter-flagged.png
%%DATADIR%%/icons/filter-photos.png
%%DATADIR%%/icons/filter-raw.png

%%DATADIR%%/icons/rejected.svg
%%DATADIR%%/icons/shotwell-16.svg
%%DATADIR%%/icons/shotwell-24.svg
%%DATADIR%%/icons/shotwell-auto-enhance.png
%%DATADIR%%/icons/shotwell-street.jpg
%%DATADIR%%/icons/shotwell.ico
%%DATADIR%%/icons/shotwell.svg

Return to bug 198986

Lines 2-9 Link Here

(-)Makefile (-9 / +5 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= shotwell	4	PORTNAME= shotwell
5	PORTVERSION= 0.20.2	5	PORTVERSION= 0.22.0
6	PORTREVISION= 2
7	CATEGORIES= graphics gnome	6	CATEGORIES= graphics gnome
8	MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}	7	MASTER_SITES= GNOME/sources/shotwell/${PORTVERSION:R}
9		8
Lines 13-19 Link Here
13	LICENSE= LGPL21	12	LICENSE= LGPL21
14	LICENSE_FILE= ${WRKSRC}/COPYING	13	LICENSE_FILE= ${WRKSRC}/COPYING
15		14
16	BUILD_DEPENDS= vala>=0.18.0:${PORTSDIR}/lang/vala \	15	BUILD_DEPENDS= vala>=0.20.1:${PORTSDIR}/lang/vala \
17	bash:${PORTSDIR}/shells/bash	16	bash:${PORTSDIR}/shells/bash
18	LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \	17	LIB_DEPENDS= libdbus-glib-1.so:${PORTSDIR}/devel/dbus-glib \
19	libgee-0.8.so:${PORTSDIR}/devel/libgee \	18	libgee-0.8.so:${PORTSDIR}/devel/libgee \
Lines 35-52 Link Here
35	CONFIGURE_ARGS= --prefix=${PREFIX} --disable-icon-update	34	CONFIGURE_ARGS= --prefix=${PREFIX} --disable-icon-update
36	CONFIGURE_ENV+= --define=NO_CAMERA	35	CONFIGURE_ENV+= --define=NO_CAMERA
37	INSTALLS_ICONS= yes	36	INSTALLS_ICONS= yes
		37	PORTSCOUT= limitw:1,even
38		38
39	OPTIONS_DEFINE= OPENMP	39	OPTIONS_DEFINE= OPENMP
40	OPTIONS_DEFAULT=	40	OPTIONS_DEFAULT=
41	OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+)	41	OPENMP_DESC= libraw uses OpenMP (implies GCC 4.6+)
42		42
43	.include <bsd.port.options.mk>	43	OPENMP_USES= compiler:gcc-c++11-lib
		44	OPENMP_USES_OFF= compiler:c++11-lib
44		45
45	.if ${PORT_OPTIONS:MOPENMP}
46	USE_GCC= yes
47	LDFLAGS+= -lc++
48	.endif
49
50	SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver	46	SHEBANG_FILES= ${WRKSRC}/${CONFIGURE_SCRIPT} ${WRKSRC}/chkver
51		47
52	GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml	48	GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml

Lines 1-6 Link Here

(-)files/patch-Makefile (-6 / +15 lines)
1	--- Makefile.orig 2014-09-28 18:41:10.000000000 +0200	1	--- Makefile.orig 2015-03-28 15:11:25.000000000 +0100
2	+++ Makefile 2014-09-28 18:43:30.000000000 +0200	2	+++ Makefile 2015-03-28 15:14:57.000000000 +0100
3	@@ -261,7 +261,6 @@	3	@@ -13,7 +13,7 @@
		4	VALAC := $(shell which $(VALAC))
		5	endif
		6
		7	-VALAC_VERSION := `$(VALAC) --version \| awk '{print $$2}'`
		8	+VALAC_VERSION := `$(VALAC) --version \| cut -d' ' -f2`
		9	MIN_VALAC_VERSION := 0.20.1
		10	INSTALL_PROGRAM := install
		11	INSTALL_DATA := install -m 644
		12	@@ -263,7 +263,6 @@
4	gstreamer-base-1.0 \	13	gstreamer-base-1.0 \
5	gstreamer-pbutils-1.0 \	14	gstreamer-pbutils-1.0 \
6	gtk+-3.0 \	15	gtk+-3.0 \
Lines 8-22 Link Here
8	libexif \	17	libexif \
9	libgphoto2 \	18	libgphoto2 \
10	json-glib-1.0 \	19	json-glib-1.0 \
11	@@ -293,7 +292,6 @@	20	@@ -295,7 +294,6 @@
12	gstreamer-plugins-base-1.0 >= 1.0.0 \	21	gstreamer-plugins-base-1.0 >= 1.0.0 \
13	gstreamer-pbutils-1.0 >= 1.0.0 \	22	gstreamer-pbutils-1.0 >= 1.0.0 \
14	gtk+-3.0 >= 3.6.0 \	23	gtk+-3.0 >= 3.12.2 \
15	- gudev-1.0 >= 145 \	24	- gudev-1.0 >= 145 \
16	libexif >= 0.6.16 \	25	libexif >= 0.6.16 \
17	libgphoto2 >= 2.4.2 \	26	libgphoto2 >= 2.4.2 \
18	libraw >= 0.13.2 \	27	libraw >= 0.13.2 \
19	@@ -543,8 +541,8 @@	28	@@ -544,8 +542,8 @@
20	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas	29	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
21	endif	30	endif
22	ifndef DISABLE_GSETTINGS_CONVERT_INSTALL	31	ifndef DISABLE_GSETTINGS_CONVERT_INSTALL

Lines 77-82 Link Here

(-)pkg-plist (-1 / +78 lines)
77	share/gnome/help/shotwell/C/view-displaying.page	77	share/gnome/help/shotwell/C/view-displaying.page
78	share/gnome/help/shotwell/C/view-information.page	78	share/gnome/help/shotwell/C/view-information.page
79	share/gnome/help/shotwell/C/view-sidebar.page	79	share/gnome/help/shotwell/C/view-sidebar.page
		80	share/gnome/help/shotwell/cs/edit-adjustments.page
		81	share/gnome/help/shotwell/cs/edit-crop.page
		82	share/gnome/help/shotwell/cs/edit-enhance.page
		83	share/gnome/help/shotwell/cs/edit-external.page
		84	share/gnome/help/shotwell/cs/edit-nondestructive.page
		85	share/gnome/help/shotwell/cs/edit-redeye.page
		86	share/gnome/help/shotwell/cs/edit-rotate.page
		87	share/gnome/help/shotwell/cs/edit-straighten.page
		88	share/gnome/help/shotwell/cs/edit-time-date.page
		89	share/gnome/help/shotwell/cs/edit-undo.page
		90	share/gnome/help/shotwell/cs/formats.page
		91	share/gnome/help/shotwell/cs/import-camera.page
		92	share/gnome/help/shotwell/cs/import-f-spot.page
		93	share/gnome/help/shotwell/cs/import-file.page
		94	share/gnome/help/shotwell/cs/import-memorycard.page
		95	share/gnome/help/shotwell/cs/index.page
		96	share/gnome/help/shotwell/cs/organize-event.page
		97	share/gnome/help/shotwell/cs/organize-flag.page
		98	share/gnome/help/shotwell/cs/organize-rating.page
		99	share/gnome/help/shotwell/cs/organize-remove.page
		100	share/gnome/help/shotwell/cs/organize-search.page
		101	share/gnome/help/shotwell/cs/organize-tag.page
		102	share/gnome/help/shotwell/cs/organize-title.page
		103	share/gnome/help/shotwell/cs/other-files.page
		104	share/gnome/help/shotwell/cs/other-missing.page
		105	share/gnome/help/shotwell/cs/other-multiple.page
		106	share/gnome/help/shotwell/cs/other-plugins.page
		107	share/gnome/help/shotwell/cs/raw.page
		108	share/gnome/help/shotwell/cs/running.page
		109	share/gnome/help/shotwell/cs/share-background.page
		110	share/gnome/help/shotwell/cs/share-export.page
		111	share/gnome/help/shotwell/cs/share-print.page
		112	share/gnome/help/shotwell/cs/share-send.page
		113	share/gnome/help/shotwell/cs/share-slideshow.page
		114	share/gnome/help/shotwell/cs/share-upload.page
		115	share/gnome/help/shotwell/cs/view-displaying.page
		116	share/gnome/help/shotwell/cs/view-information.page
		117	share/gnome/help/shotwell/cs/view-sidebar.page
		118	share/gnome/help/shotwell/de/edit-adjustments.page
		119	share/gnome/help/shotwell/de/edit-crop.page
		120	share/gnome/help/shotwell/de/edit-enhance.page
		121	share/gnome/help/shotwell/de/edit-external.page
		122	share/gnome/help/shotwell/de/edit-nondestructive.page
		123	share/gnome/help/shotwell/de/edit-redeye.page
		124	share/gnome/help/shotwell/de/edit-rotate.page
		125	share/gnome/help/shotwell/de/edit-straighten.page
		126	share/gnome/help/shotwell/de/edit-time-date.page
		127	share/gnome/help/shotwell/de/edit-undo.page
		128	share/gnome/help/shotwell/de/formats.page
		129	share/gnome/help/shotwell/de/import-camera.page
		130	share/gnome/help/shotwell/de/import-f-spot.page
		131	share/gnome/help/shotwell/de/import-file.page
		132	share/gnome/help/shotwell/de/import-memorycard.page
		133	share/gnome/help/shotwell/de/index.page
		134	share/gnome/help/shotwell/de/organize-event.page
		135	share/gnome/help/shotwell/de/organize-flag.page
		136	share/gnome/help/shotwell/de/organize-rating.page
		137	share/gnome/help/shotwell/de/organize-remove.page
		138	share/gnome/help/shotwell/de/organize-search.page
		139	share/gnome/help/shotwell/de/organize-tag.page
		140	share/gnome/help/shotwell/de/organize-title.page
		141	share/gnome/help/shotwell/de/other-files.page
		142	share/gnome/help/shotwell/de/other-missing.page
		143	share/gnome/help/shotwell/de/other-multiple.page
144	share/gnome/help/shotwell/de/other-plugins.page
145	share/gnome/help/shotwell/de/raw.page
146	share/gnome/help/shotwell/de/running.page
147	share/gnome/help/shotwell/de/share-background.page
148	share/gnome/help/shotwell/de/share-export.page
149	share/gnome/help/shotwell/de/share-print.page
150	share/gnome/help/shotwell/de/share-send.page
151	share/gnome/help/shotwell/de/share-slideshow.page
152	share/gnome/help/shotwell/de/share-upload.page
153	share/gnome/help/shotwell/de/view-displaying.page
154	share/gnome/help/shotwell/de/view-information.page
155	share/gnome/help/shotwell/de/view-sidebar.page
80	share/gnome/help/shotwell/el/edit-adjustments.page	156	share/gnome/help/shotwell/el/edit-adjustments.page
81	share/gnome/help/shotwell/el/edit-crop.page	157	share/gnome/help/shotwell/el/edit-crop.page
82	share/gnome/help/shotwell/el/edit-enhance.page	158	share/gnome/help/shotwell/el/edit-enhance.page
Lines 201-206 Link Here
201	share/locale/bg/LC_MESSAGES/shotwell.mo	277	share/locale/bg/LC_MESSAGES/shotwell.mo
202	share/locale/bn/LC_MESSAGES/shotwell.mo	278	share/locale/bn/LC_MESSAGES/shotwell.mo
203	share/locale/bn_IN/LC_MESSAGES/shotwell.mo	279	share/locale/bn_IN/LC_MESSAGES/shotwell.mo
		280	share/locale/bs/LC_MESSAGES/shotwell.mo
204	share/locale/ca/LC_MESSAGES/shotwell.mo	281	share/locale/ca/LC_MESSAGES/shotwell.mo
205	share/locale/cs/LC_MESSAGES/shotwell.mo	282	share/locale/cs/LC_MESSAGES/shotwell.mo
206	share/locale/da/LC_MESSAGES/shotwell.mo	283	share/locale/da/LC_MESSAGES/shotwell.mo
Lines 262-268 Link Here
262	%%DATADIR%%/icons/crop-pivot-reticle.png	339	%%DATADIR%%/icons/crop-pivot-reticle.png
263	%%DATADIR%%/icons/crop.svg	340	%%DATADIR%%/icons/crop.svg
264	%%DATADIR%%/icons/drag_nub.png	341	%%DATADIR%%/icons/drag_nub.png
265	%%DATADIR%%/icons/enhance.png
266	%%DATADIR%%/icons/filter-flagged.png	342	%%DATADIR%%/icons/filter-flagged.png
267	%%DATADIR%%/icons/filter-photos.png	343	%%DATADIR%%/icons/filter-photos.png
268	%%DATADIR%%/icons/filter-raw.png	344	%%DATADIR%%/icons/filter-raw.png
Lines 293-298 Link Here
293	%%DATADIR%%/icons/rejected.svg	369	%%DATADIR%%/icons/rejected.svg
294	%%DATADIR%%/icons/shotwell-16.svg	370	%%DATADIR%%/icons/shotwell-16.svg
295	%%DATADIR%%/icons/shotwell-24.svg	371	%%DATADIR%%/icons/shotwell-24.svg
		372	%%DATADIR%%/icons/shotwell-auto-enhance.png
296	%%DATADIR%%/icons/shotwell-street.jpg	373	%%DATADIR%%/icons/shotwell-street.jpg
297	%%DATADIR%%/icons/shotwell.ico	374	%%DATADIR%%/icons/shotwell.ico
298	%%DATADIR%%/icons/shotwell.svg	375	%%DATADIR%%/icons/shotwell.svg