Commit 9749b5e3 authored by Adam Dingle's avatar Adam Dingle

Various pre-release fixes.

parent 11197c81
Jim Nelson <jim@yorba.org>
Some of Shotwell's icons are copyright their respective authors:
* Human
http://commons.wikimedia.org/wiki/Human_icons
Licensed under Creative Commons Attribution ShareAlike 2.5
* Breathe Icon Set
https://launchpad.net/breathe-icon-set
Licensed under Creative Commons Attribution ShareAlike 3.0
This library is free software; you can redistribute it and/or
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
Some of Shotwell's icons are copyright their respective authors:
* Human
http://commons.wikimedia.org/wiki/Human_icons
Licensed under Creative Commons Attribution ShareAlike 2.5
* Breathe Icon Set
https://launchpad.net/breathe-icon-set
Licensed under Creative Commons Attribution ShareAlike 3.0
GNU LESSER GENERAL PUBLIC LICENSE
Version 2.1, February 1999
......
TARGET = shotwell
PROGRAM = shotwell
VERSION = 0.1.0
BUILD_ROOT = 1
VALAC = valac
INSTALL_PROGRAM = install
......@@ -107,16 +108,16 @@ EXPANDED_RESOURCE_FILES = $(foreach res,$(RESOURCE_FILES), ui/$(res))
DIST_FILES = Makefile configure $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) \
$(EXPANDED_SRC_HEADER_FILES) $(EXPANDED_RESOURCE_FILES) $(TEXT_FILES) icons/* misc/*
DIST_TAR = $(TARGET)-$(VERSION).tar
DIST_TAR = $(PROGRAM)-$(VERSION).tar
DIST_TAR_BZ2 = $(DIST_TAR).bz2
all: $(TARGET)
all: $(PROGRAM)
clean:
rm -f src/*.c
rm -f $(CONFIG_IN)
rm -f $(DIST_TAR_BZ2)
rm -f $(TARGET)
rm -f $(PROGRAM)
cleantemps:
rm -f *.c
......@@ -126,8 +127,8 @@ dist: $(DIST_TAR_BZ2)
dist-clean:
rm -f $(DIST_TAR_BZ2)
install: $(TARGET) misc/shotwell.desktop
$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(PREFIX)/bin
install: $(PROGRAM) misc/shotwell.desktop
$(INSTALL_PROGRAM) $(PROGRAM) $(DESTDIR)$(PREFIX)/bin
mkdir -p $(DESTDIR)$(PREFIX)/share/shotwell/icons
$(INSTALL_DATA) icons/* $(DESTDIR)$(PREFIX)/share/shotwell/icons
$(INSTALL_DATA) icons/shotwell.svg $(DESTDIR)/usr/share/icons/hicolor/scalable/apps
......@@ -138,17 +139,17 @@ install: $(TARGET) misc/shotwell.desktop
update-desktop-database
uninstall:
rm -f $(DESTDIR)$(PREFIX)/bin/$(TARGET)
rm -f $(DESTDIR)$(PREFIX)/bin/$(PROGRAM)
rm -fr $(DESTDIR)$(PREFIX)/share/shotwell
rm -fr $(DESTDIR)/usr/share/icons/hicolor/scalable/apps/shotwell.svg
xdg-desktop-menu uninstall shotwell.desktop
update-desktop-database
$(DIST_TAR_BZ2): $(TARGET) $(DIST_FILES)
$(DIST_TAR_BZ2): $(PROGRAM) $(DIST_FILES)
tar -cv $(DIST_FILES) > $(DIST_TAR)
bzip2 $(DIST_TAR)
$(TARGET): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \
$(PROGRAM): $(EXPANDED_SRC_FILES) $(EXPANDED_VAPI_FILES) $(EXPANDED_SRC_HEADER_FILES) Makefile \
configure $(CONFIG_IN)
ifndef ASSUME_PKGS
ifdef EXT_PKGS
......@@ -164,5 +165,5 @@ endif
$(foreach hdir,$(HEADER_DIRS),-X -I$(hdir)) \
-X -D_PREFIX='"$(PREFIX)"' \
$(EXPANDED_SRC_FILES) \
-o $(TARGET)
-o $(PROGRAM)
Shotwell 0.1.0 - 25 June 2009
Shotwell 0.1.0 - 26 June 2009
-----------------------------
- Initial release. Features include:
* Importing photos from file manager or camera via libgphoto.
* Importing photos from file manager or camera via libgphoto2.
* Photos automatically sorted into time-grouped events.
* Thumbnails viewable at various sizes.
* Sort by photo name or date of exposure.
......
......@@ -9,10 +9,9 @@
organize them in various ways, view them in full-window or fullscreen
mode, and export them to share with others.
As this is an early release, not all features normally associated with
photo organizers are implemented. Visit http://www.yorba.org/shotwell for
the current state of its development and to make sure you're running the
latest version.
This is an early alpha release with a limited feature set. Visit
http://www.yorba.org/shotwell to read about the current state of Shotwell's
development and to make sure you're running the latest version.
* Installation & Licensing
......@@ -38,7 +37,7 @@
will load previews of each photo. You may choose specific photos to
import or to import them all.
Shotwell uses gphoto to communicate with digital cameras. If your camera
Shotwell uses gPhoto to communicate with digital cameras. If your camera
does not appear in Shotwell's sidebar or there is a problem importing
photos, visit http://www.gphoto.org to see if it is supported.
......@@ -51,7 +50,7 @@
Yorba: http://www.yorba.org
Shotwell project page: http://www.yorba.org/shotwell
Shotwell documentation: http://trac.yorba.org/wiki/PhotoOrganizer
Shotwell documentation: http://trac.yorba.org/wiki/Shotwell
We also encourage you to join the Shotwell mailing list. Send an email
with a subject: line of "subscribe" (no quotes) to
......
#! /bin/sh
#
# Copyright 2009 Yorba Foundation
#
# This software is licensed under the GNU LGPL (version 2.1 or later).
# See the COPYING file in this distribution.
CONFIG_IN=configure.in
......
......@@ -2,7 +2,7 @@
Version=1.0
Name=Shotwell
GenericName=Photo Organizer
Comment=Organize your photos.
Comment=Organize your photos
Exec=shotwell %U
Icon=shotwell
Terminal=false
......
......@@ -1118,8 +1118,8 @@ public class AppWindow : Gtk.Window {
Gtk.DialogFlags.MODAL, Gtk.MessageType.QUESTION,
Gtk.ButtonsType.YES_NO,
"The camera is locked for use as a mounted drive. "
+ "Shotwell can only access the drive when it's unlocked. "
+ "Do you want Shotwell to unmount the drive for you?");
+ "Shotwell can only access the camera when it's unlocked. "
+ "Do you want Shotwell to unmount it for you?");
dialog.title = Resources.APP_TITLE;
int dialog_res = dialog.run();
dialog.destroy();
......@@ -1136,7 +1136,7 @@ public class AppWindow : Gtk.Window {
Gtk.DialogFlags.MODAL, Gtk.MessageType.WARNING,
Gtk.ButtonsType.OK,
"The camera is locked by another application. "
+ "Shotwell can only access the drive when it's unlocked. "
+ "Shotwell can only access the camera when it's unlocked. "
+ "Please close any other application using the camera and try again.");
dialog.title = Resources.APP_TITLE;
dialog.run();
......
......@@ -15,7 +15,7 @@ namespace Resources {
public static const string COPYRIGHT = "Copyright 2009 Yorba Foundation";
public static const string YORBA_URL = "http://www.yorba.org";
public static const string HELP_URL = "http://trac.yorba.org/wiki/PhotoOrganizer";
public static const string HELP_URL = "http://trac.yorba.org/wiki/Shotwell";
public static const string PREFIX = _PREFIX;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment