For now I am accepting the first debdiff. It will be great if you can submit your 'better' fix to upstream.
For now I am accepting the first debdiff. It will be great if you can submit your 'better' fix to upstream.