From dfc8ade0798525a931f13dcf2aa99a1b47f8cdce Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Mon, 18 Aug 2014 16:01:26 +0100
Subject: [PATCH] fix up vips_version*() docs

---
 libvips/deprecated/package.c | 42 ------------------------------------
 libvips/iofuncs/init.c       | 42 ++++++++++++++++++++++++++++++++++++
 2 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/libvips/deprecated/package.c b/libvips/deprecated/package.c
index 29332809..0548d734 100644
--- a/libvips/deprecated/package.c
+++ b/libvips/deprecated/package.c
@@ -1198,45 +1198,3 @@ im_run_command( char *name, int argc, char **argv )
 
 	return( 0 );
 }
-
-/**
- * im_version_string:
- *
- * Get the VIPS version as a static string, including a build date and time.
- * Do not free.
- *
- * Returns: a static version string
- */
-const char *
-im_version_string( void )
-{
-	return( IM_VERSION_STRING );
-}
-
-/**
- * im_version:
- * @flag: which field of the version to get
- *
- * Get the major, minor or micro library version, with @flag values 0, 1 and
- * 2.
- *
- * Returns: library version number
- */
-int
-im_version( int flag )
-{
-	switch( flag ) {
-	case 0:
-		return( IM_MAJOR_VERSION );
-	
-	case 1:
-		return( IM_MINOR_VERSION );
-	
-	case 2:
-		return( IM_MICRO_VERSION );
-
-	default:
-		vips_error( "im_version", "%s", _( "flag not 0, 1, 2" ) );
-		return( -1 );
-	}
-}
diff --git a/libvips/iofuncs/init.c b/libvips/iofuncs/init.c
index f59eaa5a..c2419795 100644
--- a/libvips/iofuncs/init.c
+++ b/libvips/iofuncs/init.c
@@ -904,3 +904,45 @@ vips_guess_libdir( const char *argv0, const char *env_name )
 
 	return( libdir );
 }
+
+/**
+ * vips_version_string:
+ *
+ * Get the VIPS version as a static string, including a build date and time.
+ * Do not free.
+ *
+ * Returns: (transfer none): a static version string
+ */
+const char *
+vips_version_string( void )
+{
+	return( VIPS_VERSION_STRING );
+}
+
+/**
+ * vips_version:
+ * @flag: which field of the version to get
+ *
+ * Get the major, minor or micro library version, with @flag values 0, 1 and
+ * 2.
+ *
+ * Returns: library version number
+ */
+int
+vips_version( int flag )
+{
+	switch( flag ) {
+	case 0:
+		return( VIPS_MAJOR_VERSION );
+	
+	case 1:
+		return( VIPS_MINOR_VERSION );
+	
+	case 2:
+		return( VIPS_MICRO_VERSION );
+
+	default:
+		vips_error( "vips_version", "%s", _( "flag not 0, 1, 2" ) );
+		return( -1 );
+	}
+}