rename vips7.po as vips7.32.po

helps Debian, where they need to be able to install versions in parallel

ChangeLog

@@ -1,3 +1,6 @@
+16/4/13 started 7.32.3
+- rename GETTEXT_PACKAGE as vips7.32 to help Debian (thanks Jay)
+
 12/3/13 started 7.32.2
 - removed some left-over debugging code from configure.ac
 - better handling of args without values, thanks Ruven

configure.ac

@@ -2,7 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-AC_INIT([vips], [7.32.2], [vipsip@jiscmail.ac.uk])
+AC_INIT([vips], [7.32.3], [vipsip@jiscmail.ac.uk])
 # required for gobject-introspection
 AC_PREREQ(2.62)
 
@@ -17,7 +17,7 @@ AC_CONFIG_MACRO_DIR([m4])
 # user-visible library versioning
 m4_define([vips_major_version], [7])
 m4_define([vips_minor_version], [32])
-m4_define([vips_micro_version], [2])
+m4_define([vips_micro_version], [3])
 m4_define([vips_version],
           [vips_major_version.vips_minor_version.vips_micro_version])
 
@@ -259,7 +259,11 @@ AC_DEFINE_UNQUOTED(VIPS_PREFIX,"$prefix",[configure-time install prefix])
 AC_DEFINE_UNQUOTED(VIPS_LIBDIR,"$VIPS_LIBDIR",[configure-time library directory])
 
 # i18n
-GETTEXT_PACKAGE=vips7
+# we need to name our .mo with major.minor so we can have multiple versions
+# installed in parallel on Debian
+expand vips$VIPS_MAJOR_VERSION.$VIPS_MINOR_VERSION
+GETTEXT_PACKAGE=$expanded_value
+
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
         [The prefix for our gettext translation domains.])

libvips/arithmetic/measure.c

@@ -191,7 +191,7 @@ vips_measure_class_init( VipsMeasureClass *class )
 
 	object_class->nickname = "measure";
 	object_class->description = 
-		_( "measure a set of patches on a colour chart" );
+		_( "measure a set of patches on a color chart" );
 	object_class->build = vips_measure_build;
 
 	VIPS_ARG_IMAGE( class, "in", 1,

po/POTFILES.in

@@ -255,7 +255,59 @@ tools/header.c
 tools/mergeup.c
 tools/vips.c
 tools/vipsthumbnail.c
-libvips/cimg/cimg.cpp
+libvipsCC/VDisplay.cc
+libvipsCC/VError.cc
+libvipsCC/VImage.cc
+libvipsCC/vipsc++.cc
+libvipsCC/VMask.cc
+libvips/include/vips/mosaicing.h
+libvips/include/vips/semaphore.h
+libvips/include/vips/freq_filt.h
+libvips/include/vips/cimg_funcs.h
+libvips/include/vips/operation.h
+libvips/include/vips/vips.h
+libvips/include/vips/memory.h
+libvips/include/vips/buf.h
+libvips/include/vips/dispatch.h
+libvips/include/vips/vips7compat.h
+libvips/include/vips/conversion.h
+libvips/include/vips/basic.h
+libvips/include/vips/inplace.h
+libvips/include/vips/relational.h
+libvips/include/vips/mask.h
+libvips/include/vips/rect.h
+libvips/include/vips/generate.h
+libvips/include/vips/arithmetic.h
+libvips/include/vips/version.h
+libvips/include/vips/util.h
+libvips/include/vips/almostdeprecated.h
+libvips/include/vips/colour.h
+libvips/include/vips/threadpool.h
+libvips/include/vips/vector.h
+libvips/include/vips/morphology.h
+libvips/include/vips/error.h
+libvips/include/vips/transform.h
+libvips/include/vips/region.h
+libvips/include/vips/header.h
+libvips/include/vips/image.h
+libvips/include/vips/intl.h
+libvips/include/vips/video.h
+libvips/include/vips/enumtypes.h
+libvips/include/vips/thread.h
+libvips/include/vips/convolution.h
+libvips/include/vips/debug.h
+libvips/include/vips/interpolate.h
+libvips/include/vips/private.h
+libvips/include/vips/format.h
+libvips/include/vips/object.h
+libvips/include/vips/deprecated.h
+libvips/include/vips/inlines.h
+libvips/include/vips/histograms_lut.h
+libvips/include/vips/other.h
+libvips/include/vips/foreign.h
+libvips/include/vips/resample.h
+libvips/include/vips/internal.h
+libvips/include/vips/type.h
 libvips/resample/vsqbs.cpp
 libvips/resample/nohalo.cpp
 libvips/resample/lbb.cpp

po/README

@@ -34,7 +34,7 @@ find */* -name "*.cpp" >> po/POTFILES.in
 
 intltool-update --pot
 
-	make a new vips7.pot translation template from the sources
+	make a new vips7.32.pot translation template from the sources
 
 :%s/msgstr ""/msgstr "Malkovich"/
 :%s/msgstr\[0\] ""/msgstr[0] "Malkovich"/
@@ -57,7 +57,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-	edits to make vips7.pot into test.po
+	edits to make vips7.32.pot into test.po
 
 msgfmt -cv -o /dev/null test.po