Code review comment for lp:~statik/ubuntu/lucid/erlang/merge-erlang13b3

Revision history for this message
Elliot Murphy (statik) wrote :

My first UDD merge!
I think I even maybe got it right. Very recently there was a new upstream release of Erlang, which was uploaded to debian in the last day or two.

I grabbed lp:ubuntu/lucid/erlang, and did bzr merge-package lp:debian/sid/erlang. This gave me three conflicts:
- debian/patches/build-options.patch
- debian/control
- debian/changelog

build-options.patch was an easy conflict to resolve, it looks like the diff was just regenerated and had different directory names in it.

debian/control was pretty simple, adding a build-dep on xsltproc for the manpages, I confirmed that this is already in main and kept Martin's change of dropping the build-depend on libwxgtk2.8-dev.

debian/changelog was the most complex, and that wasn't too hard. I put the new debian changelog entries in the right order relative to the ubuntu ones, and then added an entry saying i did the merge and re-iterating the remaining ubuntu changes.

Please let me know if there is anything that I could have done better.

« Back to merge proposal