Comment 2 for bug 236526

Two suggestions for slight improvements to that patch:

1. Define the "-1" or "-0ubuntu1" as a macro so that it only needs hard-coding in the script once.

2. Detect whether we are on Debian, or Ubuntu, and only switch to using the alternative postfix if we are on Ubuntu

With these, it should be possible to get the patch upstream into Debian and avoid carrying/maintaining the diff in the future.