Merge lp://qastaging/~valavanisalex/ubuntu/precise/inkscape/fix-966221 into lp://qastaging/ubuntu/precise/inkscape
Proposed by
Alex Valavanis
| Status: | Merged | ||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| Merged at revision: | 68 | ||||||||||||||||||||
| Proposed branch: | lp://qastaging/~valavanisalex/ubuntu/precise/inkscape/fix-966221 | ||||||||||||||||||||
| Merge into: | lp://qastaging/ubuntu/precise/inkscape | ||||||||||||||||||||
| Diff against target: |
485 lines (+235/-172) 10 files modified
debian/changelog (+47/-0) debian/control (+1/-1) debian/patches/00list (+0/-2) debian/patches/01-fix-datamatrix-ui.dpatch (+147/-0) debian/patches/01_add_unity_quicklist_support.patch (+19/-0) debian/patches/01_add_unity_quicklist_support.patch.dpatch (+0/-20) debian/patches/02-drop-pdf-ps.diff (+14/-0) debian/patches/fix-datamatrix-ui.dpatch (+0/-147) debian/patches/series (+3/-0) debian/rules (+4/-2) |
||||||||||||||||||||
| To merge this branch: | bzr merge lp://qastaging/~valavanisalex/ubuntu/precise/inkscape/fix-966221 | ||||||||||||||||||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Didier Roche-Tolomelli | Approve | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
This merge finally brings us back a bit closer to the Debian package. It also switches to the quilt patch system instead of the now obsolete dpatch.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks a lot for your work here!
Everything looks good, just a nitpicky one please do not list again the already written bug report numbers from a previous merge (that would spam launchpad and close again the bugs). I removed it before merging.
Other than that, excellent work ;)