Merge lp://qastaging/~timo-jyrinki/bamf/revert_unneeded_commits into lp://qastaging/bamf/0.3
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Approved by: | Timo Jyrinki |
| Approved revision: | 494 |
| Merged at revision: | 494 |
| Proposed branch: | lp://qastaging/~timo-jyrinki/bamf/revert_unneeded_commits |
| Merge into: | lp://qastaging/bamf/0.3 |
| Diff against target: |
632 lines (+76/-171) 13 files modified
config.h.in (+0/-3) configure.in (+2/-11) lib/libbamf/Makefile.am (+24/-37) lib/libbamf/bamf-application.c (+0/-12) lib/libbamf/bamf-control.c (+0/-5) lib/libbamf/bamf-matcher.c (+5/-5) lib/libbamf/bamf-tab-source.c (+0/-13) lib/libbamf/bamf-view.c (+3/-4) lib/libbamf/bamf-view.h (+1/-1) lib/libbamf/bamf-window.c (+1/-1) src/Makefile.am (+26/-35) src/bamf-matcher.c (+0/-6) tests/bamfdaemon/Makefile.am (+14/-38) |
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/bamf/revert_unneeded_commits |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Zemczak | Approve | ||
|
Review via email:
|
|||
Commit message
Revert 4 commits not relevant to the LibreOffice fixes:
- Autoconf: Make libunity-webapps an optional dependency.
- Libbamf: Some signal, type and annotation fixes.
- libbamf: gir-annotion fixes and make gi-scanner verbose.
- Autoconf: Exclude generated sources from tarball and fix "make distcheck".
Description of the change
Revert the 4 cleanup commits not related directly to LibreOffice fixes, for 0.3.4.1.
- Autoconf: Make libunity-webapps an optional dependency.
- Libbamf: Some signal, type and annotation fixes.
- libbamf: gir-annotion fixes and make gi-scanner verbose.
- Autoconf: Exclude generated sources from tarball and fix "make distcheck".
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
Looks good, packages built with it work and the OO bug seems still fixed. Good for me.