Correct and improve several packaging aspects including...

Renumber patch hunks to avoid patch(1) warnings, this time successfully.

Finally correct packaging logic enough to allow for successful building:

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

mercurial