[shotwell] Prepare shotwell 0.26.0

[Jens Georg <jensgeorg src gnome org>]

commit b83a820fc0a3f85f22484f3275adf086ad8e2ca3
Author: Jens Georg <mail jensge org>
Date:   Mon Mar 20 13:41:40 2017 +0100

    Prepare shotwell 0.26.0
    
    Signed-off-by: Jens Georg <mail jensge org>

 NEWS                             |   31 +++++++++++++++++++++++++++++++
 configure.ac                     |    4 ++--
 debian/changelog                 |    8 ++++++++
 icons/Makefile.am                |    1 +
 icons/about-aachen.jpg           |  Bin 0 -> 52666 bytes
 org.gnome.Shotwell.gresource.xml |    1 +
 src/AppWindow.vala               |    4 +++-
 src/Resources.vala               |    3 ++-
 8 files changed, 48 insertions(+), 4 deletions(-)
---
diff --git a/NEWS b/NEWS
index 7d9f030..82eba85 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+Shotwell 0.26.0 - 20 Mar 2017
+  * Translation updates
+  * Fix build on non-glibc systems
+  * Fix missing optimisation in standard configure call
+
+Bugs fixed in this release:
+ - https://bugzilla.gnome.org/show_bug.cgi?id=779844
+ - https://bugzilla.gnome.org/show_bug.cgi?id=780116
+
+All contributors to this release:
+ - Jens Georg <mail jensge org>
+ - Piotr Drąg <piotrdrag gmail com>
+ - Mario Blättermann <mario blaettermann gmail com>
+ - Marek Černocký <marek manet cz>
+ - Josef Andersson <l10nl18nsweja gmail com>
+ - gogo <trebelnik2 gmail com>
+ - Daniel Mustieles <daniel mustieles gmail com>
+ - Baurzhan Muftakhidinov <baurthefirst gmail com>
+ - Balázs Úr <urbalazs gmail com>
+
+Added/updated translations
+ - cs, courtesy of Marek Černocký
+ - de, courtesy of Mario Blättermann
+ - es, courtesy of Daniel Mustieles
+ - hr, courtesy of gogo
+ - hu, courtesy of Balázs Úr
+ - kk, courtesy of Baurzhan Muftakhidinov
+ - lv, courtesy of Rūdolfs Mazurs
+ - pl, courtesy of Piotr Drąg
+ - sv, courtesy of Josef Andersson
+
 Shotwell 0.25.92 - 13 Mar 2017
   * Fix navigation issue when deleting image in fullscreen view
   * Fix toolbox not visible on Mate in fullscreen view
diff --git a/configure.ac b/configure.ac
index 7b1d77a..21e87f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ dnl ***********************************************************************
 dnl Define Versioning Information
 dnl ***********************************************************************
 m4_define([major_version],[0])
-m4_define([minor_version],[25])
-m4_define([micro_version],[92])
+m4_define([minor_version],[26])
+m4_define([micro_version],[0])
 m4_define([package_version],[major_version.minor_version.micro_version])
 m4_define([bug_report_url],[https://bugzilla.gnome.org/enter_bug.cgi?product=shotwell])
 m4_define([api_version],[major_version])
diff --git a/debian/changelog b/debian/changelog
index 33ca9b6..5db54cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+shotwell (0.26.0-0~jensge1~zesty1) zesty; urgency=medium
+
+  * Translation updates
+  * Fix build on non-glibc systems
+  * Fix missing optimisation in standard configure call
+
+ -- Jens Georg <mail jensge org>  Mon, 20 Mar 2017 13:40:51 +0100
+
 shotwell (0.25.92-0~jensge1~zesty1) zesty; urgency=medium
 
   * Fix navigation issue when deleting image in fullscreen view
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 4245acd..59f6087 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -1,4 +1,5 @@
 dist_noinst_DATA = \
+       about-aachen.jpg \
        all-rejected.png \
        crop-pivot-reticle.png \
        crop.svg \
diff --git a/icons/about-aachen.jpg b/icons/about-aachen.jpg
new file mode 100644
index 0000000..924cfb9
Binary files /dev/null and b/icons/about-aachen.jpg differ
diff --git a/org.gnome.Shotwell.gresource.xml b/org.gnome.Shotwell.gresource.xml
index 25586da..64335e8 100644
--- a/org.gnome.Shotwell.gresource.xml
+++ b/org.gnome.Shotwell.gresource.xml
@@ -26,6 +26,7 @@
       <file preprocess="xml-stripblanks">ui/tags.ui</file>
       <file preprocess="xml-stripblanks">ui/trash.ui</file>
       <!-- Icons -->
+      <file>icons/about-aachen.jpg</file>
       <file>icons/all-rejected.png</file>
       <file>icons/crop-pivot-reticle.png</file>
       <file>icons/crop.svg</file>
diff --git a/src/AppWindow.vala b/src/AppWindow.vala
index 8b24baf..a151c9a 100644
--- a/src/AppWindow.vala
+++ b/src/AppWindow.vala
@@ -590,8 +590,9 @@ public abstract class AppWindow : PageWindow {
     public abstract string get_app_role();
 
     protected void on_about() {
+        const string[] artists = { "Aachen logo under public domain license 
https://www.flickr.com/photos/30784528@N04/10860988196/";, null };
         Gtk.show_about_dialog(this,
-            "version", Resources.APP_VERSION,
+            "version", Resources.APP_VERSION + " \u2013 \"Aachen\"",
             "comments", get_app_role(),
             "copyright", Resources.COPYRIGHT,
             "website", Resources.HOME_URL,
@@ -599,6 +600,7 @@ public abstract class AppWindow : PageWindow {
             "website-label", _("Visit the Shotwell web site"),
             "authors", Resources.AUTHORS,
             "logo", Resources.get_icon(Resources.ICON_ABOUT_LOGO, -1),
+            "artists", artists,
             "translator-credits", _("translator-credits"),
             null
         );
diff --git a/src/Resources.vala b/src/Resources.vala
index 4e39d32..e26448a 100644
--- a/src/Resources.vala
+++ b/src/Resources.vala
@@ -87,7 +87,8 @@ along with Shotwell; if not, write to the Free Software Foundation, Inc.,
     public const string GO_PREVIOUS = "go-previous";
 
     
-    public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    //public const string ICON_ABOUT_LOGO = "shotwell-street.jpg";
+    public const string ICON_ABOUT_LOGO = "about-aachen.jpg";
     public const string ICON_GENERIC_PLUGIN = "generic-plugin.png";
     public const string ICON_SLIDESHOW_EXTENSION_POINT = "slideshow-extension-point";
     public const string ICON_RATING_REJECTED = "rejected.svg";