[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
We have 3.112ubuntu1 in lucid. Therefore the debdiff is obsolete. ** Changed in: adduser (Ubuntu) Status: Confirmed = Invalid -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
attached debian.diff. ** Attachment added: debian.diff http://launchpadlibrarian.net/36568935/debian.diff -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
attached ubuntu.diff. ** Attachment added: ubuntu.diff http://launchpadlibrarian.net/36568937/ubuntu.diff -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
attached sponsors. ** Changed in: adduser (Ubuntu) Status: In Progress = Confirmed ** Changed in: adduser (Ubuntu) Assignee: Frank Cheung (fcuk112) = (unassigned) -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
The changelog is completely wrong. Far more changes remain than just a regex, and they need to be documented properly or else developers will get confused later - it looks as though you ignored all the changelog entries after 3.110ubuntu1. Please copy changelog entries to start with rather than summarising them (the changelog entry for 3.110ubuntu1 is much better than your proposed one, since it describes the change rather than merely saying that some change exists), although it's OK to clean things up so that they represent a coherent description of the remaining changes versus Debian rather than a full change history. Perhaps you could do this merge in Bazaar? That would make it easier to review. See https://wiki.ubuntu.com/DistributedDevelopment/Documentation/Merging, and then push the result somewhere (e.g. lp:~fcuk112/ubuntu/lucid/adduser/merge). -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
** Attachment added: debian.diff http://launchpadlibrarian.net/36603071/debian.diff -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
** Attachment added: ubuntu.diff http://launchpadlibrarian.net/36603087/ubuntu.diff -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Bug 493957] Re: Please merge adduser 0.3111 (main) from Debian testing (main)
Hi Colin, Thanks for your info and sorry about the changelog, I am still a bit new to this. Please have a look at the updated changelog and tell me if it looks OK. As for doing the merge in Bazaar, I am not sure how to do this. Can you tell me the steps before running bzr merge-package to get the adduser code. How is it different from using grab-merge to get the files? Cheers, Frank. -- Please merge adduser 0.3111 (main) from Debian testing (main) https://bugs.launchpad.net/bugs/493957 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
