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
=== modified file 'debian/changelog'
--- debian/changelog 2011-04-08 02:00:05 +0000
+++ debian/changelog 2011-04-08 09:15:59 +0000
@@ -15,7 +15,7 @@
16 [ Martin Pitt ]16 [ Martin Pitt ]
17 * Add xdg-update-menu-caonicalize-defaults.list.diff: Don't overwrite a17 * Add xdg-update-menu-caonicalize-defaults.list.diff: Don't overwrite a
18 /usr/share/applications/defaults.list symlink. Thanks to Joe Ebel for the18 /usr/share/applications/defaults.list symlink. Thanks to Joel Ebel for the
19 original patch! (LP: #703106)19 original patch! (LP: #703106)
20 20
21 [ Scott Ritchie ]21 [ Scott Ritchie ]
=== modified file 'debian/patches/xdg-update-menu-caonicalize-defaults.list.diff'
--- debian/patches/xdg-update-menu-caonicalize-defaults.list.diff 2011-03-30 13:11:39 +0000
+++ debian/patches/xdg-update-menu-caonicalize-defaults.list.diff 2011-04-08 09:15:59 +0000
@@ -6,7 +6,7 @@
6Canonicalize the defaults.list file name before overwriting it, to avoid6Canonicalize the defaults.list file name before overwriting it, to avoid
7replacing symlinks with files.7replacing symlinks with files.
9Thanks to Joe Ebel for the original patch!9Thanks to Joel Ebel for the original patch!


People subscribed via source and target branches

to all changes: