Comment 2 for bug 776698

Revision history for this message
Colin Watson (cjwatson) wrote :

Thanks for your patch! A few things to note for future merges:

 * Always contact the person marked on merges.ubuntu.com as having touched the package last - in this case, me. As it happened I hadn't yet got round to working on this, but I might well have done in which case one of our work would have been duplicated and wasted.
 * Installer merges happen in bzr, as indicated by the Vcs-Bzr field. I've transferred your change to bzr and committed it in your name.
 * The debian/control merge wasn't quite right. In particular, you reintroduced Frans Pop's name to Uploaders (he was removed from that field on the Debian side, because he sadly passed away in August), and the Debian Vcs-Browser and Vcs-Git fields should be prefixed with XS-Debian- as the old Vcs-Svn field was. I've fixed this in the commit I made to bzr.