Ubuntu
exuberant-ctags package

Merge lp://qastaging/~blueyed/ubuntu/natty/exuberant-ctags/upstream-snapshot into lp://qastaging/ubuntu/natty/exuberant-ctags

  1. Natty (11.04)
  2. upstream-snapshot
  3. Merge into natty
Proposed by Daniel Hahler
Status: Merged
Merge reported by: Colin Watson
Merged at revision: not available
Proposed branch: lp://qastaging/~blueyed/ubuntu/natty/exuberant-ctags/upstream-snapshot
Merge into: lp://qastaging/ubuntu/natty/exuberant-ctags
Diff against target: 36701 lines
To merge this branch: bzr merge lp://qastaging/~blueyed/ubuntu/natty/exuberant-ctags/upstream-snapshot
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+52947@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Patch pilots, please hold off on this; I'd like to look at this in Debian.

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

Daniel, would you be offended if I did this separately in Debian and just made the results match up, but not necessarily the bzr history? (My Debian exuberant-ctags repository is still in Subversion, unfortunately ...)

lp://qastaging/~blueyed/ubuntu/natty/exuberant-ctags/upstream-snapshot updated
17. By Daniel Hahler

Set version to '5.9~svn20110310' instead of 'Development'.

18. By Daniel Hahler

Add LP bug reference to LP: #554898.

19. By Daniel Hahler

Also fixes LP: #582347 (etags screw filenames starting with ./).

Revision history for this message
Daniel Hahler (blueyed) wrote :

Yes, Colin, please do.

I hope you keep debian/changelog, but even without this my main intention is to get the bug fixes in. Please note the last three commits, which fix the version and add some more bug references.

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

Yes, I'll preserve those parts of the changelog which make sense, attributing you. I'm going to do some things somewhat differently, though; in particular, I've generated a new .orig.tar.gz using upstream's maintainer.mak ('make -f maintainer.mak releases/ctags-5.9~svn20110310.tar.gz'), which means that neither dh_autoreconf nor version.patch are needed.

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

Also, this is not a good form for changelog entries:

    This includes a lot of fixes since the last release.
    - Fixes LP: #554898, #582347

It's better to list actual changes alongside each bug, rather than "a lot of fixes" and bug numbers that you then have to look up. I'm going to rephrase this using upstream NEWS, commit messages, etc.

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

Now effectively merged into Debian and Natty. Thanks again.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: