further rectifications of NOSHORTS and SPKG.txt
an attempt to use hg convert to fake the history in spkg/