Comment 9 for bug 1524982

Hi Ryan,

Thank you for re-merging 1.0.62.

The diff that is most important to me is New Debian -> New Ubuntu, since that
is the "Ubuntu delta" that we try to minimise. It's no problem for me to
generate it based on what you provided, but note that my review below is
primarily based on looking at this diff so you might want to generate it too.

For clarity, the "new delta" is 1.0.62-1 -> 1.0.62-1ubuntu1 as created by you
(but manually generated by me as above), and the "old delta" is 1.0.57-1 ->
1.0.57-1ubuntu2 which we can also generate. What we want to transform the old
delta into a minimal new delta, dropping anything that is no longer needed and
possibly adding anything that needs fixing up.

The changelog and "update-maintainer" are correctly merged. Thank you.

But things dropped from the delta should be documented in the new changelog
entry. For example, Mathieu's fix in debian/tgt.service has been taken up by
Debian.

I see things documented as "remaining changes" but I don't see them in the
new delta. For example, I see no remaining delta in any patches.

I also see things in the new delta that are not documented in the changelog:

* glusterfs support is dropped, but this is no longer documented.

* debian/tests/daemon are both changed, and I don't know why.

* debian/bash-completion is modified, and I don't know why.

Some unnecessary parts of the delta that I think should now be dropped:

* The upstart script, since tgt isn't used on the phone and we no longer use
  upstart. So Debian could carry the upstart script, but there is no need for
  us to maintain a delta for it in Ubuntu.

* "+XS-Testsuite: autopkgtest" is no longer needed: the latest dpkg does the
  necessary stuff automatically now. Debian can carry it if they want, but
  there is no need for us to maintain a delta for it in Ubuntu.

You left conflict markers in debian/watch.

What we want is the delta minimised and completely explained in the changelog
entry in the merge. Then a future merger only needs to look at the previous
diff, changelog entry and any uploads made subsequent to the merge in order to
re-merge.

Please could you fix the above? Note that I haven't build or dep8 tested this -
I'm assuming it builds and tests pass.