From 8ef91f8df9586bc2b1634124cae6cc7fe2952b36 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 3 Oct 2013 13:02:20 +0100
Subject: [PATCH] version bump ready for 7.36

---
 ChangeLog                      |  3 +++
 TODO                           | 26 --------------------------
 configure.ac                   | 10 +++++-----
 tools/Makefile.am              |  4 ++--
 tools/{vips-7.34 => vips-7.36} |  0
 5 files changed, 10 insertions(+), 33 deletions(-)
 rename tools/{vips-7.34 => vips-7.36} (100%)

diff --git a/ChangeLog b/ChangeLog
index 0dae0f96..6a327143 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+3/10/13	started 7.36.0
+- version bump
+
 1/7/13 started 7.35.0
 - added vips_matrixload() and vips_matrixsave(), load and save vips mat format
 - rename image arrays as image matrices ... INTERPRETATION_ARRAY ->
diff --git a/TODO b/TODO
index 51e500a1..6bed42e7 100644
--- a/TODO
+++ b/TODO
@@ -1,29 +1,3 @@
-Blocking
-========
-
-- is vips_hist_local() correct? it seems to leave white dots everywhere
-  on the sarto_ng test image
-
-  try a 1x1 window, it be identity operation, I think
-
-- could VipsConversion now have an @in member?
-
-  we've moved all the no-input ones of to create now, I think
-
-  we several many-input ones though, eg. bandary
-
-- why is memuse so high?
-
-	$ vips shrink wtc.png x.v 230 230
-	memory: high-water mark 322.13 MB
-
-  because we have so many threads on the work machine, try:
-
-  	$ vips shrink wtc.png x.v 230 230 --vips-concurrency=1
-	memory: high-water mark 45.46 MB
-
-- check speed and memuse test, are we really 10mb? have a note that memuse can
-  be much higher
 
 Next version
 ============
diff --git a/configure.ac b/configure.ac
index ffedc5b5..938a622d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-AC_INIT([vips], [7.35.0], [vipsip@jiscmail.ac.uk])
+AC_INIT([vips], [7.36.0], [vipsip@jiscmail.ac.uk])
 # required for gobject-introspection
 AC_PREREQ(2.62)
 
@@ -16,7 +16,7 @@ AC_CONFIG_MACRO_DIR([m4])
 
 # user-visible library versioning
 m4_define([vips_major_version], [7])
-m4_define([vips_minor_version], [35])
+m4_define([vips_minor_version], [36])
 m4_define([vips_micro_version], [0])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
@@ -36,9 +36,9 @@ VIPS_VERSION_STRING=$VIPS_VERSION-`date`
 #   binary interface changes backwards compatible?: increment age
 #   binary interface changes not backwards compatible?: reset age to 0
 
-LIBRARY_CURRENT=34
-LIBRARY_REVISION=5
-LIBRARY_AGE=3
+LIBRARY_CURRENT=35
+LIBRARY_REVISION=0
+LIBRARY_AGE=0
 
 # patched into include/vips/version.h
 AC_SUBST(VIPS_VERSION)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 25d4312f..5031b47f 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -26,10 +26,10 @@ bin_SCRIPTS = \
 	batch_image_convert \
 	batch_rubber_sheet \
 	batch_crop \
-	vips-7.34
+	vips-7.36
 
 EXTRA_DIST = \
-	vips-7.34 \
+	vips-7.36 \
 	light_correct.in \
 	shrink_width.in \
 	batch_image_convert.in \
diff --git a/tools/vips-7.34 b/tools/vips-7.36
similarity index 100%
rename from tools/vips-7.34
rename to tools/vips-7.36