Hello,

> I released version 1.2.1 as a bugfix release.

thank you, Klaus.

the attachment completes this, i hope.

It updates:

- ChangeLog
- NEWS (well, sort of)
- README (sort of)
- src/Makefile.am (to include src/glua.h)
- configure.in (to update the version number)

"make dist" now creates geeqie-1.2.1.tar.gz, which compiles successfully.


Please create the .tar.gz, sign it, and upload both signature and tar.gz
to geeqie.org.

I also want to suggest that "someone" updates the sourceforget site with
a number of links to geeqie.org. The more, the better.

Regards, Uwe
commit 448df741e0ce7642c8bed2c12ae872fe05650d86
Author: Uwe Ohse <u...@ohse.de>
Date:   Wed Aug 12 22:59:14 2015 +0200

    really update to 1.2.1

diff --git a/ChangeLog b/ChangeLog
index 1214971..1ad1734 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,92 @@
+commit 75812f64fe5f5e548f9c55f033f94cf5264a7912
+Merge: 4749987 760fe40 80ef0b1 a22d036
+Author: Klaus Ethgen <kl...@ethgen.de>
+Date:   Tue Aug 11 23:26:32 2015 +0100
+
+    Merge requests 12, 13 and 14 into master
+    
+    * origin/merge-requests/12:
+      Fix typo in debug messages
+    
+    * origin/merge-requests/13:
+      fix include statements for large file support on 32-bit
+    
+    * origin/merge-requests/14:
+      Add support for Green-Magenta and Yellow-Blue anaglyph modes
+
+commit 4749987ff8a0e32047a2db6b0ffb02b1ed27e192
+Author: Michael Schwendt <mschwe...@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 70bc3c82b656397e0d02214cf2741e0b64131f5e
+Author: Klaus Ethgen <kl...@ethgen.de>
+Date:   Tue Aug 11 23:19:25 2015 +0100
+
+    Remove over optimization
+    
+    Thanks Uwe Ohse <u...@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 a22d0360d80834054c3333e02b08b0d2859ecb29
+Author: Alexey Akishin <a...@science.su>
+Date:   Mon Dec 8 11:46:18 2014 +0000
+
+    Add support for Green-Magenta and Yellow-Blue anaglyph modes
+
+commit 80ef0b166b97cc24588ac16360517d97ed1f7a30
+Author: Michael Schwendt <mschwe...@fedoraproject.org>
+Date:   Sun Nov 30 13:09:37 2014 +0100
+
+    fix include statements for large file support on 32-bit
+
+commit 760fe40cd4ed56a80f2c6b8f93e699951357ded6
+Author: Volker Grabsch <v...@njh.eu>
+Date:   Tue Nov 4 08:41:30 2014 +0100
+
+    Fix typo in debug messages
+    
+    vindow -> window
+
+commit a1afabd3ce740872a857234b91eeb64fcf239f6a
+Author: Klaus Ethgen <kl...@ethgen.de>
+Date:   Sat Sep 27 12:07:10 2014 +0100
+
+    Fix lcms2 integration
+    
+    Thanks Michael Schwendt <mschwe...@gmail.com> for the bug reporting and
+    the patch.
+
+commit ca42d65be013f9bcded858b656c594d45c7f8e1d
+Author: Klaus Ethgen <kl...@ethgen.de>
+Date:   Sun Jul 20 14:16:02 2014 +0100
+
+    updated ChangeLog file
+
 commit d6c33614c45e38845a0bcfd702e38e18d5dcec0b
 Merge: e79d354 dcf1a1b 0ac5716
 Author: Klaus Ethgen <kl...@ethgen.de>
diff --git a/NEWS b/NEWS
index 0c3fb49..23458bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,17 @@
+Geeqie 1.21
+===========
+
+- this file is maintained poorly. Sorry.
+- Add support for Green-Magenta and Yellow-Blue anaglyph modes (stereo)
+- bug fixes, portability enhancements.
+
+
+Geeqie 1.2
+==========
+
+- mostly a cleanup and bug fix release.
+
+
 Geeqie 1.1
 ==========
 
diff --git a/README b/README
index 935e0fe..0d713f2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 ###################################################################
-##                            Geeqie 1.1                         ##
+##                            Geeqie 1.21                        ##
 ##                                                               ##
-##              Copyright (C) 2008 - 2012 The Geeqie Team        ##
+##              Copyright (C) 2008 - 2015 The Geeqie Team        ##
 ##              Copyright (C) 1999 - 2006 John Ellis.            ##
 ##                                                               ##
 ##                      Use at your own risk!                    ##
@@ -102,10 +102,8 @@ See http://geeqie.wiki.sourceforge.net/new_features
       dimensions, or image content similarity.
     - EXIF support.
 
-  Geeqie 1.1:
-    - support for stereoscopic images
-      - input: side-by-side (JPS) and MPO format
-      - output: single image, anaglyph, SBS, mirror, SBS half size (3DTV)
+  Geeqie 1.21:
+    - bugfix release
 
 ======== Documentation (brief)                         [section:documentation]
 
diff --git a/configure.in b/configure.in
index c5b726c..67896b7 100644
--- 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.21, geeqie-devel@lists.sourceforge.net)
 
 # Check for rightly dirs
 AC_CONFIG_SRCDIR([src/main.c])
diff --git a/src/Makefile.am b/src/Makefile.am
index 02cfeec..a90429a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -158,6 +158,7 @@ geeqie_SOURCES = \
 	format_raw.h	\
 	fullscreen.c	\
 	fullscreen.h	\
+	glua.h		\
 	histogram.c	\
 	histogram.h	\
 	history_list.c	\
------------------------------------------------------------------------------
_______________________________________________
Geeqie-devel mailing list
Geeqie-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/geeqie-devel

Reply via email to