Fix some formatting (line length)
Sort 'comps' and 'line' when comparing Debian repos, Fix #5517
Only sort everything after the URL in the line
Don't sort the repo title
Merge pull request #6321 from basepi/pkgrepo5517

Sort 'comps' and 'line' when comparing Debian repos, Fix #5517