Remove duplicate java and unused include paths, and correct jar path.

Correct and improve several packaging aspects including...

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

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

mercurial