diff options
author | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-05-19 19:56:14 +0000 |
---|---|---|
committer | giraffedata <giraffedata@9d0c8265-081b-0410-96cb-a4ca84ce46f8> | 2021-05-19 19:56:14 +0000 |
commit | 64145413fe65664164974fb1cc7f387a1d984c63 (patch) | |
tree | ea5f58ce51906bb260e9d4471c1163b5a007d39d | |
parent | 0cec9d32e9093148a2d9de7f20aa54459f4d0f6e (diff) | |
download | netpbm-mirror-64145413fe65664164974fb1cc7f387a1d984c63.tar.gz netpbm-mirror-64145413fe65664164974fb1cc7f387a1d984c63.tar.xz netpbm-mirror-64145413fe65664164974fb1cc7f387a1d984c63.zip |
Fix mkdeb to accomodate new pkg/VERSION file format
git-svn-id: http://svn.code.sf.net/p/netpbm/code/trunk@4110 9d0c8265-081b-0410-96cb-a4ca84ce46f8
-rwxr-xr-x | buildtools/debian/mkdeb | 8 | ||||
-rw-r--r-- | doc/HISTORY | 5 |
2 files changed, 5 insertions, 8 deletions
diff --git a/buildtools/debian/mkdeb b/buildtools/debian/mkdeb index b152a78d..6c475530 100755 --- a/buildtools/debian/mkdeb +++ b/buildtools/debian/mkdeb @@ -89,13 +89,7 @@ sub netpbmVersion($) { } else { my $version = <VERSION>; chomp($version); - - if ($version =~ m{^Netpbm (\S*)}) { - my ($versionNumber) = ($1); - $retval = $versionNumber; - } else { - die("Can't understand format of '$versionFileName': '$version'"); - } + $retval = $version; close(VERSION); } diff --git a/doc/HISTORY b/doc/HISTORY index f9e4f2cd..1dd29909 100644 --- a/doc/HISTORY +++ b/doc/HISTORY @@ -37,6 +37,9 @@ not yet BJH Release 10.95.00 in Netpbm 10.78 (March 2017). Thanks Claes Nästén (pekdon@gmail.com). + Mkdeb: fix failure with message about unrecognized format of + VERSION file. Introduced in Netpbm 10.90 (March 2020). + 21.03.27 BJH Release 10.94.00 Add pamhomography: Thanks Scott Pakin. @@ -299,7 +302,7 @@ not yet BJH Release 10.95.00 won't accept it. Install: Use e.g. "10.90.00" for version in pkg-config and - config file, intead of e.g. "Netpbm 10.90.00". + config file, instead of e.g. "Netpbm 10.90.00". 19.12.29 BJH Release 10.89.00 |