diff options
| author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-07-27 03:24:10 +0000 |
|---|---|---|
| committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2010-07-27 03:24:10 +0000 |
| commit | 191fd7f1f7d80e6d9a99c1995777de56c3070e59 (patch) | |
| tree | 8a54fe70f30a3062e155628e2104cd309355f6d1 | |
| parent | 7d6ee0d55e433a55b5301969455e2818279db169 (diff) | |
| download | netpbm-mirror-191fd7f1f7d80e6d9a99c1995777de56c3070e59.tar.gz netpbm-mirror-191fd7f1f7d80e6d9a99c1995777de56c3070e59.tar.xz netpbm-mirror-191fd7f1f7d80e6d9a99c1995777de56c3070e59.zip | |
Release 10.47.18
git-svn-id: http://svn.code.sf.net/p/netpbm/code/stable@1267 9d0c8265-081b-0410-96cb-a4ca84ce46f8
| -rw-r--r-- | converter/other/pnmtopng.c | 4 | ||||
| -rw-r--r-- | doc/HISTORY | 7 | ||||
| -rw-r--r-- | version.mk | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/converter/other/pnmtopng.c b/converter/other/pnmtopng.c index 5107c33a..42c8f4ad 100644 --- a/converter/other/pnmtopng.c +++ b/converter/other/pnmtopng.c @@ -2790,8 +2790,8 @@ displayVersion() { */ fprintf(stderr, " Compiled with libpng %s.\n", PNG_LIBPNG_VER_STRING); - fprintf(stderr, " Compiled with zlib %s; using zlib %s.\n", - ZLIB_VERSION, zlib_version); + fprintf(stderr, " Pnmtopng (not libpng) compiled with zlib %s.\n", + ZLIB_VERSION); fprintf(stderr, "\n"); } diff --git a/doc/HISTORY b/doc/HISTORY index e7beb44c..eaf9203d 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -4,6 +4,13 @@ Netpbm. CHANGE HISTORY -------------- +10.07.27 BJH Release 10.47.18 + + Pnmtopng: -libversion doesn't report level of linked libz. + It was a modularity violation and caused build failures on + Mac OS X, because Pnmtopng per se doesn't know about libz -- + it's used by libpng. + 10.07.06 BJH Release 10.47.17 Build: don't fail due to SIGRTMIN, SIGRTMAX being undefined. diff --git a/version.mk b/version.mk index c36aebad..e3848187 100644 --- a/version.mk +++ b/version.mk @@ -1,3 +1,3 @@ NETPBM_MAJOR_RELEASE = 10 NETPBM_MINOR_RELEASE = 47 -NETPBM_POINT_RELEASE = 17 +NETPBM_POINT_RELEASE = 18 |