Committed reworked patch from Debian

git-svn-id: svn+ssh://svn.code.sf.net/p/firebird/code/firebird/branches/B2_5_Release@58886 65644016-39b1-43b1-bf79-96bc8fe82c15
nightly update

git-svn-id: svn+ssh://svn.code.sf.net/p/firebird/code/firebird/branches/B2_5_Release@58890 65644016-39b1-43b1-bf79-96bc8fe82c15