Updating changelog and other files for new release

diff --git a/ChangeLog b/ChangeLog
index 1214971..84f0cd1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+commit 2c2e0f477a0fb9524235c90f9f7140e60e97319c
+Author: Michael Schwendt <mschwendt@gmail.com>
+Date:   Tue Aug 11 23:21:37 2015 +0100
+
+    NULL-ptr crash in image_read_ahead_done_cb()
+    
+    It's not easy to reproduce, but if one is mad and follows the steps and
+    presses the keys a few dozens times, there's a slight chance one can
+    trigger it. Not much to investigate it further.
+    
+    Forwarding from Sami Farin 2015-08-07 16:40:44 EDT:
+    
+     | to reproduce: quickly keep pressing f (fullscreen) and page down
+     | (next file) keys.
+     |
+     | attached patch is a kind of workaround, I did not inspect further
+     | is this threading issue etc
+    
+    Full backtrace: https://bugzilla.redhat.com/attachment.cgi?id=1027647
+    
+    Patch: https://bugzilla.redhat.com/attachment.cgi?id=1060482&action=diff&context=patch&collapsed=&headers=1&format=raw
+
+commit 0dfeec9a9a7298d4c5389bb9151a5ad8a8ab9ed4
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Tue Aug 11 23:19:25 2015 +0100
+
+    Remove over optimization
+    
+    Thanks Uwe Ohse <uwe@ohse.de> for this find.
+    
+    "it looks good, but is dead slow, for each and every call to
+    gdk_cairo_set_source_pixbuf takes at least 15 milliseconds on my not
+    really slow machine, which amounts to over 2 seconds if 144 tiles have
+    to be drawn (tested with many jpegs and a few large pngs).
+    
+    i propose to remove this optimization until someone fixes it. After
+    removal geeqie is fast, again."
+
+commit 3a1908c1db02aad60f9dc0f770c0761ef6499be8
+Author: Klaus Ethgen <Klaus@Ethgen.de>
+Date:   Sat Sep 27 12:07:10 2014 +0100
+
+    Fix lcms2 integration
+    
+    Thanks Michael Schwendt <mschwendt@gmail.com> for the bug reporting and
+    the patch.
+
 commit d6c33614c45e38845a0bcfd702e38e18d5dcec0b
 Merge: e79d354 dcf1a1b 0ac5716
 Author: Klaus Ethgen <Klaus@Ethgen.de>

diff --git a/NEWS b/NEWS
index 0c3fb49..7ea5b22 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,10 @@
+Geeqie 1.2
+==========
+
+- Support for lcms2
+- Basic support for lua scripting (still documentation needed)
+- Several bugfixes
+
 Geeqie 1.1
 ==========
 

diff --git a/README b/README
index 935e0fe..b169518 100644 (file)
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 ###################################################################
-##                            Geeqie 1.1                         ##
+##                          Geeqie 1.2.1                         ##
 ##                                                               ##
-##              Copyright (C) 2008 - 2012 The Geeqie Team        ##
+##              Copyright (C) 2008 - 2014 The Geeqie Team        ##
 ##              Copyright (C) 1999 - 2006 John Ellis.            ##
 ##                                                               ##
 ##                      Use at your own risk!                    ##
@@ -51,17 +51,18 @@ geeqie-devel@lists.sourceforge.net
     GTK+ 2.20: ftp://ftp.gtk.org/pub/gtk
 
   Optional libraries:
-    lcms, for color management support: http://www.littlecms.com
+    lcms or lcms2, for color management support: http://www.littlecms.com
         (disable with configure option: '--without-lcms')
     exiv2, for enhanced exif support: http://www.exiv2.org/
         (disable with configure option: '--without-exiv2')
         - due to fast development, newer versions work significantly better
         FIXME: minimal version ?
     lirc, for remote control support: http://www.lirc.org/
-       (disable with configure option: '--disable-lirc')
+       (disable with configure option: '--disable-lirc')
     libchamplain - experimental map support, dissabled by default
         http://projects.gnome.org/libchamplain/
         WARNING: this library has a lot of dependencise
+    lua - Support for lua scripting
 
 ======== Notes and changes for this release            [section:release_notes]
 

diff --git a/configure.in b/configure.in
index c5b726c..51c061b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -15,7 +15,7 @@ dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 dnl GNU General Public License for more details.
 
 AC_PREREQ(2.57)
-AC_INIT(geeqie, 1.1, geeqie-devel@lists.sourceforge.net)
+AC_INIT(geeqie, 1.2.1, geeqie-devel@lists.sourceforge.net)
 
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])