From 01fb9c870983fd45c31a1bc5b41d55cac7be24f3 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 29 Aug 2007 16:52:17 +0000
Subject: [PATCH] stuff

---
 ChangeLog                              |  3 +++
 Makefile.am                            |  8 ++++----
 bootstrap.sh                           |  2 +-
 configure.in                           | 16 ++++++++--------
 vips-7.12.pc.in => vips-7.14.pc.in     |  2 +-
 vips-7.12.spec.in => vips-7.14.spec.in |  3 +++
 vipsCC-7.12.pc.in => vipsCC-7.14.pc.in |  4 ++--
 7 files changed, 22 insertions(+), 16 deletions(-)
 rename vips-7.12.pc.in => vips-7.14.pc.in (82%)
 rename vips-7.12.spec.in => vips-7.14.spec.in (97%)
 rename vipsCC-7.12.pc.in => vipsCC-7.14.pc.in (61%)

diff --git a/ChangeLog b/ChangeLog
index 9b2473cf..384650b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+29/8/07 started 7.13.0
+- we now have a trunk and the version is 7.13.x, woo!
+
 1/8/07 started 7.12.5
 - im_embed() is more general ... x and y can be negative
 - predicate.c is smaller and cleaner
diff --git a/Makefile.am b/Makefile.am
index 26c657e7..19e4f084 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,9 +21,9 @@ EXTRA_DIST = \
 	benchmark \
 	bootstrap.sh \
 	win32 \
-	vipsCC-7.12.pc.in \
-	vips-7.12.pc.in \
-	vips-7.12.spec.in \
+	vipsCC-7.14.pc.in \
+	vips-7.14.pc.in \
+	vips-7.14.spec.in \
 	acinclude.m4 \
 	depcomp \
 	intltool-extract.in \
@@ -32,7 +32,7 @@ EXTRA_DIST = \
 	$(P_DIST_DIR)
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = vips-7.12.pc vipsCC-7.12.pc
+pkgconfig_DATA = vips-7.14.pc vipsCC-7.14.pc
 
 install-exec-hook:
 	-rm -rf ${DESTDIR}$(datadir)/doc/vips
diff --git a/bootstrap.sh b/bootstrap.sh
index 97af3c92..3c39db10 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -7,7 +7,7 @@ rm -f Makefile Makefile.in aclocal.m4
 rm -rf autom4te.cache
 rm -f config.* configure depcomp
 rm -f install-sh intltool-* libtool ltmain.sh missing mkinstalldirs
-rm -f stamp-* vipsCC-7.12.pc vips-7.12.spec vips-7.12.pc
+rm -f stamp-* vipsCC-7.14.pc vips-7.14.spec vips-7.14.pc
 rm -f python/vipsCC/*.cxx
 rm -f python/vipsCC/VImage.h
 rm -f python/vipsCC/VImage.py python/vipsCC/VError.py python/vipsCC/VMask.py python/vipsCC/Display.py
diff --git a/configure.in b/configure.in
index 149ae783..0b6ec69f 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=12
-IM_MICRO_VERSION=5
+IM_MINOR_VERSION=13
+IM_MICRO_VERSION=0
 IM_VERSION=$IM_MAJOR_VERSION.$IM_MINOR_VERSION.$IM_MICRO_VERSION
 IM_VERSION_STRING=$IM_VERSION-`date`
 
@@ -21,9 +21,9 @@ PACKAGE=vips
 #   interface changes backwards compatible?: increment age
 #   interface changes not backwards compatible?: reset age to 0
 
-LIBRARY_CURRENT=14
-LIBRARY_REVISION=2
-LIBRARY_AGE=2
+LIBRARY_CURRENT=15
+LIBRARY_REVISION=0
+LIBRARY_AGE=0
 
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
@@ -313,9 +313,9 @@ AC_SUBST(VIPS_LIBS)
 AC_SUBST(PACKAGES_USED)
 
 AC_OUTPUT([
-	vips-7.12.pc
-	vipsCC-7.12.pc
-	vips-7.12.spec
+	vips-7.${IM_MINOR_VERSION}.pc
+	vipsCC-7.${IM_MINOR_VERSION}.pc
+	vips-7.${IM_MINOR_VERSION}.spec
 	Makefile 
 	include/vips/version.h 
 	include/Makefile 
diff --git a/vips-7.12.pc.in b/vips-7.14.pc.in
similarity index 82%
rename from vips-7.12.pc.in
rename to vips-7.14.pc.in
index ee3aaf2c..49fdba0d 100644
--- a/vips-7.12.pc.in
+++ b/vips-7.14.pc.in
@@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: vips-7.12
+Name: vips-@IM_MAJOR_VERSION@.@IM_MINOR_VERSION@
 Description: Image processing library
 Version: @VERSION@
 Requires: @PACKAGES_USED@
diff --git a/vips-7.12.spec.in b/vips-7.14.spec.in
similarity index 97%
rename from vips-7.12.spec.in
rename to vips-7.14.spec.in
index 382281f5..22c750c6 100644
--- a/vips-7.12.spec.in
+++ b/vips-7.14.spec.in
@@ -85,6 +85,9 @@ ldconfig
 %{_libdir}/python*
 
 %changelog -n vips
+* Wed Aug 29 2007 John Cupitt <jcupitt@gmail.com> 7.14
+- updated for 7.14
+
 * Fri Apr 27 2007 John Cupitt <jcupitt@gmail.com> 7.12
 - updated for 7.12
 
diff --git a/vipsCC-7.12.pc.in b/vipsCC-7.14.pc.in
similarity index 61%
rename from vipsCC-7.12.pc.in
rename to vipsCC-7.14.pc.in
index 080a8e7b..ea68e6d1 100644
--- a/vipsCC-7.12.pc.in
+++ b/vipsCC-7.14.pc.in
@@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: vipsCC-7.12
+Name: vipsCC-@IM_MAJOR_VERSION@.@IM_MINOR_VERSION@
 Description: C++ API for vips image processing library
 Version: @VERSION@
-Requires: vips-7.12 = @VERSION@
+Requires: vips-@IM_MAJOR_VERSION@.@IM_MINOR_VERSION@ = @VERSION@
 Libs: -L${libdir} -lvipsCC