Merge lp://qastaging/~noskcaj/ubuntu/vivid/libfm/merge into lp://qastaging/ubuntu/vivid/libfm
Proposed by
Jackson Doak
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/vivid/libfm/merge |
| Merge into: | lp://qastaging/ubuntu/vivid/libfm |
| Diff against target: |
4275 lines (+3598/-401) 20 files modified
.pc/02-disable-Werror.patch/configure.ac (+0/-367) .pc/90-fix-mime-null-crash.patch/src/base/fm-file-info.c (+1851/-0) .pc/90-fix-mime-null-crash.patch/src/base/fm-mime-type.c (+484/-0) .pc/90-fix-mime-null-crash.patch/src/base/fm-templates.c (+1108/-0) .pc/applied-patches (+1/-1) configure.ac (+1/-1) debian/changelog (+23/-0) debian/control (+19/-9) debian/copyright (+29/-2) debian/libfm-dev.install (+1/-0) debian/libfm-extra4.lintian-overrides (+2/-0) debian/libfm4.docs (+0/-1) debian/patches/02-disable-Werror.patch (+0/-13) debian/patches/90-fix-mime-null-crash.patch (+59/-0) debian/patches/series (+1/-1) debian/rules (+4/-4) debian/source/lintian-overrides (+2/-0) src/base/fm-file-info.c (+5/-0) src/base/fm-mime-type.c (+2/-1) src/base/fm-templates.c (+6/-1) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/vivid/libfm/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Julien Lavergne (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian.
To post a comment you must log in.
Revision history for this message
| Julien Lavergne (gilir) wrote | # |
Revision history for this message
| Jackson Doak (noskcaj) wrote | # |
Unmerged revisions
- 25. By Jackson Doak
-
Drop accidentally left in change
- 24. By Jackson Doak
-
Drop some unneeded changes
- 23. By Jackson Doak
-
* Merge with Debian; remaining changes:
- Build using dh-autoreconf.
- Library packages are M-A: same.
- Build lxshortcut and lxshortcut-dbg packages.
- libfm-tools: Install libfm-pref-apps desktop file.
- Disable build using -Werror.
- libfm-dev.postinst: Remove /usr/include/libfm, even if it is not empty.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
libfm-dev.postinst: I'm not sure there a diff now between Debian and Ubuntu
dh-autoreconf + -Werror : We can try to build without this. If it fails, upstream can look after this. Also, it already build Ok on all arch of Debian.
Library packages are M-A: same : that could be report to Debian, but you can keep it since it's not in sync.
The rest is OK, thanks for your work :-)