From 97a5ff1607c4f0088088de2d223e0ad56270799c Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Tue, 30 Nov 2010 22:01:45 +0000
Subject: [PATCH] branch for 7.24

---
 ChangeLog                              | 3 +++
 configure.in                           | 6 +++---
 doc/src/vipsmanual.tex                 | 4 ++--
 tools/scripts/Makefile.am              | 4 ++--
 tools/scripts/{vips-7.23 => vips-7.24} | 0
 vips-7.23.pc.in => vips-7.24.pc.in     | 0
 vipsCC-7.23.pc.in => vipsCC-7.24.pc.in | 0
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename tools/scripts/{vips-7.23 => vips-7.24} (100%)
 rename vips-7.23.pc.in => vips-7.24.pc.in (100%)
 rename vipsCC-7.23.pc.in => vipsCC-7.24.pc.in (100%)

diff --git a/ChangeLog b/ChangeLog
index 14651d7e..31a28633 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+30/11/10 started 7.24.0
+- bump for new stable
+
 18/7/10 started 7.23.0
 - im_vips2bufjpeg() writes to a linked list, so it will work for any size
   image and header
diff --git a/configure.in b/configure.in
index 913b27ff..872cd84f 100644
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_MACRO_DIR(m4)
 
 # user-visible library versioning
 m4_define([vips_major_version], [7])
-m4_define([vips_minor_version], [23])
+m4_define([vips_minor_version], [24])
 m4_define([vips_micro_version], [0])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
@@ -610,8 +610,8 @@ AC_SUBST(PACKAGES_USED)
 #	vips-$IM_MAJOR_VERSION.$IM_MINOR_VERSION.pc
 # in AC_OUTPUT, but that seems to break for some combinations of sh/m4
 AC_OUTPUT([
-	vips-7.23.pc
-	vipsCC-7.23.pc
+	vips-7.24.pc
+	vipsCC-7.24.pc
 	Makefile 
 	libvips/include/vips/version.h 
 	libvips/include/Makefile 
diff --git a/doc/src/vipsmanual.tex b/doc/src/vipsmanual.tex
index faa41704..fcf334c0 100644
--- a/doc/src/vipsmanual.tex
+++ b/doc/src/vipsmanual.tex
@@ -16,7 +16,7 @@
 \fancyhead[LE,RO]{\leftmark}		% left-even, right-odd
 \fancyhead[RE,LO]{VIPS Manual}		% right-even, left-odd
 \fancyfoot[LE,RO]{\thepage}		% left-even, right-odd
-\fancyfoot[RE,LO]{November 2009}		
+\fancyfoot[RE,LO]{November 2010}		
 
 \begin{document}
 
@@ -27,7 +27,7 @@
 \begin{center}
 \huge
 VIPS Manual\\
-\large Version 7.20\\
+\large Version 7.24\\
 \vspace{0.5in}
 \large
 John Cupitt,
diff --git a/tools/scripts/Makefile.am b/tools/scripts/Makefile.am
index b27810ad..9377f9bb 100644
--- a/tools/scripts/Makefile.am
+++ b/tools/scripts/Makefile.am
@@ -4,12 +4,12 @@ bin_SCRIPTS = \
 	batch_image_convert \
 	batch_rubber_sheet \
 	batch_crop \
-	vips-7.23
+	vips-7.24
 
 noinst_SCRIPTS = post_install
 
 EXTRA_DIST = \
-	vips-7.23 \
+	vips-7.24 \
 	${noinst_SCRIPTS} \
 	light_correct.in \
 	shrink_width.in \
diff --git a/tools/scripts/vips-7.23 b/tools/scripts/vips-7.24
similarity index 100%
rename from tools/scripts/vips-7.23
rename to tools/scripts/vips-7.24
diff --git a/vips-7.23.pc.in b/vips-7.24.pc.in
similarity index 100%
rename from vips-7.23.pc.in
rename to vips-7.24.pc.in
diff --git a/vipsCC-7.23.pc.in b/vipsCC-7.24.pc.in
similarity index 100%
rename from vipsCC-7.23.pc.in
rename to vipsCC-7.24.pc.in