[Bug 296516] Re: bzr merge-upstream should adjust debian/changelog directly
** Changed in: bzr-builddeb Status: Fix Committed => Fix Released -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
This bug was fixed in the package bzr-builddeb - 2.1~0ubuntu1 --- bzr-builddeb (2.1~0ubuntu1) jaunty; urgency=low [ Jelmer Vernooij ] * Add simple deb: directory service for Bazaar that uses the dpkg Vcs-* fields. * Fix mark-uploaded when used in merge mode. (Closes: #500851) * Support merging upstream from a Bazaar branch. (Closes: #493386) + Also support merging from upstream Subversion branches. (LP: #295275) * Make --version option and location argument to merge-upstream optional. * Add -d option to merge-upstream. * Try to retrieve upstream tarball using get-orig-source rule in debian/rules if everything else fails. (Closes: #498622) * Support Vcs-Git in the deb: directory service if bzr-git is installed. * Use svn-buildpackage configuration when present. * Print name of created tag in mark-uploaded. (Closes: #497416) [ James Westby ] * Support repacking of .zips. Thanks Daniel Hahler. * Switch to debuild instead of dpkg-buildpackage -rfakeroot -uc -us. The most noticeable change will be that it now tries to sign by default. Add a NEWS entry to explain this. * Support passing extra options to the builder using "bzr bd -- --foo" syntax. * Don't use the distribution name in the tags, fixing myriad issues, but giving us a compatibility headache. Old clients won't see the new tags, but using the old tags lead to bugs, and the only way to fix that is to use the new tags. Not a good situation, but moving forwards we will have a much better situation. * Update the changelog after merge-upstream, rather than telling the user exactly what to run. (LP: #296516) * Remove export-upstream mode in favour of merge-upstream, see NEWS.Debian. * Use pristine-tar to store and retrieve exact tarballs so that packages can be built directly from the branch. In particular merge-upstream and import-dsc now store this information. This will avoid problems with the .orig.tar.gz changing between uploads. (LP: #317111) * Depend on pristine-tar. [ Kees Cook ] * builder.py: switch to using external tar command to replace buggy tarfile unpacker. (Closes: #463349, LP: #303931) -- James WestbyThu, 28 Aug 2008 11:41:35 +0100 ** Changed in: bzr-builddeb (Ubuntu) Status: Triaged => Fix Released -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
Hi, I have just implemented basic support for this. I didn't implement support for modifying the last changelog entry if it is UNRELEASED, which I would like to do. Thanks, James ** Changed in: bzr-builddeb (Ubuntu) Status: Triaged => Fix Committed ** Changed in: bzr-builddeb Status: In Progress => Fix Committed ** Changed in: bzr-builddeb (Ubuntu) Status: Fix Committed => Triaged -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
Ideally, it should of course also merge the new entry with the last entry if that last entry has target set to "UNRELEASED". ** Changed in: bzr-builddeb Assignee: (unassigned) => Jelmer Vernooij (jelmer) Status: Triaged => In Progress -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
Good point. It's also not always working for me while using it regularly over the last month, so I need to look at it again. -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
Lookiing at the patch, I don't see it changing the target to "UNRELEASED". As many developers rely on this to indicate whether a given version has been uploaded, it is probably worth adjusting this as well. Other than that, this looks exactly like what I wanted. Now, to address the reason it might not do this: I'm guessing that the result would probably be unsuitable for uploading to Ubuntu or a PPA directly (as it seems to encourage a revision of -1). By using UNRELEASED, the tool encourages the developer to double-check the version and target before uploading, which protects against this to some degree. -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
This is implemented by my branch at lp:~jelmer/bzr-builddeb/mu-add- changelog -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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 296516] Re: bzr merge-upstream should adjust debian/changelog directly
Hi, Thanks for the report. I think I agree. Or at least I've forgotten why it doesn't actually do it and just tells you what to do. I think it might just have been that it was the easy thing to do. Thanks, James ** Changed in: bzr-builddeb (Ubuntu) Status: New => Triaged ** Also affects: bzr-builddeb Importance: Undecided Status: New ** Changed in: bzr-builddeb Importance: Undecided => Wishlist Status: New => Triaged -- bzr merge-upstream should adjust debian/changelog directly https://bugs.launchpad.net/bugs/296516 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
