Merge lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911 into lp:ubuntu/natty/xdg-utils

Proposed by James Westby
Status: Merged
Merged at revision: 16
Proposed branch: lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911
Merge into: lp:ubuntu/natty/xdg-utils
Diff against target: 25 lines (+2/-2)
2 files modified
debian/changelog (+1/-1)
debian/patches/xdg-update-menu-caonicalize-defaults.list.diff (+1/-1)
To merge this branch: bzr merge lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911
Reviewer Review Type Date Requested Status
Kees Cook Approve
Review via email:

Description of the change

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/natty/xdg-utils now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/natty/xdg-utils/natty-201104080911. A merge should be performed if necessary.

To post a comment you must log in.
Revision history for this message
Kees Cook (kees) wrote :

Trivial typo adjustment. I'll upload a fix to get these in line again.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2011-04-08 02:00:05 +0000
3+++ debian/changelog 2011-04-08 09:15:59 +0000
4@@ -15,7 +15,7 @@
6 [ Martin Pitt ]
7 * Add xdg-update-menu-caonicalize-defaults.list.diff: Don't overwrite a
8- /usr/share/applications/defaults.list symlink. Thanks to Joe Ebel for the
9+ /usr/share/applications/defaults.list symlink. Thanks to Joel Ebel for the
10 original patch! (LP: #703106)
12 [ Scott Ritchie ]
14=== modified file 'debian/patches/xdg-update-menu-caonicalize-defaults.list.diff'
15--- debian/patches/xdg-update-menu-caonicalize-defaults.list.diff 2011-03-30 13:11:39 +0000
16+++ debian/patches/xdg-update-menu-caonicalize-defaults.list.diff 2011-04-08 09:15:59 +0000
17@@ -6,7 +6,7 @@
18 Canonicalize the defaults.list file name before overwriting it, to avoid
19 replacing symlinks with files.
21-Thanks to Joe Ebel for the original patch!
22+Thanks to Joel Ebel for the original patch!
24 Bug:
25 Bug-Ubuntu:


People subscribed via source and target branches

to all changes: