Merge lp:~computergeoffrey/pantheon-photos/master into lp:~pantheon-photos/pantheon-photos/trunk

Proposed by Geoffrey De Belie
Status: Merged
Approved by: Danielle Foré
Approved revision: 3062
Merged at revision: 3071
Proposed branch: lp:~computergeoffrey/pantheon-photos/master
Merge into: lp:~pantheon-photos/pantheon-photos/trunk
Diff against target: 54 lines (+11/-8)
2 files modified
COPYING (+1/-1)
INSTALL (+10/-7)
To merge this branch: bzr merge lp:~computergeoffrey/pantheon-photos/master
Reviewer Review Type Date Requested Status
Photos Devs Pending
Review via email: mp+311646@code.launchpad.net

Commit message

Update COPYING with Photos name and rewrite INSTALL

Description of the change

Update COPYING with Photos name and rewrite INSTALL

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'COPYING'
2--- COPYING 2010-12-03 17:19:53 +0000
3+++ COPYING 2016-11-23 17:45:00 +0000
4@@ -3,7 +3,7 @@
5 License as published by the Free Software Foundation; either
6 version 2.1 of the License, or (at your option) any later version.
7
8-Some of Shotwell's icons are copyright their respective authors:
9+Some of Photos' icons are copyright their respective authors:
10
11 * Human
12 https://launchpad.net/human-icon-theme
13
14=== modified file 'INSTALL'
15--- INSTALL 2014-09-02 00:36:00 +0000
16+++ INSTALL 2016-11-23 17:45:00 +0000
17@@ -2,15 +2,17 @@
18 Photos Installation
19 ---------------------
20
21- To build and install Photos, type the following commands:
22+ To create the build environment for Photos, type the following commands:
23
24- $ ./configure --build=build
25+ $ mkdir build && cd build
26+ $ cmake ..
27+
28+ To build Photos, type the following commands from within the build directory:
29+
30 $ make
31 $ make install
32
33- * By default, Photos will install under /usr/local. The configure script
34- can customize the prefix directory. Run ./configure --help for
35- instructions and other installation options.
36+ * By default, Photos will install under /usr/local.
37
38 * You may need to execute "make install" as root (i.e. sudo make install)
39 if installing to system directories.
40@@ -18,9 +20,10 @@
41 * If you wish to try Photos before installing it, you may execute it
42 directly from its build directory. Note that certain desktop integration
43 (such as being listed in an application menu) requires full installation.
44-
45+
46 Once installed, Photos will be available on your desktop Applications
47 menu under Graphics or Photography.
48
49
50- Copyright 2009-2013 Yorba Foundation
51\ No newline at end of file
52+ Copyright 2009-2013 Yorba Foundation
53+ Copyright 2016 elementary LLC.
54\ No newline at end of file

Subscribers

People subscribed via source and target branches