From 61db0a62b02c81efefb43a755b80b592156b2706 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Sat, 11 Oct 2008 21:37:53 +0000
Subject: [PATCH] bump version number

---
 ChangeLog                              | 5 ++++-
 configure.in                           | 6 +++---
 src/scripts/Makefile.am                | 4 ++--
 src/scripts/{vips-7.16 => vips-7.17}   | 0
 vips-7.16.pc.in => vips-7.17.pc.in     | 0
 vips-7.16.spec.in => vips-7.17.spec.in | 0
 vipsCC-7.16.pc.in => vipsCC-7.17.pc.in | 0
 7 files changed, 9 insertions(+), 6 deletions(-)
 rename src/scripts/{vips-7.16 => vips-7.17} (100%)
 rename vips-7.16.pc.in => vips-7.17.pc.in (100%)
 rename vips-7.16.spec.in => vips-7.17.spec.in (100%)
 rename vipsCC-7.16.pc.in => vipsCC-7.17.pc.in (100%)

diff --git a/ChangeLog b/ChangeLog
index 191c6447..d9f771fb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-11/10/08 merge 7.16 back into trunk for 7.17.0
+11/10/08 started 7.17.0
+- merge vips-7.16 brach back into trunk
+- bumped version number to 7.17.0
+- re-added type.[hc]
 
 11/9/08 started 7.16.3
 - oop typo in manpage for im_project()
diff --git a/configure.in b/configure.in
index 87fcf958..21d567ba 100644
--- a/configure.in
+++ b/configure.in
@@ -465,9 +465,9 @@ AC_SUBST(VIPS_LIBS)
 AC_SUBST(PACKAGES_USED)
 
 AC_OUTPUT([
-	vips-7.16.pc
-	vipsCC-7.16.pc
-	vips-7.16.spec
+	vips-7.17.pc
+	vipsCC-7.17.pc
+	vips-7.17.spec
 	Makefile 
 	include/vips/version.h 
 	include/Makefile 
diff --git a/src/scripts/Makefile.am b/src/scripts/Makefile.am
index 0fe17500..65e8aa29 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.16
+	vips-7.17
 
 noinst_SCRIPTS = post_install
 
 EXTRA_DIST = \
-	vips-7.16 \
+	vips-7.17 \
 	${noinst_SCRIPTS} \
 	light_correct.in \
 	shrink_width.in \
diff --git a/src/scripts/vips-7.16 b/src/scripts/vips-7.17
similarity index 100%
rename from src/scripts/vips-7.16
rename to src/scripts/vips-7.17
diff --git a/vips-7.16.pc.in b/vips-7.17.pc.in
similarity index 100%
rename from vips-7.16.pc.in
rename to vips-7.17.pc.in
diff --git a/vips-7.16.spec.in b/vips-7.17.spec.in
similarity index 100%
rename from vips-7.16.spec.in
rename to vips-7.17.spec.in
diff --git a/vipsCC-7.16.pc.in b/vipsCC-7.17.pc.in
similarity index 100%
rename from vipsCC-7.16.pc.in
rename to vipsCC-7.17.pc.in