about summary refs log tree commit diff
diff options
context:
space:
mode:
authorgiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2020-01-19 16:43:51 +0000
committergiraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8>2020-01-19 16:43:51 +0000
commite6a17be4b263b797dccff2afa8f0849264df5e45 (patch)
treed19650465a265885c35849fbbe35cc0a0522bf1b
parent5c989911ff1ff8c841c1e3cd371c610dd9dcd46e (diff)
downloadnetpbm-mirror-e6a17be4b263b797dccff2afa8f0849264df5e45.tar.gz
netpbm-mirror-e6a17be4b263b797dccff2afa8f0849264df5e45.tar.xz
netpbm-mirror-e6a17be4b263b797dccff2afa8f0849264df5e45.zip
Remove 'Netpbm' from version string in pkg-config and config files
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@3736 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rw-r--r--GNUmakefile9
-rw-r--r--doc/HISTORY3
2 files changed, 11 insertions, 1 deletions
diff --git a/GNUmakefile b/GNUmakefile
index 0d0d66b6..e727b00e 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -266,7 +266,14 @@ init_package:
 	echo "Netpbm install package made by 'make package'" \
 	    >$(PKGDIR)/pkginfo
 	date >>$(PKGDIR)/pkginfo
-	echo Netpbm $(MAJOR).$(MINOR).$(POINT) >$(PKGDIR)/VERSION
+# For many years, the version string was "Netpbm x.y.z" instead of just
+# "x.y.z".  This was probably related to the fact that when you ask a Netpbm
+# program its version, it says "Netpbm x.y.z" to let you know it's the version
+# of the whole package, not just that program.  And also to distinguish from
+# the Pbmplus version of the program.  But this is highly unconventional in
+# pkg-config or config files, so we removed the "Netpbm" in Netpbm 10.90
+# (March 2020).
+	echo $(MAJOR).$(MINOR).$(POINT) >$(PKGDIR)/VERSION
 	$(INSTALL) -c -m 664 $(SRCDIR)/buildtools/README.pkg $(PKGDIR)/README
 	$(INSTALL) -c -m 664 $(SRCDIR)/buildtools/config_template \
 	  $(PKGDIR)/config_template
diff --git a/doc/HISTORY b/doc/HISTORY
index d6a51632..634ee16c 100644
--- a/doc/HISTORY
+++ b/doc/HISTORY
@@ -6,6 +6,9 @@ CHANGE HISTORY
 
 not yet  BJH  Release 10.90.00
 
+              Install: Use e.g. "10.90.00" for version in pkg-config and
+              config file, intead of e.g. "Netpbm 10.90.00".
+
               pamdice: Fix junk output when -width or -height not specified.
 
               libnetpbm: pm_getline, xvminitoppm, pamtris : Fix bug: crash