Merge lp:~elementary-dev-community/pantheon-photos/fix-1272472 into lp:~pantheon-photos/pantheon-photos/trunk

[Tristan Petersen]

Unmerged revisions

2506. By Tristan Petersen on 2014-01-31

Renamed a whole bunch of files and modified some

2505. By Tristan Petersen on 2014-01-28

Makefile changes

=== modified file 'Makefile'
--- Makefile	2014-02-04 22:37:33 +0000
+++ Makefile	2014-02-24 01:45:14 +0000
@@ -1,6 +1,6 @@
-PROGRAM = shotwell
-PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
-PROGRAM_MIGRATOR = shotwell-settings-migrator
+PROGRAM = pantheon-photos
+PROGRAM_THUMBNAILER = pantheon-photos-video-thumbnailer
+PROGRAM_MIGRATOR = pantheon-photos-settings-migrator
 
 VERSION = 0.15.1+trunk
 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
@@ -27,7 +27,7 @@
 
 -include configure.mk
 ifndef LIBEXECDIR
-LIBEXECDIR=$(PREFIX)/libexec/shotwell
+LIBEXECDIR=$(PREFIX)/libexec/pantheon-photos
 endif
 
 CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
@@ -112,7 +112,7 @@
 	Upgrades.vala 
 
 THUMBNAILER_SRC_FILES = \
-	shotwell-video-thumbnailer.vala
+	pantheon-photos-video-thumbnailer.vala
 
 VAPI_FILES = \
 	ExtendedPosix.vapi \
@@ -152,8 +152,8 @@
 	search_bar.ui \
 	search_sidebar_context.ui \
 	set_background_dialog.glade \
-	shotwell.glade \
-	shotwell.xml \
+	pantheon-photos.glade \
+	pantheon-photos.xml \
 	sidebar_default_context.ui \
 	tag_sidebar_context.ui \
 	tags.ui \
@@ -161,12 +161,12 @@
 	trash.ui 
 
 SYS_INTEGRATION_FILES = \
-	shotwell.appdata.xml \
-	shotwell.desktop.head \
-	shotwell-viewer.desktop.head \
-	org.yorba.shotwell.gschema.xml \
-	org.yorba.shotwell-extras.gschema.xml \
-	shotwell.convert
+	pantheon-photos.appdata.xml \
+	pantheon-photos.desktop.head \
+	pantheon-photos-viewer.desktop.head \
+	org.elementaryos.pantheon-photos.gschema.xml \
+	org.elementaryos.pantheon-photos-extras.gschema.xml \
+	pantheon-photos.convert
 
 SCHEMA_FILES := $(shell ls misc/*.gschema.xml)
 
@@ -211,11 +211,11 @@
 	publish.png \
 	redeye.png \
 	rejected.svg \
-	shotwell-16.svg \
-	shotwell-24.svg \
-	shotwell.ico \
-	shotwell-street.jpg \
-	shotwell.svg \
+	pantheon-photos-16.svg \
+	pantheon-photos-24.svg \
+	pantheon-photos.ico \
+	pantheon-photos-street.jpg \
+	pantheon-photos.svg \
 	sprocket.png \
 	straighten.svg \
 	three-star-filter-plus.svg \
@@ -276,7 +276,7 @@
 	crop_thirds.jpg \
 	editing_overview.png \
 	edit_toolbar.png \
-	shotwell_logo.png \
+	pantheon-photos_logo.png \
 	trash_process.png
 
 VAPI_DIRS = \
@@ -361,15 +361,15 @@
 BUILD_DIR=src
 endif
 
-DESKTOP_APP_SHORT_NAME="Shotwell"
-DESKTOP_APP_FULL_NAME="Shotwell Photo Manager"
+DESKTOP_APP_SHORT_NAME="Photos"
+DESKTOP_APP_FULL_NAME="Pantheon Photo Manager"
 DESKTOP_APPLICATION_COMMENT="Organize your photos"
 DESKTOP_APPLICATION_CLASS="Photo Manager"
 DESKTOP_APP_KEYWORDS="album;camera;cameras;crop;edit;enhance;export;gallery;image;images;import;organize;photo;photographs;photos;picture;pictures;photography;print;publish;rotate;share;tags;video;facebook;flickr;picasa;youtube;piwigo;"
-DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell"
-DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer"
+DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Photos"
+DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Pantheon Photo Viewer"
 DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
-TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop
+TEMPORARY_DESKTOP_FILES = misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
 
 # Process the units
 UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(notdir $(unit)).mk)
@@ -410,14 +410,14 @@
 VALA_STAMP := $(BUILD_DIR)/.stamp
 LANG_STAMP := $(LOCAL_LANG_DIR)/.langstamp
 MAKE_FILES := Makefile $(CONFIG_IN) $(UNIT_MKS) unitize.mk units.mk
-PC_INPUT := shotwell-plugin-dev-1.0.m4
+PC_INPUT := pantheon-photos-plugin-dev-1.0.m4
 PC_FILE := $(PC_INPUT:.m4=.pc)
 
 DIST_FILES = Makefile configure chkver $(EXPANDED_DIST_SRC_FILES) $(EXPANDED_VAPI_FILES) \
 	$(EXPANDED_DEPS_FILES) $(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) \
 	$(EXPANDED_ICON_FILES) $(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_CORE_PO_FILES) \
 	po/LINGUAS po/POTFILES.in po/POTFILES.skip \
-	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
+	$(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/pantheon-photos.py $(UNIT_RESOURCES) $(UNIT_MKS) \
 	unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
 	vapi/gphoto-2.5/libgphoto2.vapi vapi/gphoto-2.4/libgphoto2.vapi \
 	$(EXPANDED_THUMBNAILER_SRC_FILES) $(MIGRATOR_BIN)
@@ -468,7 +468,7 @@
 
 $(LANG_STAMP): $(EXPANDED_CORE_PO_FILES)
 	@$(foreach po,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
-		msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/$(po).po`)
+		msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/pantheon-photos.mo po/$(po).po`)
 	@touch $(LANG_STAMP)
 
 clean:
@@ -505,45 +505,45 @@
 	cp $(DIST_TAR_XZ) $(PACKAGE_ORIG_XZ)
 	rm -f $(DIST_TAR_XZ)
 
-misc/shotwell.desktop: misc/shotwell.desktop.head $(EXPANDED_CORE_PO_FILES)
-	cp misc/shotwell.desktop.head misc/shotwell.desktop
+misc/pantheon-photos.desktop: misc/pantheon-photos.desktop.head $(EXPANDED_CORE_PO_FILES)
+	cp misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop
 	@ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
-		LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
-		>> misc/shotwell.desktop ; \
+		LANGUAGE=$(lang) gettext --domain=pantheon-photos $(DESKTOP_APP_FULL_NAME)` \
+		>> misc/pantheon-photos.desktop ; \
 		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
-		gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
+		gettext --domain=pantheon-photos $(DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos.desktop ; \
 		echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
+		--domain=pantheon-photos $(DESKTOP_APPLICATION_COMMENT)` >> misc/pantheon-photos.desktop ; \
 		echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/shotwell.desktop ;) 
+		--domain=pantheon-photos $(DESKTOP_APP_KEYWORDS)` >> misc/pantheon-photos.desktop ;) 
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/shotwell.desktop 1>misc/shotwell.desktop.errors 2>&1; \
-	if test -s misc/shotwell.desktop.errors; then \
-		echo -e "\nThe file misc/shotwell.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/shotwell.desktop.errors for details."; \
+	@ desktop-file-validate misc/pantheon-photos.desktop 1>misc/pantheon-photos.desktop.errors 2>&1; \
+	if test -s misc/pantheon-photos.desktop.errors; then \
+		echo -e "\nThe file misc/pantheon-photos.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/pantheon-photos.desktop.errors for details."; \
 		exit 1; \
-	else rm -f misc/shotwell.desktop.errors; \
+	else rm -f misc/pantheon-photos.desktop.errors; \
 	fi
 endif
 	
-misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
-	cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
+misc/pantheon-photos-viewer.desktop: misc/pantheon-photos-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
+	cp misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop
 	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
-		LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
+		LANGUAGE=$(lang) gettext --domain=pantheon-photos $(DESKTOP_APP_FULL_NAME)` \
 		echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
+		--domain=pantheon-photos $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/pantheon-photos-viewer.desktop ; \
 		echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
-		--domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
+		--domain=pantheon-photos $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos-viewer.desktop ;)
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ desktop-file-validate misc/shotwell-viewer.desktop 1>misc/shotwell-viewer.desktop.errors 2>&1; \
-	if test -s misc/shotwell-viewer.desktop.errors; then \
-		echo -e S"\nThe file misc/shotwell-viewer.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/shotwell-viewer.desktop.errors for details."; \
+	@ desktop-file-validate misc/pantheon-photos-viewer.desktop 1>misc/pantheon-photos-viewer.desktop.errors 2>&1; \
+	if test -s misc/pantheon-photos-viewer.desktop.errors; then \
+		echo -e S"\nThe file misc/pantheon-photos-viewer.desktop.head or one of the .po files contains errors and may need to be edited.\nPlease see the file misc/pantheon-photos-viewer.desktop.errors for details."; \
 		exit 1; \
-	else rm -f misc/shotwell-viewer.desktop.errors; \
+	else rm -f misc/pantheon-photos-viewer.desktop.errors; \
 	fi
 endif
 
 .PHONY: desktop
-desktop: misc/shotwell.desktop misc/shotwell-viewer.desktop
+desktop: misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
 
 .PHONY: dist
 dist:
@@ -565,64 +565,64 @@
 	mkdir -p $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(LIBEXECDIR)
 	$(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
-	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
-	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
+	$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
-	$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
+	$(INSTALL_DATA) icons/pantheon-photos.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
-	$(INSTALL_DATA) icons/shotwell-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
+	$(INSTALL_DATA) icons/pantheon-photos-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
 	mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
-	$(INSTALL_DATA) icons/shotwell-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
+	$(INSTALL_DATA) icons/pantheon-photos-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
 	mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
-	$(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+	$(INSTALL_DATA) misc/org.elementaryos.pantheon-photos.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
+	$(INSTALL_DATA) misc/org.elementaryos.pantheon-photos-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 ifndef DISABLE_SCHEMAS_COMPILE
 	glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
 endif
 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
 	mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
-	$(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
+	$(INSTALL_DATA) misc/pantheon-photos.convert $(DESTDIR)/usr/share/GConf/gsettings
 endif
 ifndef DISABLE_ICON_UPDATE
 	-gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
 endif
-	mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
-	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
+	mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
+	$(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
 	mkdir -p $(DESTDIR)$(PREFIX)/share/applications
 	mkdir -p $(DESTDIR)$(PREFIX)/share/appdata
-	$(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
-	$(INSTALL_DATA) misc/shotwell.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
+	$(INSTALL_DATA) misc/pantheon-photos.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/pantheon-photos-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
+	$(INSTALL_DATA) misc/pantheon-photos.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
 ifndef DISABLE_DESKTOP_UPDATE
 	-update-desktop-database || :
 endif
 ifdef ENABLE_APPORT_HOOK_INSTALL
 	mkdir -p $(DESTDIR)$(PREFIX)/share/apport/package-hooks
-	$(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
+	$(INSTALL_DATA) apport/pantheon-photos.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
 endif
 ifndef DISABLE_HELP_INSTALL
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
-	$(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
-	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
-	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
+	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
+	$(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
+	mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
+	$(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
 endif
 	-$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
-		$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
-		$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
-	mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
-	$(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+		$(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo \
+		$(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
+	mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
+	$(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef PLUGINS_RC
-	$(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 endif
 ifndef DISABLE_EXTRA_PLUGINS_INSTALL
-	$(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef EXTRA_PLUGINS_RC
-	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 endif
 endif
 ifdef INSTALL_HEADERS
-	mkdir -p $(DESTDIR)$(PREFIX)/include/shotwell/plugins
-	$(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/shotwell/plugins
+	mkdir -p $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
+	$(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
 	mkdir -p $(DESTDIR)$(PREFIX)/share/vala/vapi
 	$(INSTALL_DATA) $(PLUGIN_VAPI) $(DESTDIR)$(PREFIX)/share/vala/vapi
 	$(INSTALL_DATA) $(PLUGIN_DEPS) $(DESTDIR)$(PREFIX)/share/vala/vapi
@@ -637,37 +637,37 @@
 	rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_MIGRATOR)
 	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
 	rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
-	rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
-	rm -f $(DESTDIR)$(PREFIX)/share/appdata/shotwell.appdata.xml
+	rm -fr $(DESTDIR)$(PREFIX)/share/pantheon-photos
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/pantheon-photos.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos-viewer.desktop
+	rm -f $(DESTDIR)$(PREFIX)/share/appdata/pantheon-photos.appdata.xml
 ifndef DISABLE_DESKTOP_UPDATE
 	-update-desktop-database || :
 endif
 ifndef DISABLE_HELP_INSTALL
-	rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell
+	rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos
 endif
 ifdef ENABLE_APPORT_HOOK_INSTALL
-	rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py
+	rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/pantheon-photos.py
 endif
-	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
-	rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
+	$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
+	rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
 ifdef INSTALL_HEADERS
-	rm -rf $(DESTDIR)$(PREFIX)/include/shotwell
+	rm -rf $(DESTDIR)$(PREFIX)/include/pantheon-photos
 	rm -f $(foreach vapi,$(PLUGIN_VAPI),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(vapi)))
 	rm -f $(foreach dep,$(PLUGIN_DEPS),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(dep)))
 	rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PC_FILE)
 endif
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
-	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
+	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.elementaryos.pantheon-photos.gschema.xml
+	rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.elementaryos.pantheon-photos-extras.gschema.xml
 ifndef DISABLE_SCHEMAS_COMPILE
 	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)/usr/share/GConf/gsettings/pantheon-photos.convert
 endif
 
 $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
@@ -729,7 +729,7 @@
 docs:
 # valadoc complains if the directory already exists
 	@rm -rf docs
-	valadoc --directory=docs --package-name=shotwell-plugin-dev --package-version=$(VERSION) --verbose \
+	valadoc --directory=docs --package-name=pantheon-photos-plugin-dev --package-version=$(VERSION) --verbose \
 		--no-protected \
 		$(foreach def,$(DEFINES),--define=$(def)) \
 		$(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
@@ -747,10 +747,10 @@
 
 .PHONY: valacheck
 valacheck:
-	@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Shotwell requires Vala compiler $(MIN_VALAC_VERSION) or greater.  No valac found in path or $$VALAC.'; exit 1 )
-	@ ./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 )
+	@ $(VALAC) --version >/dev/null 2>/dev/null || ( echo 'Photos requires Vala compiler $(MIN_VALAC_VERSION) or greater.  No valac found in path or $$VALAC.'; exit 1 )
+	@ ./chkver min $(VALAC_VERSION) $(MIN_VALAC_VERSION) || ( echo 'Photos 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 ),)
+		@ ./chkver max $(VALAC_VERSION) $(MAX_VALAC_VERSION) || ( echo 'Photos cannot be built by Vala compiler $(MAX_VALAC_VERSION) or greater.  You are running' $(VALAC_VERSION) '\b.'; exit 1 ),)
 
 
 
@@ -762,7 +762,7 @@
 	@pkg-config --print-errors --exists $(EXT_PKGS) $(DIRECT_LIBS_VERSIONS)
 endif
 endif
-	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
+	@ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Photos. ' ; exit 1 )
 ifndef DISABLE_DESKTOP_VALIDATE
-	@ type desktop-file-validate > /dev/null || ( echo 'desktop-file-validate (usually found in the desktop-file-utils package) is missing and is required to build Shotwell. ' ; exit 1 )
+	@ type desktop-file-validate > /dev/null || ( echo 'desktop-file-validate (usually found in the desktop-file-utils package) is missing and is required to build Photos. ' ; exit 1 )
 endif
 
=== renamed file 'apport/shotwell.py' => 'apport/pantheon-photos.py'
=== renamed file 'misc/org.yorba.shotwell-extras.gschema.xml' => 'misc/org.elementaryos.pantheon-photos-extras.gschema.xml'
=== renamed file 'misc/org.yorba.shotwell.gschema.xml' => 'misc/org.elementaryos.pantheon-photos.gschema.xml'
=== renamed file 'misc/shotwell-viewer.desktop.head' => 'misc/pantheon-photos-viewer.desktop.head'
=== renamed file 'misc/shotwell.appdata.xml' => 'misc/pantheon-photos.appdata.xml'
=== renamed file 'misc/shotwell.convert' => 'misc/pantheon-photos.convert'
=== renamed file 'misc/shotwell.desktop.head' => 'misc/pantheon-photos.desktop.head'
=== renamed file 'shotwell-plugin-dev-1.0.m4' => 'pantheon-photos-plugin-dev-1.0.m4'
=== renamed file 'shotwell.doap' => 'pantheon-photos.doap'
--- shotwell.doap	2013-11-19 00:01:30 +0000
+++ pantheon-photos.doap	2014-02-24 01:45:14 +0000
@@ -5,11 +5,11 @@
          xmlns:gnome="http://api.gnome.org/doap-extensions#"
          xmlns="http://usefulinc.com/ns/doap#">
 
-  <name xml:lang="en">shotwell</name>
+  <name xml:lang="en">pantheon-photos</name>
   <shortdesc xml:lang="en">Digital photo organizer</shortdesc>
-  <homepage rdf:resource="http://www.yorba.org/projects/shotwell/" />
-  <mailing-list rdf:resource="https://mail.gnome.org/mailman/listinfo/shotwell-list" />
-  <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=shotwell" />
+  <homepage rdf:resource="https://launchpad.net/pantheon-photos" />
+  <mailing-list rdf:resource="https://launchpad.net/pantheon-photos/+subscribe" />
+  <bug-database rdf:resource="https://bugs.launchpad.net/pantheon-photos" />
   <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
 
   <maintainer>
 
=== modified file 'plugins/Makefile.plugin.mk'
--- plugins/Makefile.plugin.mk	2013-09-24 22:08:27 +0000
+++ plugins/Makefile.plugin.mk	2014-02-24 01:45:14 +0000
@@ -1,7 +1,7 @@
 
-# Generic plug-in Makefile for Shotwell standard plugins.
+# Generic plug-in Makefile for Photos standard plugins.
 #
-# Requires PLUGIN and SRC_FILES be set to the name of the plugin binary (minus extension) and that 
+# Requires PLUGIN and SRC_FILES be set to the name of the plugin binary (minus extension) and that
 # the directory is registered in plugins.mk.
 #
 # To use, include this file in each plug-in directory's Makefile after setting appropriate variables.
@@ -14,19 +14,19 @@
 VALAC := valac
 endif
 MAKE_FILES := Makefile ../Makefile.plugin.mk ../plugins.mk
-HEADER_FILES := ../shotwell-plugin-dev-1.0.vapi ../shotwell-plugin-dev-1.0.h \
-	../shotwell-plugin-dev-1.0.deps
+HEADER_FILES := ../pantheon-photos-plugin-dev-1.0.vapi ../pantheon-photos-plugin-dev-1.0.h \
+	../pantheon-photos-plugin-dev-1.0.deps
 
 include ../plugins.mk
 
-# automatically include shotwell-plugin-dev-1.0's dependencies
+# automatically include pantheon-photos-plugin-dev-1.0's dependencies
 # NOTE: This line will generate an error when running "make dist" from the master Makefile.
 # It can be safely ignored.
-PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../shotwell-plugin-dev-1.0.deps) $(PKGS)
+PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../pantheon-photos-plugin-dev-1.0.deps) $(PKGS)
 
-# automatically include the shotwell-plugin-dev-1.0 package as a local dependency
+# automatically include the pantheon-photos-plugin-dev-1.0 package as a local dependency
 EXT_PKGS := $(PKGS)
-PKGS := shotwell-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
+PKGS := pantheon-photos-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
 
 # automatically include the Resources.vala common file
 SRC_FILES := ../common/Resources.vala $(SRC_FILES)
@@ -36,7 +36,7 @@
 
 CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
 LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
-DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
+DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"pantheon-photos"'
 
 all: $(PLUGIN).so
 
 
=== renamed directory 'plugins/shotwell-data-imports' => 'plugins/pantheon-photos-data-imports'
=== renamed file 'plugins/shotwell-data-imports/shotwell-data-imports.vala' => 'plugins/pantheon-photos-data-imports/pantheon-photos-data-imports.vala'
=== renamed directory 'plugins/shotwell-publishing' => 'plugins/pantheon-photos-publishing'
=== renamed directory 'plugins/shotwell-publishing-extras' => 'plugins/pantheon-photos-publishing-extras'
=== renamed file 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala' => 'plugins/pantheon-photos-publishing-extras/pantheon-photos-publishing-extras.vala'
=== renamed file 'plugins/shotwell-publishing/shotwell-publishing.vala' => 'plugins/pantheon-photos-publishing/pantheon-photos-publishing.vala'
=== renamed directory 'plugins/shotwell-transitions' => 'plugins/pantheon-photos-transitions'
=== renamed file 'plugins/shotwell-transitions/shotwell-transitions.vala' => 'plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala'
=== modified file 'plugins/plugins.mk'
--- plugins/plugins.mk	2013-11-14 22:27:35 +0000
+++ plugins/plugins.mk	2014-02-24 01:45:14 +0000
@@ -1,33 +1,33 @@
 
 PLUGINS := \
-	shotwell-transitions \
-	shotwell-publishing \
-	shotwell-data-imports
+	pantheon-photos-transitions \
+	pantheon-photos-publishing \
+	pantheon-photos-data-imports
 
 PLUGINS_RC := \
-	plugins/shotwell-publishing/facebook.png \
-	plugins/shotwell-publishing/facebook_publishing_options_pane.glade \
-	plugins/shotwell-publishing/flickr.png \
-	plugins/shotwell-publishing/flickr_publishing_options_pane.glade \
-	plugins/shotwell-publishing/flickr_pin_entry_pane.glade \
-	plugins/shotwell-publishing/picasa.png \
-	plugins/shotwell-publishing/picasa_publishing_options_pane.glade \
-	plugins/shotwell-publishing/youtube.png \
-	plugins/shotwell-publishing/youtube_publishing_options_pane.glade \
-	plugins/shotwell-publishing/piwigo.png \
-	plugins/shotwell-publishing/piwigo_authentication_pane.glade \
-	plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \
-	plugins/shotwell-transitions/slideshow-plugin.png
+	plugins/pantheon-photos-publishing/facebook.png \
+	plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/flickr.png \
+	plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/flickr_pin_entry_pane.glade \
+	plugins/pantheon-photos-publishing/picasa.png \
+	plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/youtube.png \
+	plugins/pantheon-photos-publishing/youtube_publishing_options_pane.glade \
+	plugins/pantheon-photos-publishing/piwigo.png \
+	plugins/pantheon-photos-publishing/piwigo_authentication_pane.glade \
+	plugins/pantheon-photos-publishing/piwigo_publishing_options_pane.glade \
+	plugins/pantheon-photos-transitions/slideshow-plugin.png
 
 EXTRA_PLUGINS := \
-	shotwell-publishing-extras
+	pantheon-photos-publishing-extras
 
 EXTRA_PLUGINS_RC := \
-	plugins/shotwell-publishing-extras/yandex_publish_model.glade \
-	plugins/shotwell-data-imports/f-spot-24.png \
-	plugins/shotwell-publishing-extras/tumblr.png \
-	plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \
-	plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
+	plugins/pantheon-photos-publishing-extras/yandex_publish_model.glade \
+	plugins/pantheon-photos-data-imports/f-spot-24.png \
+	plugins/pantheon-photos-publishing-extras/tumblr.png \
+	plugins/pantheon-photos-publishing-extras/tumblr_authentication_pane.glade \
+	plugins/pantheon-photos-publishing-extras/tumblr_publishing_options_pane.glade
 
 ALL_PLUGINS := $(PLUGINS) $(EXTRA_PLUGINS)
 
 
=== renamed file 'sw-glade' => 'pp-glade'
--- sw-glade	2011-02-18 04:00:18 +0000
+++ pp-glade	2014-02-24 01:45:14 +0000
@@ -2,7 +2,7 @@
 shared_lib="libshotwell.so"
 
 if [ -f $shared_lib ]; then
-    GLADE_CATALOG_PATH=ui/ GLADE_MODULE_PATH=. glade ui/shotwell.glade &
+    GLADE_CATALOG_PATH=ui/ GLADE_MODULE_PATH=. glade ui/pantheon-photos.glade &
 else
     echo "Run './configure --enable-build-for-glade' and then 'make' to generate shared library."
 fi
 
=== renamed file 'settings-migrator/shotwell-settings-migrator' => 'settings-migrator/pantheon-photos-settings-migrator'
=== renamed file 'src/libshotwell.deps' => 'src/libpantheon-photos.deps'
=== renamed file 'thumbnailer/shotwell-video-thumbnailer.vala' => 'thumbnailer/pantheon-photos-video-thumbnailer.vala'
=== renamed file 'ui/shotwell.glade' => 'ui/pantheon-photos.glade'
=== renamed file 'ui/shotwell.xml' => 'ui/pantheon-photos.xml'