Merge lp://staging/~l3on/ubuntu/precise/lusca/fix-ftbfs into lp://staging/ubuntu/precise/lusca
Proposed by
Leo Iannacone
| Status: | Work in progress |
|---|---|
| Proposed branch: | lp://staging/~l3on/ubuntu/precise/lusca/fix-ftbfs |
| Merge into: | lp://staging/ubuntu/precise/lusca |
| Diff against target: |
89 lines (+32/-4) 7 files modified
debian/changelog (+9/-0) debian/control (+2/-1) debian/lusca-common.install (+1/-1) debian/patches/missing-format-string.patch (+18/-0) debian/patches/series (+1/-0) debian/rules (+0/-1) debian/source/format (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~l3on/ubuntu/precise/lusca/fix-ftbfs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Andreas Moog (community) | Needs Fixing | ||
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
Description of the change
* Imported a patch from upstream to fix security warning and ftbfs.
* Switched to 3.0 (quilt) format to simplify patch system
* Fixed again ftbfs moving mime.conf from /usr/share to /etc (as default
declared in the application configure script)
To post a comment you must log in.
Unmerged revisions
- 3. By Leo Iannacone
-
* Fix format not a string literal and no format argument causing
FTBFS (LP: #935290, closes: #643437).
* Switch to debian format 3.0 (quilt).
* Install mime.conf for lusca-common in /etc/ instead in /usr/share.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Thanks for your work, however there are a few issues:
1. The debian package used dpatch to manage patches, there is no need to diverge in Ubuntu.
2. In the dep3-headers you list yourself as the "Author", however this should list the person who created the patch in the first place.
Cheers,
Andreas