Merge lp://staging/~om26er/ubuntu/maverick/nautilus/nautilus-fix-630512-maverick into lp://staging/ubuntu/maverick-proposed/nautilus

Proposed by Omer Akram
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp://staging/~om26er/ubuntu/maverick/nautilus/nautilus-fix-630512-maverick
Merge into: lp://staging/ubuntu/maverick-proposed/nautilus
Diff against target: 56 lines (+35/-1)
3 files modified
debian/changelog (+7/-0)
debian/patches/100_dont_treat_tilda_as_a_relative_path.patch (+27/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp://staging/~om26er/ubuntu/maverick/nautilus/nautilus-fix-630512-maverick
Reviewer Review Type Date Requested Status
Artur Rona (community) Approve
Bilal Akhtar (community) Needs Fixing
Ubuntu Sponsors Pending
Review via email: mp+45048@code.staging.launchpad.net

Description of the change

cherry picked from upstream git to fix bug 630512. although the issue is a very small one but it got media attention and is a regression-release

To post a comment you must log in.
Revision history for this message
Bilal Akhtar (bilalakhtar) wrote :

Looks good, except for a few not-so-important problems with your patch:

1) Change the Origin: DEP-3 tag in debian/patches/dont_treat_tilda_as_a_relative_path.patch to Applied-Upstream:

2) In the changelog, (LP: 630512) is not likely to close the bug. Make it (LP: #630512).

3) I may be wrong, but the usual convention is to get the new patch apply the last in debian/patches/series. Moreover, the proper convention is to have a number at the beginning of the name of the patch, so in this case rename the patch to 100_dont_treat_tilda_as_a_relative_path.patch and make the same change in debian/patches/series as well.

Revision history for this message
Bilal Akhtar (bilalakhtar) :
review: Needs Fixing
Revision history for this message
Artur Rona (ari-tczew) wrote :

1)'From' tag should show who sent a patch to Ubuntu, so please use yourself. For Cosimo please use tag ' Author'.

2) debian/changelog: Please move (LP: #630512) one line above, so it should be:
* debian/patches/dont_treat_tilda_as_a_relative_path.patch: (LP: #630512)
It prevents from too long lines.

3) As Bilal suggested, rename patch and move it at the end of series file.

review: Needs Fixing
205. By Omer Akram

* debian/patches/dont_treat_tilda_as_a_relative_path.patch: (LP: #630512)
  - Open the user's home dir when '~' is entered into the address bar.

206. By Omer Akram

debian/patches/100_dont_treat_tilda_as_a_relative_path.patch: (LP: #630512)

Revision history for this message
Omer Akram (om26er) wrote :

I have made the suggested changes. Thanks for the review.

Revision history for this message
Artur Rona (ari-tczew) wrote :

OK now looks good. Please any core-dev upload.

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: