Merge lp://staging/~ubuntu-branches/ubuntu/maverick/xsane/maverick-201008230112 into lp://staging/ubuntu/maverick/xsane
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/maverick/xsane/maverick-201008230112 |
| Merge into: | lp://staging/ubuntu/maverick/xsane |
| Diff against target: |
19 lines (+13/-0) (has conflicts) 1 file modified
debian/patches/fix_umaks_permitions.patch (+13/-0) Conflict adding file debian/patches/fix_umaks_permitions.patch. Moved existing file to debian/patches/fix_umaks_permitions.patch.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/maverick/xsane/maverick-201008230112 |
| Related bugs: |
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/maverick/xsane now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/xsane/maverick-201008230112. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 29. By Evan Broder
-
* Fix umask permitions (LP: #611950)
- debian/patches/ fix_umask_ permitions. patch
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
