From c049db8258a56e85ab8e08890479352431ce1e51 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 25 Mar 2009 14:38:02 +0000
Subject: [PATCH] bump for 7.18

---
 ChangeLog                              |  3 +++
 TODO                                   | 29 ++++++++------------------
 configure.in                           | 10 ++++-----
 src/scripts/Makefile.am                |  4 ++--
 src/scripts/{vips-7.17 => vips-7.18}   |  0
 vips-7.17.pc.in => vips-7.18.pc.in     |  0
 vips-7.17.spec.in => vips-7.18.spec.in |  0
 vipsCC-7.17.pc.in => vipsCC-7.18.pc.in |  0
 8 files changed, 19 insertions(+), 27 deletions(-)
 rename src/scripts/{vips-7.17 => vips-7.18} (100%)
 rename vips-7.17.pc.in => vips-7.18.pc.in (100%)
 rename vips-7.17.spec.in => vips-7.18.spec.in (100%)
 rename vipsCC-7.17.pc.in => vipsCC-7.18.pc.in (100%)

diff --git a/ChangeLog b/ChangeLog
index f8912c87..ac170b22 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+25/3/09 started 7.18.0
+- revised version numbers
+
 6/3/09 started 7.17.3
 - revised nohalo
 - remove fading stuff from im_render() -- cleaner and simpler
diff --git a/TODO b/TODO
index ec05a7b1..489cd202 100644
--- a/TODO
+++ b/TODO
@@ -1,19 +1,9 @@
-- radiance read/write needs docs
-
-  maybe have an im_format(3) page with all the built-in formats?
-
-  hard until we document vips_object :(
-
-- same for matio?
-
-- doc strings would be nice, read the SWIG notes on this
-
-
-
-
-
+- read through docs for 7.18 stuff
 
+- update function list in refs
 
+WONTFIX for 7.18
+================
 
 - move im_shrink & friends to resample?
 
@@ -21,8 +11,6 @@
 
   what about im_stretch3.c, im_resize_linear
 
-
-
 - im_render should use a hash for tile lookup ... or+shift x/y together
 
   load wtc.jpg, rotate 42 degrees, zoom in and out quickly for a while, quit
@@ -33,8 +21,6 @@
 
   problem with waiting for paint to finish in render_kill?
 
-
-
 - check mosaic1, global_balance, similarity etc. use of im__affine
   
   how can we move them to im_affinei ?
@@ -43,12 +29,15 @@
 
 - update the Portfiles on the mac and on the website from the macports ones
 
+- radiance read/write needs docs
 
+  maybe have an im_format(3) page with all the built-in formats?
 
+  hard until we document vips_object :(
 
+- same for matio?
 
-WONTFIX for 7.18
-================
+- doc strings would be nice, read the SWIG notes on this
 
 - bilateral filtering, see:
 
diff --git a/configure.in b/configure.in
index 01d08a27..ebc4d65b 100644
--- a/configure.in
+++ b/configure.in
@@ -4,8 +4,8 @@ AM_CONFIG_HEADER(config.h)
 
 # user-visible library versioning
 IM_MAJOR_VERSION=7
-IM_MINOR_VERSION=17
-IM_MICRO_VERSION=3
+IM_MINOR_VERSION=18
+IM_MICRO_VERSION=0
 IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION
 IM_VERSION_STRING=$IM_VERSION-`date`
 
@@ -483,9 +483,9 @@ 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.17.pc
-	vipsCC-7.17.pc
-	vips-7.17.spec
+	vips-7.18.pc
+	vipsCC-7.18.pc
+	vips-7.18.spec
 	Makefile 
 	include/vips/version.h 
 	include/Makefile 
diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
index 65e8aa29..959ec385 100644
--- a/src/scripts/Makefile.am
+++ b/src/scripts/Makefile.am
@@ -4,12 +4,12 @@ bin_SCRIPTS = \
 	batch_image_convert \
 	batch_rubber_sheet \
 	batch_crop \
-	vips-7.17
+	vips-7.18
 
 noinst_SCRIPTS = post_install
 
 EXTRA_DIST = \
-	vips-7.17 \
+	vips-7.18 \
 	${noinst_SCRIPTS} \
 	light_correct.in \
 	shrink_width.in \
diff --git a/src/scripts/vips-7.17 b/src/scripts/vips-7.18
similarity index 100%
rename from src/scripts/vips-7.17
rename to src/scripts/vips-7.18
diff --git a/vips-7.17.pc.in b/vips-7.18.pc.in
similarity index 100%
rename from vips-7.17.pc.in
rename to vips-7.18.pc.in
diff --git a/vips-7.17.spec.in b/vips-7.18.spec.in
similarity index 100%
rename from vips-7.17.spec.in
rename to vips-7.18.spec.in
diff --git a/vipsCC-7.17.pc.in b/vipsCC-7.18.pc.in
similarity index 100%
rename from vipsCC-7.17.pc.in
rename to vipsCC-7.18.pc.in