Merge lp:~elementary-apps/pantheon-photos/fix-license-header into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Update license headers to pass licensecheck

Creative Commons licenses removed from COPYING because we don't ship those 3rd party assets any longer

Re-licensed elementary-owned GPL3 files as LGPL 2.1

[Neal Gompa (ngompa13)]

License check is considerably happier now. Looks good to me.

review: Approve

[Fabio Valentini (decathorpe)]

By the way, it seems there is one GPL3-licensed file left:
  cmake/GResource.cmake

Unrelated to that: I would really like to see a release of pantheon-photos once this gets merged, so I can finally package it up for fedora.

[Danielle Foré (danrabbit)]

I'm unsure what to do about that cmake file. We'll have to ask Cody when he returns from vacation since we don't own copyrights on it

=== modified file 'COPYING'
--- COPYING	2016-11-23 17:43:11 +0000
+++ COPYING	2017-01-12 18:15:05 +0000
@@ -3,20 +3,6 @@
 License as published by the Free Software Foundation; either
 version 2.1 of the License, or (at your option) any later version.
 
-Some of Photos' icons are copyright their respective authors:
-
-    * Human
-      https://launchpad.net/human-icon-theme
-      Licensed under Creative Commons Attribution ShareAlike 3.0
-
-    * Breathe Icon Set
-      https://launchpad.net/breathe-icon-set
-      Licensed under Creative Commons Attribution ShareAlike 3.0
-      
-    * gnome-icon-theme
-      http://git.gnome.org/browse/gnome-icon-theme
-      Licensed under Creative Commons Attribution ShareAlike 3.0
-
 
 		  GNU LESSER GENERAL PUBLIC LICENSE
 		       Version 2.1, February 1999

=== modified file 'plugins/pantheon-photos-publishing-extras/RESTSupport.vala'
--- plugins/pantheon-photos-publishing-extras/RESTSupport.vala	2016-11-22 01:49:40 +0000
+++ plugins/pantheon-photos-publishing-extras/RESTSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 extern Soup.Message soup_form_request_new_from_multipart (string uri, Soup.Multipart multipart);
 

=== modified file 'plugins/pantheon-photos-publishing-extras/Resources.vala'
--- plugins/pantheon-photos-publishing-extras/Resources.vala	2016-01-14 12:35:35 +0000
+++ plugins/pantheon-photos-publishing-extras/Resources.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Resources {
 

=== modified file 'plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala'
--- plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala	2016-11-04 23:18:21 +0000
+++ plugins/pantheon-photos-publishing-extras/TumblrPublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,10 +1,23 @@
-/* Copyright 2012 BJA Electronics
- * Author: Jeroen Arnoldus ([e-mail])
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
+/*
+* Copyright (c) 2012 BJA Electronics
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Jeroen Arnoldus ([e-mail])
+*/
 
 extern string hmac_sha1 (string key, string message);
 public class TumblrService : Object, Spit.Pluggable, Spit.Publishing.Service {

=== modified file 'plugins/pantheon-photos-publishing-extras/YandexPublishing.vala'
--- plugins/pantheon-photos-publishing-extras/YandexPublishing.vala	2016-11-22 01:49:40 +0000
+++ plugins/pantheon-photos-publishing-extras/YandexPublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010+ Evgeniy Polyakov <[e-mail]>
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010 Evgeniy Polyakov <[e-mail]>
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class YandexService : Object, Spit.Pluggable, Spit.Publishing.Service {
     public int get_pluggable_interface (int min_host_interface, int max_host_interface) {

=== modified file 'plugins/pantheon-photos-publishing-extras/shotwell-publishing-extras.vala'
--- plugins/pantheon-photos-publishing-extras/shotwell-publishing-extras.vala	2016-01-14 12:35:35 +0000
+++ plugins/pantheon-photos-publishing-extras/shotwell-publishing-extras.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 private class ShotwellPublishingExtraServices : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];

=== modified file 'plugins/pantheon-photos-publishing/FacebookPublishing.vala'
--- plugins/pantheon-photos-publishing/FacebookPublishing.vala	2016-11-22 01:49:40 +0000
+++ plugins/pantheon-photos-publishing/FacebookPublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class FacebookService : Object, Spit.Pluggable, Spit.Publishing.Service {
     private const string ICON_FILENAME = "facebook.svg";

=== modified file 'plugins/pantheon-photos-publishing/FlickrPublishing.vala'
--- plugins/pantheon-photos-publishing/FlickrPublishing.vala	2016-02-19 19:55:55 +0000
+++ plugins/pantheon-photos-publishing/FlickrPublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 extern string hmac_sha1 (string key, string message);
 

=== modified file 'plugins/pantheon-photos-publishing/PicasaPublishing.vala'
--- plugins/pantheon-photos-publishing/PicasaPublishing.vala	2016-07-30 17:03:44 +0000
+++ plugins/pantheon-photos-publishing/PicasaPublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class PicasaService : Object, Spit.Pluggable, Spit.Publishing.Service {
     private const string ICON_FILENAME = "google-photos.svg";

=== modified file 'plugins/pantheon-photos-publishing/PiwigoPublishing.vala'
--- plugins/pantheon-photos-publishing/PiwigoPublishing.vala	2016-06-15 15:06:01 +0000
+++ plugins/pantheon-photos-publishing/PiwigoPublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class PiwigoService : Object, Spit.Pluggable, Spit.Publishing.Service {
     private const string ICON_FILENAME = "piwigo.png";

=== modified file 'plugins/pantheon-photos-publishing/RESTSupport.vala'
--- plugins/pantheon-photos-publishing/RESTSupport.vala	2016-11-22 01:49:40 +0000
+++ plugins/pantheon-photos-publishing/RESTSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 extern Soup.Message soup_form_request_new_from_multipart (string uri, Soup.Multipart multipart);
 

=== modified file 'plugins/pantheon-photos-publishing/Resources.vala'
--- plugins/pantheon-photos-publishing/Resources.vala	2016-01-14 12:35:35 +0000
+++ plugins/pantheon-photos-publishing/Resources.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Resources {
 

=== modified file 'plugins/pantheon-photos-publishing/YouTubePublishing.vala'
--- plugins/pantheon-photos-publishing/YouTubePublishing.vala	2016-02-19 19:55:55 +0000
+++ plugins/pantheon-photos-publishing/YouTubePublishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class YouTubeService : Object, Spit.Pluggable, Spit.Publishing.Service {
     private const string ICON_FILENAME = "youtube.svg";

=== modified file 'plugins/pantheon-photos-publishing/shotwell-publishing.vala'
--- plugins/pantheon-photos-publishing/shotwell-publishing.vala	2016-01-14 12:35:35 +0000
+++ plugins/pantheon-photos-publishing/shotwell-publishing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // "core services" are: Facebook, Flickr, Picasa Web Albums, Piwigo and YouTube
 private class ShotwellPublishingCoreServices : Object, Spit.Module {

=== modified file 'plugins/pantheon-photos-transitions/BlindsEffect.vala'
--- plugins/pantheon-photos-transitions/BlindsEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/BlindsEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/ChessEffect.vala'
--- plugins/pantheon-photos-transitions/ChessEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/ChessEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/CircleEffect.vala'
--- plugins/pantheon-photos-transitions/CircleEffect.vala	2016-11-04 23:18:21 +0000
+++ plugins/pantheon-photos-transitions/CircleEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/CirclesEffect.vala'
--- plugins/pantheon-photos-transitions/CirclesEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/CirclesEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/ClockEffect.vala'
--- plugins/pantheon-photos-transitions/ClockEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/ClockEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/CrumbleEffect.vala'
--- plugins/pantheon-photos-transitions/CrumbleEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/CrumbleEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2010 Maxim Kartashev
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/FadeEffect.vala'
--- plugins/pantheon-photos-transitions/FadeEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/FadeEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2010 Maxim Kartashev
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/Resources.vala'
--- plugins/pantheon-photos-transitions/Resources.vala	2016-01-14 12:35:35 +0000
+++ plugins/pantheon-photos-transitions/Resources.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Resources {
 

=== modified file 'plugins/pantheon-photos-transitions/SlideEffect.vala'
--- plugins/pantheon-photos-transitions/SlideEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/SlideEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2010 Maxim Kartashev
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2010 Maxim Kartashev
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/SquaresEffect.vala'
--- plugins/pantheon-photos-transitions/SquaresEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/SquaresEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/StripesEffect.vala'
--- plugins/pantheon-photos-transitions/StripesEffect.vala	2015-11-24 15:36:14 +0000
+++ plugins/pantheon-photos-transitions/StripesEffect.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,22 @@
-/* Copyright 2013 Jens Bav
- * Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*               2013 Jens Bav
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 using Spit;
 

=== modified file 'plugins/pantheon-photos-transitions/shotwell-transitions.vala'
--- plugins/pantheon-photos-transitions/shotwell-transitions.vala	2016-02-19 19:55:55 +0000
+++ plugins/pantheon-photos-transitions/shotwell-transitions.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 private class ShotwellTransitions : Object, Spit.Module {
     private Spit.Pluggable[] pluggables = new Spit.Pluggable[0];

=== modified file 'samples/simple-plugin/simple-plugin.vala'
--- samples/simple-plugin/simple-plugin.vala	2015-11-26 01:53:49 +0000
+++ samples/simple-plugin/simple-plugin.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 extern const string _VERSION;
 

=== modified file 'src/AppDirs.vala'
--- src/AppDirs.vala	2016-01-14 12:35:35 +0000
+++ src/AppDirs.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 class AppDirs {
     private const string DEFAULT_DATA_DIR = "pantheon-photos";

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2016-11-22 01:49:40 +0000
+++ src/AppWindow.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class FullscreenWindow : PageWindow {
     public const int TOOLBAR_INVOCATION_MSEC = 250;

=== modified file 'src/Application.vala'
--- src/Application.vala	2017-01-08 16:54:49 +0000
+++ src/Application.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Application : Granite.Application {
     private static Application instance = null;

=== modified file 'src/BatchImport.vala'
--- src/BatchImport.vala	2014-08-08 21:13:09 +0000
+++ src/BatchImport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public enum ImportResult {
     SUCCESS,

=== modified file 'src/Box.vala'
--- src/Box.vala	2016-06-15 15:06:01 +0000
+++ src/Box.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public enum BoxLocation {
     OUTSIDE,

=== modified file 'src/CheckerboardLayout.vala'
--- src/CheckerboardLayout.vala	2015-09-07 18:23:48 +0000
+++ src/CheckerboardLayout.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 private class CheckerboardItemText {
     private static int one_line_height = 0;

=== modified file 'src/CollectionPage.vala'
--- src/CollectionPage.vala	2016-11-26 16:55:20 +0000
+++ src/CollectionPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class CollectionViewManager : ViewManager {
     private CollectionPage page;

=== modified file 'src/ColorTransformation.vala'
--- src/ColorTransformation.vala	2014-08-08 21:13:09 +0000
+++ src/ColorTransformation.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct RGBAnalyticPixel {
     public float red;

=== modified file 'src/CommandManager.vala'
--- src/CommandManager.vala	2014-08-15 07:12:57 +0000
+++ src/CommandManager.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public interface CommandDescription : Object {
     public abstract string get_name ();

=== modified file 'src/Commands.vala'
--- src/Commands.vala	2016-11-04 23:18:21 +0000
+++ src/Commands.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // PageCommand stores the current page when a Command is created.  Subclasses can call return_to_page ()
 // if it's appropriate to return to that page when executing an undo () or redo ().

=== modified file 'src/CustomComponents.vala'
--- src/CustomComponents.vala	2017-01-08 16:54:49 +0000
+++ src/CustomComponents.vala	2017-01-12 18:15:05 +0000
@@ -14,8 +14,8 @@
 *
 * You should have received a copy of the GNU General Public
 * License along with this program; if not, write to the
-* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-* Boston, MA 02111-1307, USA.
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
 */
 
 public class RGBHistogramManipulator : Gtk.DrawingArea {

=== modified file 'src/Debug.vala'
--- src/Debug.vala	2014-08-08 21:13:09 +0000
+++ src/Debug.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Debug {
 private const LogLevelFlags DEFAULT_LOG_MASK =

=== modified file 'src/DesktopIntegration.vala'
--- src/DesktopIntegration.vala	2014-08-25 01:57:28 +0000
+++ src/DesktopIntegration.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace DesktopIntegration {
 
@@ -77,4 +90,4 @@
     return str != null ? str : app_info.get_executable ();
 }
 
-}
\ No newline at end of file
+}

=== modified file 'src/Dialogs.vala'
--- src/Dialogs.vala	2016-01-28 20:55:24 +0000
+++ src/Dialogs.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // namespace for future migration of AppWindow alert and other question dialogs into single
 // place: http://trac.yorba.org/ticket/3452

=== modified file 'src/Dimensions.vala'
--- src/Dimensions.vala	2014-08-29 21:10:36 +0000
+++ src/Dimensions.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public enum ScaleConstraint {
     ORIGINAL,

=== modified file 'src/DirectoryMonitor.vala'
--- src/DirectoryMonitor.vala	2014-08-08 21:13:09 +0000
+++ src/DirectoryMonitor.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // DirectoryMonitor will monitor an entire directory for changes to all files and directories

=== modified file 'src/Event.vala'
--- src/Event.vala	2016-09-19 21:18:06 +0000
+++ src/Event.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class EventSourceCollection : ContainerSourceCollection {
     public signal void no_event_collection_altered ();

=== modified file 'src/Exporter.vala'
--- src/Exporter.vala	2014-08-08 21:13:09 +0000
+++ src/Exporter.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
-
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 public enum ExportFormatMode {
     UNMODIFIED,
     CURRENT,

=== modified file 'src/International.vala'
--- src/International.vala	2016-01-14 12:35:35 +0000
+++ src/International.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public const string TRANSLATABLE = "translatable";
 

=== modified file 'src/LibraryFiles.vala'
--- src/LibraryFiles.vala	2014-08-08 21:13:09 +0000
+++ src/LibraryFiles.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace LibraryFiles {
 

=== modified file 'src/LibraryMonitor.vala'
--- src/LibraryMonitor.vala	2014-08-08 21:13:09 +0000
+++ src/LibraryMonitor.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // LibraryMonitor uses DirectoryMonitor to track assets in the user's library directory and make

=== modified file 'src/MediaDataRepresentation.vala'
--- src/MediaDataRepresentation.vala	2016-11-04 23:18:21 +0000
+++ src/MediaDataRepresentation.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class BackingFileState {
     public string filepath;

=== modified file 'src/MediaInterfaces.vala'
--- src/MediaInterfaces.vala	2014-08-08 21:13:09 +0000
+++ src/MediaInterfaces.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // Going forward, Shotwell will use MediaInterfaces, which allow for various operations and features

=== modified file 'src/MediaMetadata.vala'
--- src/MediaMetadata.vala	2014-08-08 21:13:09 +0000
+++ src/MediaMetadata.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public abstract class MediaMetadata {
     public MediaMetadata () {

=== modified file 'src/MediaMonitor.vala'
--- src/MediaMonitor.vala	2016-11-04 23:18:21 +0000
+++ src/MediaMonitor.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class MonitorableUpdates {
     public Monitorable monitorable;

=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2016-12-08 22:24:20 +0000
+++ src/MediaPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class MediaSourceItem : CheckerboardItem {
     // preserve the same constructor arguments and semantics as CheckerboardItem so that we're

=== modified file 'src/MediaViewTracker.vala'
--- src/MediaViewTracker.vala	2014-08-08 21:13:09 +0000
+++ src/MediaViewTracker.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class MediaViewTracker : Core.ViewTracker {
     public MediaAccumulator all = new MediaAccumulator ();

=== modified file 'src/MetadataWriter.vala'
--- src/MetadataWriter.vala	2016-09-20 02:34:17 +0000
+++ src/MetadataWriter.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // MetadataWriter tracks LibraryPhotos for alterations to their metadata and commits those changes
 // in a timely manner to their backing files.  Because only the MetadataWriter knows when the

=== modified file 'src/Orientation.vala'
--- src/Orientation.vala	2014-08-08 21:13:09 +0000
+++ src/Orientation.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public enum Orientation {
     MIN = 1,

=== modified file 'src/Page.vala'
--- src/Page.vala	2016-11-22 01:49:40 +0000
+++ src/Page.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class InjectionGroup {
     public class Element {

=== modified file 'src/Photo.vala'
--- src/Photo.vala	2016-09-19 21:18:06 +0000
+++ src/Photo.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // Specifies how pixel data is fetched from the backing file on disk.  MASTER is the original
 // backing photo of any supported photo file format; SOURCE is either the master or the editable

=== modified file 'src/PhotoMonitor.vala'
--- src/PhotoMonitor.vala	2014-08-08 21:13:09 +0000
+++ src/PhotoMonitor.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 private class PhotoUpdates : MonitorableUpdates {
     public LibraryPhoto photo;

=== modified file 'src/PhotoPage.vala'
--- src/PhotoPage.vala	2016-11-21 04:25:34 +0000
+++ src/PhotoPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class ZoomBuffer : Object {
     private enum ObjectState {

=== modified file 'src/PixbufCache.vala'
--- src/PixbufCache.vala	2014-08-08 21:13:09 +0000
+++ src/PixbufCache.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class PixbufCache : Object {
     public delegate bool CacheFilter (Photo photo);

=== modified file 'src/Printing.vala'
--- src/Printing.vala	2014-08-08 21:13:09 +0000
+++ src/Printing.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public enum ContentLayout {
     STANDARD_SIZE,

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2017-01-08 16:54:49 +0000
+++ src/Resources.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Resources {
 public const string APP_TITLE = _("Photos");

=== modified file 'src/Screensaver.vala'
--- src/Screensaver.vala	2014-08-08 21:13:09 +0000
+++ src/Screensaver.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Screensaver {
     private uint32 cookie = 0;
@@ -25,4 +38,4 @@
         Application.get_instance ().uninhibit (cookie);
         cookie = 0;
     }
-}
\ No newline at end of file
+}

=== modified file 'src/SearchFilter.vala'
--- src/SearchFilter.vala	2016-09-24 02:53:36 +0000
+++ src/SearchFilter.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // Bitfield values used to specify which search bar features we want.
 [Flags]

=== modified file 'src/SlideshowPage.vala'
--- src/SlideshowPage.vala	2015-08-09 02:34:44 +0000
+++ src/SlideshowPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 class SlideshowPage : SinglePhotoPage {
     private const int READAHEAD_COUNT = 5;

=== modified file 'src/SortedList.vala'
--- src/SortedList.vala	2016-01-14 12:35:35 +0000
+++ src/SortedList.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public delegate int64 Comparator (void *a, void *b);
 

=== modified file 'src/Tag.vala'
--- src/Tag.vala	2016-11-04 23:18:21 +0000
+++ src/Tag.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class TagSourceCollection : ContainerSourceCollection {
     private Gee.HashMap<string, Tag> name_map = new Gee.HashMap<string, Tag> (Tag.hash_name_string,

=== modified file 'src/Thumbnail.vala'
--- src/Thumbnail.vala	2016-12-08 22:24:20 +0000
+++ src/Thumbnail.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Thumbnail : MediaSourceItem {
     // Collection properties Thumbnail responds to

=== modified file 'src/ThumbnailCache.vala'
--- src/ThumbnailCache.vala	2014-08-08 21:13:09 +0000
+++ src/ThumbnailCache.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Thumbnails {
     private Gee.HashMap<ThumbnailCache.Size, Gdk.Pixbuf> map = new Gee.HashMap<ThumbnailCache.Size,

=== modified file 'src/TimedQueue.vala'
--- src/TimedQueue.vala	2016-01-14 12:35:35 +0000
+++ src/TimedQueue.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // TimedQueue is a specialized collection class.  It holds items in order, but rather than being
 // manually dequeued, they are dequeued automatically after a specified amount of time has elapsed

=== modified file 'src/Tombstone.vala'
--- src/Tombstone.vala	2014-08-08 21:13:09 +0000
+++ src/Tombstone.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class TombstoneSourceCollection : DatabaseSourceCollection {
     private Gee.HashMap<File, Tombstone> file_map = new Gee.HashMap<File, Tombstone> (file_hash,

=== modified file 'src/UnityProgressBar.vala'
--- src/UnityProgressBar.vala	2015-06-08 08:05:59 +0000
+++ src/UnityProgressBar.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 #if UNITY_SUPPORT
 public class UnityProgressBar : Object {

=== modified file 'src/Upgrades.vala'
--- src/Upgrades.vala	2014-08-08 21:13:09 +0000
+++ src/Upgrades.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // Class for aggregating one-off "upgrade" tasks that occur at startup, such as
 // moving or deleting files. This occurs after the UI is shown, so it's not appropriate

=== modified file 'src/VideoMetadata.vala'
--- src/VideoMetadata.vala	2014-08-08 21:13:09 +0000
+++ src/VideoMetadata.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class VideoMetadata : MediaMetadata {
 

=== modified file 'src/VideoMonitor.vala'
--- src/VideoMonitor.vala	2014-08-08 21:13:09 +0000
+++ src/VideoMonitor.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 private class VideoUpdates : MonitorableUpdates {
     public Video video;

=== modified file 'src/VideoSupport.vala'
--- src/VideoSupport.vala	2016-09-19 21:18:06 +0000
+++ src/VideoSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public errordomain VideoError {
     FILE,          // there's a problem reading the video container file (doesn't exist, no read

=== modified file 'src/camera/Branch.vala'
--- src/camera/Branch.vala	2014-08-08 21:13:09 +0000
+++ src/camera/Branch.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Camera.Branch : Sidebar.Branch {
     internal static Icon? cameras_icon = null;

=== modified file 'src/camera/Camera.vala'
--- src/camera/Camera.vala	2014-08-08 21:13:09 +0000
+++ src/camera/Camera.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Camera {
 

=== modified file 'src/camera/CameraTable.vala'
--- src/camera/CameraTable.vala	2014-08-08 21:13:09 +0000
+++ src/camera/CameraTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DiscoveredCamera {
     public GPhoto.Camera gcamera;

=== modified file 'src/camera/GPhoto.vala'
--- src/camera/GPhoto.vala	2014-08-08 21:13:09 +0000
+++ src/camera/GPhoto.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public errordomain GPhotoError {
     LIBRARY

=== modified file 'src/camera/ImportPage.vala'
--- src/camera/ImportPage.vala	2016-12-08 22:24:20 +0000
+++ src/camera/ImportPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 private class ImportSourceCollection : SourceCollection {
     public ImportSourceCollection (string name) {

=== modified file 'src/config/Config.vala'
--- src/config/Config.vala	2014-08-22 05:24:46 +0000
+++ src/config/Config.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 /* This file is the master unit file for the Config unit.  It should be edited to include
  * whatever code is deemed necessary.

=== modified file 'src/config/ConfigurationInterfaces.vala'
--- src/config/ConfigurationInterfaces.vala	2016-09-20 00:44:41 +0000
+++ src/config/ConfigurationInterfaces.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public errordomain ConfigurationError {
     PROPERTY_HAS_NO_VALUE,

=== modified file 'src/config/GSettingsEngine.vala'
--- src/config/GSettingsEngine.vala	2016-09-20 00:44:41 +0000
+++ src/config/GSettingsEngine.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class GSettingsConfigurationEngine : ConfigurationEngine, GLib.Object {
     private const string ROOT_SCHEMA_NAME = "org.pantheon.photos";

=== modified file 'src/core/Alteration.vala'
--- src/core/Alteration.vala	2014-08-08 21:13:09 +0000
+++ src/core/Alteration.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // Alteration represents a description of what has changed in the DataObject (reported via the

=== modified file 'src/core/ContainerSourceCollection.vala'
--- src/core/ContainerSourceCollection.vala	2016-11-04 23:18:21 +0000
+++ src/core/ContainerSourceCollection.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // A ContainerSourceCollection is for DataSources which maintain links to one or more other
 // DataSources, assumed to be of a different type.  ContainerSourceCollection automates the task

=== modified file 'src/core/Core.vala'
--- src/core/Core.vala	2014-08-08 21:13:09 +0000
+++ src/core/Core.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 /* This file is the master unit file for the Core unit.  It should be edited to include
  * whatever code is deemed necessary.

=== modified file 'src/core/DataCollection.vala'
--- src/core/DataCollection.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataCollection.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DataCollection {
     public const int64 INVALID_OBJECT_ORDINAL = -1;

=== modified file 'src/core/DataObject.vala'
--- src/core/DataObject.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataObject.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // DataObject

=== modified file 'src/core/DataSet.vala'
--- src/core/DataSet.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataSet.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // DataSet

=== modified file 'src/core/DataSource.vala'
--- src/core/DataSource.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataSource.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // DataSource

=== modified file 'src/core/DataSourceTypes.vala'
--- src/core/DataSourceTypes.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataSourceTypes.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // Media sources

=== modified file 'src/core/DataView.vala'
--- src/core/DataView.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataView.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DataView : DataObject {
     private DataSource source;

=== modified file 'src/core/DataViewTypes.vala'
--- src/core/DataViewTypes.vala	2014-08-08 21:13:09 +0000
+++ src/core/DataViewTypes.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class ThumbnailView : DataView {
     public virtual signal void thumbnail_altered () {

=== modified file 'src/core/DatabaseSourceCollection.vala'
--- src/core/DatabaseSourceCollection.vala	2014-08-08 21:13:09 +0000
+++ src/core/DatabaseSourceCollection.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public delegate int64 GetSourceDatabaseKey (DataSource source);
 

=== modified file 'src/core/SourceCollection.vala'
--- src/core/SourceCollection.vala	2014-08-08 21:13:09 +0000
+++ src/core/SourceCollection.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public abstract class SourceCollection : DataCollection {
     private class DestroyCounter : Object {

=== modified file 'src/core/SourceHoldingTank.vala'
--- src/core/SourceHoldingTank.vala	2014-08-08 21:13:09 +0000
+++ src/core/SourceHoldingTank.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // A SourceHoldingTank is similar to the holding tank used by ContainerSourceCollection, but for
 // non-ContainerSources to be held offline from their natural SourceCollection (i.e. PhotoSources

=== modified file 'src/core/SourceInterfaces.vala'
--- src/core/SourceInterfaces.vala	2014-08-08 21:13:09 +0000
+++ src/core/SourceInterfaces.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // See the note in MediaInterfaces.vala for some thoughts on the theory of expanding Shotwell's
 // features via interfaces rather than class heirarchies.

=== modified file 'src/core/Tracker.vala'
--- src/core/Tracker.vala	2014-08-08 21:13:09 +0000
+++ src/core/Tracker.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Core {
 

=== modified file 'src/core/ViewCollection.vala'
--- src/core/ViewCollection.vala	2016-11-04 23:18:21 +0000
+++ src/core/ViewCollection.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // A ViewCollection holds DataView objects, which are view instances wrapping DataSource objects.
 // Thus, multiple views can exist of a single SourceCollection, each view displaying all or some

=== modified file 'src/core/util.vala'
--- src/core/util.vala	2014-08-08 21:13:09 +0000
+++ src/core/util.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 // SingletonCollection is a read-only collection designed to hold exactly one item in it.  This
 // is far more efficient than creating a dummy collection (such as ArrayList) merely to pass around

=== modified file 'src/db/DatabaseTable.vala'
--- src/db/DatabaseTable.vala	2016-01-14 12:35:35 +0000
+++ src/db/DatabaseTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public errordomain DatabaseError {
     ERROR,

=== modified file 'src/db/Db.vala'
--- src/db/Db.vala	2016-06-15 15:06:01 +0000
+++ src/db/Db.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Db {
 

=== modified file 'src/db/EventTable.vala'
--- src/db/EventTable.vala	2014-08-08 21:13:09 +0000
+++ src/db/EventTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct EventID {
     public const int64 INVALID = -1;

=== modified file 'src/db/PhotoTable.vala'
--- src/db/PhotoTable.vala	2016-09-20 02:34:17 +0000
+++ src/db/PhotoTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct PhotoID {
     public const int64 INVALID = -1;

=== modified file 'src/db/SavedSearchDBTable.vala'
--- src/db/SavedSearchDBTable.vala	2016-09-20 02:42:43 +0000
+++ src/db/SavedSearchDBTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct SavedSearchID {
     public const int64 INVALID = -1;

=== modified file 'src/db/TagTable.vala'
--- src/db/TagTable.vala	2014-08-08 21:13:09 +0000
+++ src/db/TagTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct TagID {
     public const int64 INVALID = -1;

=== modified file 'src/db/TombstoneTable.vala'
--- src/db/TombstoneTable.vala	2014-08-08 21:13:09 +0000
+++ src/db/TombstoneTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct TombstoneID {
     public const int64 INVALID = -1;

=== modified file 'src/db/VersionTable.vala'
--- src/db/VersionTable.vala	2014-08-08 21:13:09 +0000
+++ src/db/VersionTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class VersionTable : DatabaseTable {
     private static VersionTable instance = null;

=== modified file 'src/db/VideoTable.vala'
--- src/db/VideoTable.vala	2016-09-19 21:18:06 +0000
+++ src/db/VideoTable.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public struct VideoID {
     public const int64 INVALID = -1;

=== modified file 'src/direct/Direct.vala'
--- src/direct/Direct.vala	2016-01-24 21:11:54 +0000
+++ src/direct/Direct.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 /* This file is the master unit file for the Direct unit.  It should be edited to include
  * whatever code is deemed necessary.

=== modified file 'src/direct/DirectPhoto.vala'
--- src/direct/DirectPhoto.vala	2014-08-08 21:13:09 +0000
+++ src/direct/DirectPhoto.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DirectPhoto : Photo {
     private const int PREVIEW_BEST_FIT = 360;

=== modified file 'src/direct/DirectPhotoPage.vala'
--- src/direct/DirectPhotoPage.vala	2017-01-03 11:02:51 +0000
+++ src/direct/DirectPhotoPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DirectPhotoPage : EditingHostPage {
     private File initial_file;

=== modified file 'src/direct/DirectView.vala'
--- src/direct/DirectView.vala	2014-08-08 21:13:09 +0000
+++ src/direct/DirectView.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DirectView : DataView {
     private File file;

=== modified file 'src/direct/DirectWindow.vala'
--- src/direct/DirectWindow.vala	2016-04-20 01:15:36 +0000
+++ src/direct/DirectWindow.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DirectWindow : AppWindow {
     private DirectPhotoPage direct_photo_page;

=== modified file 'src/editing_tools/AdjustTool.vala'
--- src/editing_tools/AdjustTool.vala	2016-09-24 19:18:52 +0000
+++ src/editing_tools/AdjustTool.vala	2017-01-12 18:15:05 +0000
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2009-2013 Yorba Foundation
- *               2016 elementary LLC.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Felipe Escoto <[e-mail]>
- *
- */
+* Copyright (c) 2009-2013 Yorba Foundation
+*               2016 elementary LLC.
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Felipe Escoto <[e-mail]>
+*/
 
 public class EditingTools.AdjustTool : EditingTool {
     private const uint SLIDER_DELAY_MSEC = 100;

=== modified file 'src/editing_tools/CropTool.vala'
--- src/editing_tools/CropTool.vala	2016-11-22 01:49:40 +0000
+++ src/editing_tools/CropTool.vala	2017-01-12 18:15:05 +0000
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2009-2013 Yorba Foundation
- *               2016 elementary LLC.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Felipe Escoto <[e-mail]>
- *
- */
+* Copyright (c) 2009-2013 Yorba Foundation
+*               2016 elementary LLC.
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Felipe Escoto <[e-mail]>
+*/
 
 public class EditingTools.CropTool : EditingTool {
     private const double CROP_INIT_X_PCT = 0.15;

=== modified file 'src/editing_tools/EditingTools.vala'
--- src/editing_tools/EditingTools.vala	2016-09-24 19:18:52 +0000
+++ src/editing_tools/EditingTools.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 /* This file is the master unit file for the EditingTools unit.  It should be edited to include
  * whatever code is deemed necessary.

=== modified file 'src/editing_tools/RedEyeTool.vala'
--- src/editing_tools/RedEyeTool.vala	2016-11-22 01:49:40 +0000
+++ src/editing_tools/RedEyeTool.vala	2017-01-12 18:15:05 +0000
@@ -1,23 +1,24 @@
 /*
- * Copyright (c) 2009-2013 Yorba Foundation
- *               2016 elementary LLC.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authored by: Felipe Escoto <[e-mail]>
- *
- */
+* Copyright (c) 2009-2013 Yorba Foundation
+*               2016 elementary LLC.
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Felipe Escoto <[e-mail]>
+*/
 
 public struct EditingTools.RedeyeInstance {
     public const int MIN_RADIUS = 4;

=== modified file 'src/editing_tools/StraightenTool.vala'
--- src/editing_tools/StraightenTool.vala	2016-11-22 01:49:40 +0000
+++ src/editing_tools/StraightenTool.vala	2017-01-12 18:15:05 +0000
@@ -1,9 +1,21 @@
-
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace EditingTools {
 

=== modified file 'src/events/Branch.vala'
--- src/events/Branch.vala	2014-08-08 21:13:09 +0000
+++ src/events/Branch.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Events.Branch : Sidebar.Branch {
     internal static Icon open_icon;

=== modified file 'src/events/EventDirectoryItem.vala'
--- src/events/EventDirectoryItem.vala	2014-08-08 21:13:09 +0000
+++ src/events/EventDirectoryItem.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 class EventDirectoryItem : CheckerboardItem {
     private static int CROPPED_SCALE {

=== modified file 'src/events/EventPage.vala'
--- src/events/EventPage.vala	2014-12-14 14:53:26 +0000
+++ src/events/EventPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class EventPage : CollectionPage {
     private Event page_event;

=== modified file 'src/events/Events.vala'
--- src/events/Events.vala	2014-08-08 21:13:09 +0000
+++ src/events/Events.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Events {
 

=== modified file 'src/events/EventsDirectoryPage.vala'
--- src/events/EventsDirectoryPage.vala	2014-09-07 01:47:31 +0000
+++ src/events/EventsDirectoryPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public abstract class EventsDirectoryPage : CheckerboardPage {
     public class EventDirectoryManager : ViewManager {

=== modified file 'src/library/Branch.vala'
--- src/library/Branch.vala	2014-12-14 14:53:26 +0000
+++ src/library/Branch.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.Branch : Sidebar.Branch {
     private const string POSITION_DATA = "x-photos-entry-position";

=== modified file 'src/library/FlaggedPage.vala'
--- src/library/FlaggedPage.vala	2016-09-19 21:18:06 +0000
+++ src/library/FlaggedPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class FlaggedPage : CollectionPage {
     public const string NAME = _ ("Flagged");

=== modified file 'src/library/FlaggedSidebarEntry.vala'
--- src/library/FlaggedSidebarEntry.vala	2014-08-08 21:13:09 +0000
+++ src/library/FlaggedSidebarEntry.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.FlaggedSidebarEntry : Library.HideablePageEntry, Sidebar.InternalDropTargetEntry {
     public FlaggedSidebarEntry () {

=== modified file 'src/library/ImportQueuePage.vala'
--- src/library/ImportQueuePage.vala	2016-11-21 04:25:34 +0000
+++ src/library/ImportQueuePage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class ImportQueuePage : SinglePhotoPage {
     public const string NAME = _ ("Importing...");

=== modified file 'src/library/ImportQueueSidebarEntry.vala'
--- src/library/ImportQueueSidebarEntry.vala	2014-08-08 21:13:09 +0000
+++ src/library/ImportQueueSidebarEntry.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.ImportQueueSidebarEntry : Library.HideablePageEntry {
     public ImportQueueSidebarEntry () {

=== modified file 'src/library/LastImportPage.vala'
--- src/library/LastImportPage.vala	2014-08-08 21:13:09 +0000
+++ src/library/LastImportPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class LastImportPage : CollectionPage {
     public const string NAME = _ ("Last Import");

=== modified file 'src/library/LastImportSidebarEntry.vala'
--- src/library/LastImportSidebarEntry.vala	2014-08-08 21:13:09 +0000
+++ src/library/LastImportSidebarEntry.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.LastImportSidebarEntry : Library.HideablePageEntry {
     public LastImportSidebarEntry () {

=== modified file 'src/library/Library.vala'
--- src/library/Library.vala	2016-01-14 12:35:35 +0000
+++ src/library/Library.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Library {
 

=== modified file 'src/library/LibraryWindow.vala'
--- src/library/LibraryWindow.vala	2017-01-02 23:59:16 +0000
+++ src/library/LibraryWindow.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class LibraryWindow : AppWindow {
     public const int SIDEBAR_MIN_WIDTH = 96;

=== modified file 'src/library/OfflinePage.vala'
--- src/library/OfflinePage.vala	2016-11-21 04:25:34 +0000
+++ src/library/OfflinePage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class OfflinePage : CheckerboardPage {
     public const string NAME = _ ("Missing Files");

=== modified file 'src/library/OfflineSidebarEntry.vala'
--- src/library/OfflineSidebarEntry.vala	2014-08-08 21:13:09 +0000
+++ src/library/OfflineSidebarEntry.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.OfflineSidebarEntry : Library.HideablePageEntry {
     public OfflineSidebarEntry () {

=== modified file 'src/library/PhotosPage.vala'
--- src/library/PhotosPage.vala	2016-09-19 21:18:06 +0000
+++ src/library/PhotosPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2014 Pantheon Photos Developer (http://launchpad.net/pantheon-photos)
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2014-2017 elementary LLC. (http://launchpad.net/pantheon-photos)
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.PhotosEntry : Sidebar.SimplePageEntry {
     protected Icon icon = new ThemedIcon (Resources.ICON_PHOTOS_PAGE);

=== modified file 'src/library/RawsPage.vala'
--- src/library/RawsPage.vala	2016-11-24 18:54:57 +0000
+++ src/library/RawsPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2014 Pantheon Photos Developer (http://launchpad.net/pantheon-photos)
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2014-2017 elementary LLC. (http://launchpad.net/pantheon-photos)
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.RawsEntry : Sidebar.SimplePageEntry {
     protected Icon icon = new ThemedIcon (Resources.ICON_RAW_PAGE);

=== modified file 'src/library/TopDisplay.vala'
--- src/library/TopDisplay.vala	2016-01-11 23:54:43 +0000
+++ src/library/TopDisplay.vala	2017-01-12 18:15:05 +0000
@@ -1,19 +1,20 @@
-/* Copyright 2016 elementary LLC
-*
-* This file is part of Pantheon Photos.
-*
-* Pantheon Photos 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.1 of the
-* License, or (at your option) any later version.
-*
-* Pantheon Photos is distributed in the hope that it will be
-* useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
-* Public License for more details.
-*
-* You should have received a copy of the GNU Lesser General Public License along
-* with Pantheon Photos. If not, see http://www.gnu.org/licenses/.
+/*
+* Copyright (c) 2016 elementary LLC. (http://launchpad.net/pantheon-photos)
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
 */
 
 public class TopDisplay : Gtk.Stack {

=== modified file 'src/library/TrashPage.vala'
--- src/library/TrashPage.vala	2016-09-19 21:18:06 +0000
+++ src/library/TrashPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class TrashPage : CheckerboardPage {
     public const string NAME = _ ("Trash");

=== modified file 'src/library/TrashSidebarEntry.vala'
--- src/library/TrashSidebarEntry.vala	2014-08-08 21:13:09 +0000
+++ src/library/TrashSidebarEntry.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.TrashSidebarEntry : Sidebar.SimplePageEntry, Sidebar.InternalDropTargetEntry {
     private static Icon? full_icon = null;

=== modified file 'src/library/VideosPage.vala'
--- src/library/VideosPage.vala	2016-09-19 21:18:06 +0000
+++ src/library/VideosPage.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2014 Pantheon Photos Developer (http://launchpad.net/pantheon-photos)
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2014-2017 elementary LLC. (http://launchpad.net/pantheon-photos)
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class Library.VideosEntry :  Library.HideablePageEntry {
     protected Icon icon = new ThemedIcon (Resources.ICON_VIDEOS_PAGE);

=== modified file 'src/main.vala'
--- src/main.vala	2016-06-27 10:37:18 +0000
+++ src/main.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2009-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2009-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 enum ShotwellCommand {
     // user-defined commands must be positive ints

=== modified file 'src/photos/BmpSupport.vala'
--- src/photos/BmpSupport.vala	2014-08-08 21:13:09 +0000
+++ src/photos/BmpSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Photos {
 

=== modified file 'src/photos/GRaw.vala'
--- src/photos/GRaw.vala	2014-08-08 21:13:09 +0000
+++ src/photos/GRaw.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace GRaw {
 

=== modified file 'src/photos/GdkSupport.vala'
--- src/photos/GdkSupport.vala	2014-08-08 21:13:09 +0000
+++ src/photos/GdkSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public abstract class GdkReader : PhotoFileReader {
     public GdkReader (string filepath, PhotoFileFormat file_format) {

=== modified file 'src/photos/GifSupport.vala'
--- src/photos/GifSupport.vala	2017-01-01 21:56:56 +0000
+++ src/photos/GifSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 class GifFileFormatProperties : PhotoFileFormatProperties {
     private static string[] KNOWN_EXTENSIONS = { "gif" };

=== modified file 'src/photos/JfifSupport.vala'
--- src/photos/JfifSupport.vala	2014-08-08 21:13:09 +0000
+++ src/photos/JfifSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class JfifFileFormatDriver : PhotoFileFormatDriver {
     private static JfifFileFormatDriver instance = null;

=== modified file 'src/photos/PhotoFileAdapter.vala'
--- src/photos/PhotoFileAdapter.vala	2014-08-08 21:13:09 +0000
+++ src/photos/PhotoFileAdapter.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // PhotoFileAdapter

=== modified file 'src/photos/PhotoFileFormat.vala'
--- src/photos/PhotoFileFormat.vala	2017-01-01 12:35:06 +0000
+++ src/photos/PhotoFileFormat.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public errordomain PhotoFormatError {
     READ_ONLY

=== modified file 'src/photos/PhotoFileSniffer.vala'
--- src/photos/PhotoFileSniffer.vala	2014-08-08 21:13:09 +0000
+++ src/photos/PhotoFileSniffer.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class DetectedPhotoInformation {
     public PhotoFileFormat file_format = PhotoFileFormat.UNKNOWN;

=== modified file 'src/photos/PhotoMetadata.vala'
--- src/photos/PhotoMetadata.vala	2016-09-20 00:44:41 +0000
+++ src/photos/PhotoMetadata.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 //
 // PhotoMetadata

=== modified file 'src/photos/Photos.vala'
--- src/photos/Photos.vala	2014-08-08 21:13:09 +0000
+++ src/photos/Photos.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 /* This file is the master unit file for the Photo unit.  It should be edited to include
  * whatever code is deemed necessary.

=== modified file 'src/photos/PngSupport.vala'
--- src/photos/PngSupport.vala	2014-08-08 21:13:09 +0000
+++ src/photos/PngSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 class PngFileFormatProperties : PhotoFileFormatProperties {
     private static string[] KNOWN_EXTENSIONS = { "png" };

=== modified file 'src/photos/RawSupport.vala'
--- src/photos/RawSupport.vala	2014-08-08 21:13:09 +0000
+++ src/photos/RawSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2010-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2010-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 public class RawFileFormatDriver : PhotoFileFormatDriver {
     private static RawFileFormatDriver instance = null;

=== modified file 'src/photos/TiffSupport.vala'
--- src/photos/TiffSupport.vala	2014-08-08 21:13:09 +0000
+++ src/photos/TiffSupport.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU LGPL (version 2.1 or later).
- * See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Photos {
 

=== modified file 'src/plugins/ManifestWidget.vala'
--- src/plugins/ManifestWidget.vala	2016-02-19 19:55:55 +0000
+++ src/plugins/ManifestWidget.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*/
 
 namespace Plugins {
 

=== modified file 'src/plugins/Plugins.vala'
--- src/plugins/Plugins.vala	2014-08-08 21:13:09 +0000
+++ src/plugins/Plugins.vala	2017-01-12 18:15:05 +0000
@@ -1,8 +1,21 @@
-/* Copyright 2011-2013 Yorba Foundation
- *
- * This software is licensed under the GNU Lesser General Public License
- * (version 2.1 or later).  See the COPYING file in this distribution.
- */
+/*
+* Copyright (c) 2011-2013 Yorba Foundation
+*
+* 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.1 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* General Public License for more details.
+*
+* You should have received a copy of the GNU General Public