Ubuntu
apt package

Merge lp://staging/~blueyed/ubuntu/oneiric/apt/fix-apt-key-man-ubuntu-references into lp://staging/ubuntu/oneiric/apt

  1. Oneiric (11.10)
  2. fix-apt-key-man-ubuntu-references
  3. Merge into oneiric
Proposed by Daniel Hahler
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp://staging/~blueyed/ubuntu/oneiric/apt/fix-apt-key-man-ubuntu-references
Merge into: lp://staging/ubuntu/oneiric/apt
Diff against target: 43 lines (+11/-5)
2 files modified
debian/changelog (+6/-0)
doc/apt-key.8.xml (+5/-5)
To merge this branch: bzr merge lp://staging/~blueyed/ubuntu/oneiric/apt/fix-apt-key-man-ubuntu-references
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Jamie Strandboge Needs Fixing
Review via email: mp+74922@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Jamie Strandboge (jdstrand) wrote :

Thanks for your patch! Unfortunately this needs to be updated:
* there are merge conflicts with 0.8.16~exp5ubuntu8
* debian/changelog should reference 'oneiric', not natty
* '<literal>ubuntu-archive-keyring</literal>' should be changed to '<literal>ubuntu-keyring</literal>'

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

Well, I guess there's string freeze currently anyway, and it should not get into Oneiric because of that probably anyway.

Therefore I will postpone proposing this branch for when the P-series opens.

Revision history for this message
Marc Deslauriers (mdeslaur) wrote :

P is open now, could you retarget your branch please?

Revision history for this message
Martin Pitt (pitti) wrote :

Michael already merged this to the correct branch: lp:~ubuntu-core-dev/apt/ubuntu/

review: Approve

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: