Merge branch 'master' of github.com:jcupitt/libvips

2012-10-19 09:38:21 +01:00 · 2012-10-19 09:38:21 +01:00 · abf7274754
commit abf7274754
parent 51d2f8149f f76ad26a38
3 changed files with 4 additions and 3 deletions
--- a/1
+++ b/1
@ -7,6 +7,7 @@

 2/10/12 started 7.30.4
 - remove options from format string in .dzi (thanks Martin)
+- vipsCC.pc required the wrong version of vips (thanks Alessandro)

 13/9/12 started 7.30.3
 - linecache sized itself too large
--- a/vips.pc.in
+++ b/vips.pc.in
@ -3,7 +3,7 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@

-Name: vips-@VIPS_MAJOR_VERSION@.@VIPS_MINOR_VERSION@
+Name: vips
 Description: Image processing library
 Version: @VERSION@
 Requires: @PACKAGES_USED@
--- a/vipsCC.pc.in
+++ b/vipsCC.pc.in
@ -3,8 +3,8 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@

-Name: vipsCC-@VIPS_MAJOR_VERSION@.@VIPS_MINOR_VERSION@
+Name: vipsCC
 Description: C++ API for vips image processing library
 Version: @VERSION@
-Requires: vips-@VIPS_MAJOR_VERSION@.@VIPS_MINOR_VERSION@ = @VERSION@
+Requires: vips = @VERSION@
 Libs: -L${libdir} -lvipsCC