Photos

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

  1. fix-1272472
  2. Merge into trunk
Proposed by Tristan Petersen
Status: Rejected
Rejected by: Cody Garver
Proposed branch: lp:~elementary-dev-community/pantheon-photos/fix-1272472
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 543 lines (+132/-132)
5 files modified
Makefile (+96/-96)
pantheon-photos.doap (+4/-4)
plugins/Makefile.plugin.mk (+9/-9)
plugins/plugins.mk (+22/-22)
pp-glade (+1/-1)
To merge this branch: bzr merge lp:~elementary-dev-community/pantheon-photos/fix-1272472
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+207854@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

2506. By Tristan Petersen

Renamed a whole bunch of files and modified some

2505. By Tristan Petersen

Makefile changes

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2014-02-04 22:37:33 +0000
3+++ Makefile 2014-02-24 01:45:14 +0000
4@@ -1,6 +1,6 @@
5-PROGRAM = shotwell
6-PROGRAM_THUMBNAILER = shotwell-video-thumbnailer
7-PROGRAM_MIGRATOR = shotwell-settings-migrator
8+PROGRAM = pantheon-photos
9+PROGRAM_THUMBNAILER = pantheon-photos-video-thumbnailer
10+PROGRAM_MIGRATOR = pantheon-photos-settings-migrator
11
12 VERSION = 0.15.1+trunk
13 GITVER := $(shell git log -n 1 2>/dev/null | head -n 1 | awk '{print $$2}')
14@@ -27,7 +27,7 @@
15
16 -include configure.mk
17 ifndef LIBEXECDIR
18-LIBEXECDIR=$(PREFIX)/libexec/shotwell
19+LIBEXECDIR=$(PREFIX)/libexec/pantheon-photos
20 endif
21
22 CORE_SUPPORTED_LANGUAGES=$(shell cat po/LINGUAS)
23@@ -112,7 +112,7 @@
24 Upgrades.vala
25
26 THUMBNAILER_SRC_FILES = \
27- shotwell-video-thumbnailer.vala
28+ pantheon-photos-video-thumbnailer.vala
29
30 VAPI_FILES = \
31 ExtendedPosix.vapi \
32@@ -152,8 +152,8 @@
33 search_bar.ui \
34 search_sidebar_context.ui \
35 set_background_dialog.glade \
36- shotwell.glade \
37- shotwell.xml \
38+ pantheon-photos.glade \
39+ pantheon-photos.xml \
40 sidebar_default_context.ui \
41 tag_sidebar_context.ui \
42 tags.ui \
43@@ -161,12 +161,12 @@
44 trash.ui
45
46 SYS_INTEGRATION_FILES = \
47- shotwell.appdata.xml \
48- shotwell.desktop.head \
49- shotwell-viewer.desktop.head \
50- org.yorba.shotwell.gschema.xml \
51- org.yorba.shotwell-extras.gschema.xml \
52- shotwell.convert
53+ pantheon-photos.appdata.xml \
54+ pantheon-photos.desktop.head \
55+ pantheon-photos-viewer.desktop.head \
56+ org.elementaryos.pantheon-photos.gschema.xml \
57+ org.elementaryos.pantheon-photos-extras.gschema.xml \
58+ pantheon-photos.convert
59
60 SCHEMA_FILES := $(shell ls misc/*.gschema.xml)
61
62@@ -211,11 +211,11 @@
63 publish.png \
64 redeye.png \
65 rejected.svg \
66- shotwell-16.svg \
67- shotwell-24.svg \
68- shotwell.ico \
69- shotwell-street.jpg \
70- shotwell.svg \
71+ pantheon-photos-16.svg \
72+ pantheon-photos-24.svg \
73+ pantheon-photos.ico \
74+ pantheon-photos-street.jpg \
75+ pantheon-photos.svg \
76 sprocket.png \
77 straighten.svg \
78 three-star-filter-plus.svg \
79@@ -276,7 +276,7 @@
80 crop_thirds.jpg \
81 editing_overview.png \
82 edit_toolbar.png \
83- shotwell_logo.png \
84+ pantheon-photos_logo.png \
85 trash_process.png
86
87 VAPI_DIRS = \
88@@ -361,15 +361,15 @@
89 BUILD_DIR=src
90 endif
91
92-DESKTOP_APP_SHORT_NAME="Shotwell"
93-DESKTOP_APP_FULL_NAME="Shotwell Photo Manager"
94+DESKTOP_APP_SHORT_NAME="Photos"
95+DESKTOP_APP_FULL_NAME="Pantheon Photo Manager"
96 DESKTOP_APPLICATION_COMMENT="Organize your photos"
97 DESKTOP_APPLICATION_CLASS="Photo Manager"
98 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;"
99-DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Shotwell"
100-DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Shotwell Photo Viewer"
101+DIRECT_EDIT_DESKTOP_APP_SHORT_NAME="Photos"
102+DIRECT_EDIT_DESKTOP_APP_FULL_NAME="Pantheon Photo Viewer"
103 DIRECT_EDIT_DESKTOP_APPLICATION_CLASS="Photo Viewer"
104-TEMPORARY_DESKTOP_FILES = misc/shotwell.desktop misc/shotwell-viewer.desktop
105+TEMPORARY_DESKTOP_FILES = misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
106
107 # Process the units
108 UNIT_MKS := $(foreach unit,$(UNITS),src/$(unit)/mk/$(notdir $(unit)).mk)
109@@ -410,14 +410,14 @@
110 VALA_STAMP := $(BUILD_DIR)/.stamp
111 LANG_STAMP := $(LOCAL_LANG_DIR)/.langstamp
112 MAKE_FILES := Makefile $(CONFIG_IN) $(UNIT_MKS) unitize.mk units.mk
113-PC_INPUT := shotwell-plugin-dev-1.0.m4
114+PC_INPUT := pantheon-photos-plugin-dev-1.0.m4
115 PC_FILE := $(PC_INPUT:.m4=.pc)
116
117 DIST_FILES = Makefile configure chkver $(EXPANDED_DIST_SRC_FILES) $(EXPANDED_VAPI_FILES) \
118 $(EXPANDED_DEPS_FILES) $(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) \
119 $(EXPANDED_ICON_FILES) $(EXPANDED_SYS_INTEGRATION_FILES) $(EXPANDED_CORE_PO_FILES) \
120 po/LINGUAS po/POTFILES.in po/POTFILES.skip \
121- $(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/shotwell.py $(UNIT_RESOURCES) $(UNIT_MKS) \
122+ $(EXPANDED_HELP_FILES) $(EXPANDED_HELP_IMAGES) apport/pantheon-photos.py $(UNIT_RESOURCES) $(UNIT_MKS) \
123 unitize.mk units.mk $(PC_INPUT) $(PLUGINS_DIST_FILES) \
124 vapi/gphoto-2.5/libgphoto2.vapi vapi/gphoto-2.4/libgphoto2.vapi \
125 $(EXPANDED_THUMBNAILER_SRC_FILES) $(MIGRATOR_BIN)
126@@ -468,7 +468,7 @@
127
128 $(LANG_STAMP): $(EXPANDED_CORE_PO_FILES)
129 @$(foreach po,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES ; \
130- msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/shotwell.mo po/$(po).po`)
131+ msgfmt -c -o $(LOCAL_LANG_DIR)/$(po)/LC_MESSAGES/pantheon-photos.mo po/$(po).po`)
132 @touch $(LANG_STAMP)
133
134 clean:
135@@ -505,45 +505,45 @@
136 cp $(DIST_TAR_XZ) $(PACKAGE_ORIG_XZ)
137 rm -f $(DIST_TAR_XZ)
138
139-misc/shotwell.desktop: misc/shotwell.desktop.head $(EXPANDED_CORE_PO_FILES)
140- cp misc/shotwell.desktop.head misc/shotwell.desktop
141+misc/pantheon-photos.desktop: misc/pantheon-photos.desktop.head $(EXPANDED_CORE_PO_FILES)
142+ cp misc/pantheon-photos.desktop.head misc/pantheon-photos.desktop
143 @ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
144- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
145- >> misc/shotwell.desktop ; \
146+ LANGUAGE=$(lang) gettext --domain=pantheon-photos $(DESKTOP_APP_FULL_NAME)` \
147+ >> misc/pantheon-photos.desktop ; \
148 echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) \
149- gettext --domain=shotwell $(DESKTOP_APPLICATION_CLASS)` >> misc/shotwell.desktop ; \
150+ gettext --domain=pantheon-photos $(DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos.desktop ; \
151 echo Comment[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
152- --domain=shotwell $(DESKTOP_APPLICATION_COMMENT)` >> misc/shotwell.desktop ; \
153+ --domain=pantheon-photos $(DESKTOP_APPLICATION_COMMENT)` >> misc/pantheon-photos.desktop ; \
154 echo Keywords[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
155- --domain=shotwell $(DESKTOP_APP_KEYWORDS)` >> misc/shotwell.desktop ;)
156+ --domain=pantheon-photos $(DESKTOP_APP_KEYWORDS)` >> misc/pantheon-photos.desktop ;)
157 ifndef DISABLE_DESKTOP_VALIDATE
158- @ desktop-file-validate misc/shotwell.desktop 1>misc/shotwell.desktop.errors 2>&1; \
159- if test -s misc/shotwell.desktop.errors; then \
160- 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."; \
161+ @ desktop-file-validate misc/pantheon-photos.desktop 1>misc/pantheon-photos.desktop.errors 2>&1; \
162+ if test -s misc/pantheon-photos.desktop.errors; then \
163+ 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."; \
164 exit 1; \
165- else rm -f misc/shotwell.desktop.errors; \
166+ else rm -f misc/pantheon-photos.desktop.errors; \
167 fi
168 endif
169
170-misc/shotwell-viewer.desktop: misc/shotwell-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
171- cp misc/shotwell-viewer.desktop.head misc/shotwell-viewer.desktop
172+misc/pantheon-photos-viewer.desktop: misc/pantheon-photos-viewer.desktop.head $(EXPANDED_CORE_PO_FILES)
173+ cp misc/pantheon-photos-viewer.desktop.head misc/pantheon-photos-viewer.desktop
174 $(foreach lang,$(CORE_SUPPORTED_LANGUAGES), echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack \
175- LANGUAGE=$(lang) gettext --domain=shotwell $(DESKTOP_APP_FULL_NAME)` \
176+ LANGUAGE=$(lang) gettext --domain=pantheon-photos $(DESKTOP_APP_FULL_NAME)` \
177 echo X-GNOME-FullName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
178- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/shotwell-viewer.desktop ; \
179+ --domain=pantheon-photos $(DIRECT_EDIT_DESKTOP_APP_FULL_NAME)` >> misc/pantheon-photos-viewer.desktop ; \
180 echo GenericName[$(lang)]=`TEXTDOMAINDIR=locale-langpack LANGUAGE=$(lang) gettext \
181- --domain=shotwell $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/shotwell-viewer.desktop ;)
182+ --domain=pantheon-photos $(DIRECT_EDIT_DESKTOP_APPLICATION_CLASS)` >> misc/pantheon-photos-viewer.desktop ;)
183 ifndef DISABLE_DESKTOP_VALIDATE
184- @ desktop-file-validate misc/shotwell-viewer.desktop 1>misc/shotwell-viewer.desktop.errors 2>&1; \
185- if test -s misc/shotwell-viewer.desktop.errors; then \
186- 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."; \
187+ @ desktop-file-validate misc/pantheon-photos-viewer.desktop 1>misc/pantheon-photos-viewer.desktop.errors 2>&1; \
188+ if test -s misc/pantheon-photos-viewer.desktop.errors; then \
189+ 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."; \
190 exit 1; \
191- else rm -f misc/shotwell-viewer.desktop.errors; \
192+ else rm -f misc/pantheon-photos-viewer.desktop.errors; \
193 fi
194 endif
195
196 .PHONY: desktop
197-desktop: misc/shotwell.desktop misc/shotwell-viewer.desktop
198+desktop: misc/pantheon-photos.desktop misc/pantheon-photos-viewer.desktop
199
200 .PHONY: dist
201 dist:
202@@ -565,64 +565,64 @@
203 mkdir -p $(DESTDIR)$(LIBEXECDIR)
204 $(INSTALL_PROGRAM) $(THUMBNAILER_BIN) $(DESTDIR)$(LIBEXECDIR)
205 $(INSTALL_PROGRAM) $(MIGRATOR_BIN) $(DESTDIR)$(LIBEXECDIR)
206- mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
207- $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
208+ mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
209+ $(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/icons
210 mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
211- $(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
212+ $(INSTALL_DATA) icons/pantheon-photos.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps
213 mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps
214- $(INSTALL_DATA) icons/shotwell-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
215+ $(INSTALL_DATA) icons/pantheon-photos-16.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
216 mkdir -p $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps
217- $(INSTALL_DATA) icons/shotwell-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
218+ $(INSTALL_DATA) icons/pantheon-photos-24.svg $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
219 mkdir -p $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
220- $(INSTALL_DATA) misc/org.yorba.shotwell.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
221- $(INSTALL_DATA) misc/org.yorba.shotwell-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
222+ $(INSTALL_DATA) misc/org.elementaryos.pantheon-photos.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
223+ $(INSTALL_DATA) misc/org.elementaryos.pantheon-photos-extras.gschema.xml $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
224 ifndef DISABLE_SCHEMAS_COMPILE
225 glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
226 endif
227 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
228 mkdir -p $(DESTDIR)/usr/share/GConf/gsettings
229- $(INSTALL_DATA) misc/shotwell.convert $(DESTDIR)/usr/share/GConf/gsettings
230+ $(INSTALL_DATA) misc/pantheon-photos.convert $(DESTDIR)/usr/share/GConf/gsettings
231 endif
232 ifndef DISABLE_ICON_UPDATE
233 -gtk-update-icon-cache -t -f $(DESTDIR)$(PREFIX)/share/icons/hicolor || :
234 endif
235- mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/ui
236- $(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/shotwell/ui
237+ mkdir -p $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
238+ $(INSTALL_DATA) ui/* $(DESTDIR)$(PREFIX)/share/pantheon-photos/ui
239 mkdir -p $(DESTDIR)$(PREFIX)/share/applications
240 mkdir -p $(DESTDIR)$(PREFIX)/share/appdata
241- $(INSTALL_DATA) misc/shotwell.desktop $(DESTDIR)$(PREFIX)/share/applications
242- $(INSTALL_DATA) misc/shotwell-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
243- $(INSTALL_DATA) misc/shotwell.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
244+ $(INSTALL_DATA) misc/pantheon-photos.desktop $(DESTDIR)$(PREFIX)/share/applications
245+ $(INSTALL_DATA) misc/pantheon-photos-viewer.desktop $(DESTDIR)$(PREFIX)/share/applications
246+ $(INSTALL_DATA) misc/pantheon-photos.appdata.xml $(DESTDIR)$(PREFIX)/share/appdata
247 ifndef DISABLE_DESKTOP_UPDATE
248 -update-desktop-database || :
249 endif
250 ifdef ENABLE_APPORT_HOOK_INSTALL
251 mkdir -p $(DESTDIR)$(PREFIX)/share/apport/package-hooks
252- $(INSTALL_DATA) apport/shotwell.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
253+ $(INSTALL_DATA) apport/pantheon-photos.py $(DESTDIR)$(PREFIX)/share/apport/package-hooks
254 endif
255 ifndef DISABLE_HELP_INSTALL
256- mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
257- $(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C
258- mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
259- $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell/C/figures
260+ mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
261+ $(INSTALL_DATA) $(EXPANDED_HELP_FILES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C
262+ mkdir -p $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
263+ $(INSTALL_DATA) $(EXPANDED_HELP_IMAGES) $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos/C/figures
264 endif
265 -$(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`mkdir -p $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES ; \
266- $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo \
267- $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
268- mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
269- $(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
270+ $(INSTALL_DATA) $(LOCAL_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo \
271+ $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
272+ mkdir -p $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
273+ $(INSTALL_PROGRAM) $(PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
274 ifdef PLUGINS_RC
275- $(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
276+ $(INSTALL_DATA) $(PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
277 endif
278 ifndef DISABLE_EXTRA_PLUGINS_INSTALL
279- $(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
280+ $(INSTALL_PROGRAM) $(EXTRA_PLUGINS_SO) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
281 ifdef EXTRA_PLUGINS_RC
282- $(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
283+ $(INSTALL_DATA) $(EXTRA_PLUGINS_RC) $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
284 endif
285 endif
286 ifdef INSTALL_HEADERS
287- mkdir -p $(DESTDIR)$(PREFIX)/include/shotwell/plugins
288- $(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/shotwell/plugins
289+ mkdir -p $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
290+ $(INSTALL_DATA) $(PLUGIN_HEADER) $(DESTDIR)$(PREFIX)/include/pantheon-photos/plugins
291 mkdir -p $(DESTDIR)$(PREFIX)/share/vala/vapi
292 $(INSTALL_DATA) $(PLUGIN_VAPI) $(DESTDIR)$(PREFIX)/share/vala/vapi
293 $(INSTALL_DATA) $(PLUGIN_DEPS) $(DESTDIR)$(PREFIX)/share/vala/vapi
294@@ -637,37 +637,37 @@
295 rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM_MIGRATOR)
296 rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_THUMBNAILER)
297 rm -f $(DESTDIR)$(LIBEXECDIR)/$(PROGRAM_MIGRATOR)
298- rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
299- rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/shotwell.svg
300- rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/shotwell.svg
301- rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/shotwell.svg
302- rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell.desktop
303- rm -f $(DESTDIR)$(PREFIX)/share/applications/shotwell-viewer.desktop
304- rm -f $(DESTDIR)$(PREFIX)/share/appdata/shotwell.appdata.xml
305+ rm -fr $(DESTDIR)$(PREFIX)/share/pantheon-photos
306+ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/pantheon-photos.svg
307+ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/16x16/apps/pantheon-photos.svg
308+ rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/24x24/apps/pantheon-photos.svg
309+ rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos.desktop
310+ rm -f $(DESTDIR)$(PREFIX)/share/applications/pantheon-photos-viewer.desktop
311+ rm -f $(DESTDIR)$(PREFIX)/share/appdata/pantheon-photos.appdata.xml
312 ifndef DISABLE_DESKTOP_UPDATE
313 -update-desktop-database || :
314 endif
315 ifndef DISABLE_HELP_INSTALL
316- rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/shotwell
317+ rm -rf $(DESTDIR)$(PREFIX)/share/gnome/help/pantheon-photos
318 endif
319 ifdef ENABLE_APPORT_HOOK_INSTALL
320- rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/shotwell.py
321+ rm -f $(DESTDIR)$(PREFIX)/share/apport/package-hooks/pantheon-photos.py
322 endif
323- $(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/shotwell.mo`)
324- rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/shotwell/plugins/builtin
325+ $(foreach lang,$(CORE_SUPPORTED_LANGUAGES),`rm -f $(SYSTEM_LANG_DIR)/$(lang)/LC_MESSAGES/pantheon-photos.mo`)
326+ rm -rf $(DESTDIR)$(PREFIX)/$(LIB)/pantheon-photos/plugins/builtin
327 ifdef INSTALL_HEADERS
328- rm -rf $(DESTDIR)$(PREFIX)/include/shotwell
329+ rm -rf $(DESTDIR)$(PREFIX)/include/pantheon-photos
330 rm -f $(foreach vapi,$(PLUGIN_VAPI),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(vapi)))
331 rm -f $(foreach dep,$(PLUGIN_DEPS),$(DESTDIR)$(PREFIX)/share/vala/vapi/$(notdir $(dep)))
332 rm -f $(DESTDIR)$(PREFIX)/$(LIB)/pkgconfig/$(PC_FILE)
333 endif
334- rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell.gschema.xml
335- rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.yorba.shotwell-extras.gschema.xml
336+ rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.elementaryos.pantheon-photos.gschema.xml
337+ rm -f $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas/org.elementaryos.pantheon-photos-extras.gschema.xml
338 ifndef DISABLE_SCHEMAS_COMPILE
339 glib-compile-schemas $(DESTDIR)$(PREFIX)/share/glib-2.0/schemas
340 endif
341 ifndef DISABLE_GSETTINGS_CONVERT_INSTALL
342- rm -f $(DESTDIR)/usr/share/GConf/gsettings/shotwell.convert
343+ rm -f $(DESTDIR)/usr/share/GConf/gsettings/pantheon-photos.convert
344 endif
345
346 $(PC_FILE): $(PC_INPUT) $(MAKE_FILES)
347@@ -729,7 +729,7 @@
348 docs:
349 # valadoc complains if the directory already exists
350 @rm -rf docs
351- valadoc --directory=docs --package-name=shotwell-plugin-dev --package-version=$(VERSION) --verbose \
352+ valadoc --directory=docs --package-name=pantheon-photos-plugin-dev --package-version=$(VERSION) --verbose \
353 --no-protected \
354 $(foreach def,$(DEFINES),--define=$(def)) \
355 $(foreach pkg,$(VALA_PKGS),--pkg=$(pkg)) \
356@@ -747,10 +747,10 @@
357
358 .PHONY: valacheck
359 valacheck:
360- @ $(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 )
361- @ ./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 )
362+ @ $(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 )
363+ @ ./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 )
364 $(if $(MAX_VALAC_VERSION),\
365- @ ./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 ),)
366+ @ ./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 ),)
367
368
369
370@@ -762,7 +762,7 @@
371 @pkg-config --print-errors --exists $(EXT_PKGS) $(DIRECT_LIBS_VERSIONS)
372 endif
373 endif
374- @ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Shotwell. ' ; exit 1 )
375+ @ type msgfmt > /dev/null || ( echo 'msgfmt (usually found in the gettext package) is missing and is required to build Photos. ' ; exit 1 )
376 ifndef DISABLE_DESKTOP_VALIDATE
377- @ 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 )
378+ @ 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 )
379 endif
380
381=== renamed file 'apport/shotwell.py' => 'apport/pantheon-photos.py'
382=== renamed file 'misc/org.yorba.shotwell-extras.gschema.xml' => 'misc/org.elementaryos.pantheon-photos-extras.gschema.xml'
383=== renamed file 'misc/org.yorba.shotwell.gschema.xml' => 'misc/org.elementaryos.pantheon-photos.gschema.xml'
384=== renamed file 'misc/shotwell-viewer.desktop.head' => 'misc/pantheon-photos-viewer.desktop.head'
385=== renamed file 'misc/shotwell.appdata.xml' => 'misc/pantheon-photos.appdata.xml'
386=== renamed file 'misc/shotwell.convert' => 'misc/pantheon-photos.convert'
387=== renamed file 'misc/shotwell.desktop.head' => 'misc/pantheon-photos.desktop.head'
388=== renamed file 'shotwell-plugin-dev-1.0.m4' => 'pantheon-photos-plugin-dev-1.0.m4'
389=== renamed file 'shotwell.doap' => 'pantheon-photos.doap'
390--- shotwell.doap 2013-11-19 00:01:30 +0000
391+++ pantheon-photos.doap 2014-02-24 01:45:14 +0000
392@@ -5,11 +5,11 @@
393 xmlns:gnome="http://api.gnome.org/doap-extensions#"
394 xmlns="http://usefulinc.com/ns/doap#">
395
396- <name xml:lang="en">shotwell</name>
397+ <name xml:lang="en">pantheon-photos</name>
398 <shortdesc xml:lang="en">Digital photo organizer</shortdesc>
399- <homepage rdf:resource="http://www.yorba.org/projects/shotwell/" />
400- <mailing-list rdf:resource="https://mail.gnome.org/mailman/listinfo/shotwell-list" />
401- <bug-database rdf:resource="https://bugzilla.gnome.org/browse.cgi?product=shotwell" />
402+ <homepage rdf:resource="https://launchpad.net/pantheon-photos" />
403+ <mailing-list rdf:resource="https://launchpad.net/pantheon-photos/+subscribe" />
404+ <bug-database rdf:resource="https://bugs.launchpad.net/pantheon-photos" />
405 <category rdf:resource="http://api.gnome.org/doap-extensions#desktop" />
406
407 <maintainer>
408
409=== modified file 'plugins/Makefile.plugin.mk'
410--- plugins/Makefile.plugin.mk 2013-09-24 22:08:27 +0000
411+++ plugins/Makefile.plugin.mk 2014-02-24 01:45:14 +0000
412@@ -1,7 +1,7 @@
413
414-# Generic plug-in Makefile for Shotwell standard plugins.
415+# Generic plug-in Makefile for Photos standard plugins.
416 #
417-# Requires PLUGIN and SRC_FILES be set to the name of the plugin binary (minus extension) and that
418+# Requires PLUGIN and SRC_FILES be set to the name of the plugin binary (minus extension) and that
419 # the directory is registered in plugins.mk.
420 #
421 # To use, include this file in each plug-in directory's Makefile after setting appropriate variables.
422@@ -14,19 +14,19 @@
423 VALAC := valac
424 endif
425 MAKE_FILES := Makefile ../Makefile.plugin.mk ../plugins.mk
426-HEADER_FILES := ../shotwell-plugin-dev-1.0.vapi ../shotwell-plugin-dev-1.0.h \
427- ../shotwell-plugin-dev-1.0.deps
428+HEADER_FILES := ../pantheon-photos-plugin-dev-1.0.vapi ../pantheon-photos-plugin-dev-1.0.h \
429+ ../pantheon-photos-plugin-dev-1.0.deps
430
431 include ../plugins.mk
432
433-# automatically include shotwell-plugin-dev-1.0's dependencies
434+# automatically include pantheon-photos-plugin-dev-1.0's dependencies
435 # NOTE: This line will generate an error when running "make dist" from the master Makefile.
436 # It can be safely ignored.
437-PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../shotwell-plugin-dev-1.0.deps) $(PKGS)
438+PKGS := $(shell sed ':a;N;$$!ba;s/\n/ /g' ../pantheon-photos-plugin-dev-1.0.deps) $(PKGS)
439
440-# automatically include the shotwell-plugin-dev-1.0 package as a local dependency
441+# automatically include the pantheon-photos-plugin-dev-1.0 package as a local dependency
442 EXT_PKGS := $(PKGS)
443-PKGS := shotwell-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
444+PKGS := pantheon-photos-plugin-dev-1.0 $(PKGS) $(PLUGIN_PKGS)
445
446 # automatically include the Resources.vala common file
447 SRC_FILES := ../common/Resources.vala $(SRC_FILES)
448@@ -36,7 +36,7 @@
449
450 CFLAGS := `pkg-config --print-errors --cflags $(EXT_PKGS) $(PLUGIN_PKGS)` -nostdlib -export-dynamic $(PLUGIN_CFLAGS)
451 LIBS := `pkg-config --print-errors --libs $(EXT_PKGS) $(PLUGIN_PKGS)`
452-DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"shotwell"'
453+DEFINES := -D_VERSION='"$(PLUGINS_VERSION)"' -DGETTEXT_PACKAGE='"pantheon-photos"'
454
455 all: $(PLUGIN).so
456
457
458=== renamed directory 'plugins/shotwell-data-imports' => 'plugins/pantheon-photos-data-imports'
459=== renamed file 'plugins/shotwell-data-imports/shotwell-data-imports.vala' => 'plugins/pantheon-photos-data-imports/pantheon-photos-data-imports.vala'
460=== renamed directory 'plugins/shotwell-publishing' => 'plugins/pantheon-photos-publishing'
461=== renamed directory 'plugins/shotwell-publishing-extras' => 'plugins/pantheon-photos-publishing-extras'
462=== renamed file 'plugins/shotwell-publishing-extras/shotwell-publishing-extras.vala' => 'plugins/pantheon-photos-publishing-extras/pantheon-photos-publishing-extras.vala'
463=== renamed file 'plugins/shotwell-publishing/shotwell-publishing.vala' => 'plugins/pantheon-photos-publishing/pantheon-photos-publishing.vala'
464=== renamed directory 'plugins/shotwell-transitions' => 'plugins/pantheon-photos-transitions'
465=== renamed file 'plugins/shotwell-transitions/shotwell-transitions.vala' => 'plugins/pantheon-photos-transitions/pantheon-photos-transitions.vala'
466=== modified file 'plugins/plugins.mk'
467--- plugins/plugins.mk 2013-11-14 22:27:35 +0000
468+++ plugins/plugins.mk 2014-02-24 01:45:14 +0000
469@@ -1,33 +1,33 @@
470
471 PLUGINS := \
472- shotwell-transitions \
473- shotwell-publishing \
474- shotwell-data-imports
475+ pantheon-photos-transitions \
476+ pantheon-photos-publishing \
477+ pantheon-photos-data-imports
478
479 PLUGINS_RC := \
480- plugins/shotwell-publishing/facebook.png \
481- plugins/shotwell-publishing/facebook_publishing_options_pane.glade \
482- plugins/shotwell-publishing/flickr.png \
483- plugins/shotwell-publishing/flickr_publishing_options_pane.glade \
484- plugins/shotwell-publishing/flickr_pin_entry_pane.glade \
485- plugins/shotwell-publishing/picasa.png \
486- plugins/shotwell-publishing/picasa_publishing_options_pane.glade \
487- plugins/shotwell-publishing/youtube.png \
488- plugins/shotwell-publishing/youtube_publishing_options_pane.glade \
489- plugins/shotwell-publishing/piwigo.png \
490- plugins/shotwell-publishing/piwigo_authentication_pane.glade \
491- plugins/shotwell-publishing/piwigo_publishing_options_pane.glade \
492- plugins/shotwell-transitions/slideshow-plugin.png
493+ plugins/pantheon-photos-publishing/facebook.png \
494+ plugins/pantheon-photos-publishing/facebook_publishing_options_pane.glade \
495+ plugins/pantheon-photos-publishing/flickr.png \
496+ plugins/pantheon-photos-publishing/flickr_publishing_options_pane.glade \
497+ plugins/pantheon-photos-publishing/flickr_pin_entry_pane.glade \
498+ plugins/pantheon-photos-publishing/picasa.png \
499+ plugins/pantheon-photos-publishing/picasa_publishing_options_pane.glade \
500+ plugins/pantheon-photos-publishing/youtube.png \
501+ plugins/pantheon-photos-publishing/youtube_publishing_options_pane.glade \
502+ plugins/pantheon-photos-publishing/piwigo.png \
503+ plugins/pantheon-photos-publishing/piwigo_authentication_pane.glade \
504+ plugins/pantheon-photos-publishing/piwigo_publishing_options_pane.glade \
505+ plugins/pantheon-photos-transitions/slideshow-plugin.png
506
507 EXTRA_PLUGINS := \
508- shotwell-publishing-extras
509+ pantheon-photos-publishing-extras
510
511 EXTRA_PLUGINS_RC := \
512- plugins/shotwell-publishing-extras/yandex_publish_model.glade \
513- plugins/shotwell-data-imports/f-spot-24.png \
514- plugins/shotwell-publishing-extras/tumblr.png \
515- plugins/shotwell-publishing-extras/tumblr_authentication_pane.glade \
516- plugins/shotwell-publishing-extras/tumblr_publishing_options_pane.glade
517+ plugins/pantheon-photos-publishing-extras/yandex_publish_model.glade \
518+ plugins/pantheon-photos-data-imports/f-spot-24.png \
519+ plugins/pantheon-photos-publishing-extras/tumblr.png \
520+ plugins/pantheon-photos-publishing-extras/tumblr_authentication_pane.glade \
521+ plugins/pantheon-photos-publishing-extras/tumblr_publishing_options_pane.glade
522
523 ALL_PLUGINS := $(PLUGINS) $(EXTRA_PLUGINS)
524
525
526=== renamed file 'sw-glade' => 'pp-glade'
527--- sw-glade 2011-02-18 04:00:18 +0000
528+++ pp-glade 2014-02-24 01:45:14 +0000
529@@ -2,7 +2,7 @@
530 shared_lib="libshotwell.so"
531
532 if [ -f $shared_lib ]; then
533- GLADE_CATALOG_PATH=ui/ GLADE_MODULE_PATH=. glade ui/shotwell.glade &
534+ GLADE_CATALOG_PATH=ui/ GLADE_MODULE_PATH=. glade ui/pantheon-photos.glade &
535 else
536 echo "Run './configure --enable-build-for-glade' and then 'make' to generate shared library."
537 fi
538
539=== renamed file 'settings-migrator/shotwell-settings-migrator' => 'settings-migrator/pantheon-photos-settings-migrator'
540=== renamed file 'src/libshotwell.deps' => 'src/libpantheon-photos.deps'
541=== renamed file 'thumbnailer/shotwell-video-thumbnailer.vala' => 'thumbnailer/pantheon-photos-video-thumbnailer.vala'
542=== renamed file 'ui/shotwell.glade' => 'ui/pantheon-photos.glade'
543=== renamed file 'ui/shotwell.xml' => 'ui/pantheon-photos.xml'

Subscribers

People subscribed via source and target branches