Merge lp://staging/~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322 into lp://staging/ubuntu/maverick/samba
Proposed by
James Westby
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322 |
| Merge into: | lp://staging/ubuntu/maverick/samba |
| Diff against target: |
990 lines (+99/-82) (has conflicts) 54 files modified
debian/patches/error-trans.fix-276472 (+15/-0) debian/po/ar.po (+1/-1) debian/po/ast.po (+1/-1) debian/po/be.po (+1/-1) debian/po/bg.po (+1/-1) debian/po/bn.po (+1/-1) debian/po/bs.po (+1/-1) debian/po/ca.po (+3/-3) debian/po/cs.po (+1/-1) debian/po/da.po (+1/-1) debian/po/de.po (+1/-1) debian/po/dz.po (+1/-1) debian/po/el.po (+1/-1) debian/po/eo.po (+1/-1) debian/po/es.po (+3/-2) debian/po/et.po (+1/-1) debian/po/eu.po (+1/-1) debian/po/fi.po (+1/-1) debian/po/fr.po (+1/-1) debian/po/gl.po (+1/-1) debian/po/gu.po (+1/-1) debian/po/he.po (+1/-1) debian/po/hu.po (+1/-1) debian/po/id.po (+1/-1) debian/po/it.po (+1/-1) debian/po/ja.po (+1/-1) debian/po/ka.po (+1/-1) debian/po/km.po (+1/-1) debian/po/ko.po (+1/-1) debian/po/ku.po (+1/-1) debian/po/lt.po (+3/-3) debian/po/ml.po (+1/-1) debian/po/mr.po (+4/-4) debian/po/nb.po (+6/-6) debian/po/ne.po (+1/-1) debian/po/nl.po (+1/-1) debian/po/nn.po (+5/-5) debian/po/pl.po (+1/-1) debian/po/pt.po (+1/-1) debian/po/pt_BR.po (+1/-1) debian/po/ro.po (+1/-1) debian/po/ru.po (+3/-3) debian/po/sk.po (+1/-1) debian/po/sl.po (+1/-1) debian/po/sq.po (+1/-1) debian/po/sv.po (+1/-1) debian/po/ta.po (+1/-1) debian/po/th.po (+1/-1) debian/po/tl.po (+1/-1) debian/po/tr.po (+1/-1) debian/po/vi.po (+12/-11) debian/po/wo.po (+1/-1) debian/po/zh_CN.po (+1/-1) debian/po/zh_TW.po (+1/-1) Conflict adding file debian/patches/error-trans.fix-276472. Moved existing file to debian/patches/error-trans.fix-276472.moved. |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322 |
| 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/samba now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/samba/maverick-201008202322. A merge should be performed if necessary.
To post a comment you must log in.
Unmerged revisions
- 121. By Steve Langasek
-
merge fix from Surbhi
- 120. By Steve Langasek
-
revert spurious change to debian/smb.conf
- 119. By Steve Langasek
-
revert spurious changes to debian/po
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
