Resynchronize with upstream package maintainer version.

Blind commit of old corrections, which probably are in order and needed.

(0) -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 tip

mercurial