Merge lp://qastaging/~townsend/libertine-scope/release-1.3.1 into lp://qastaging/libertine-scope/release
Proposed by
Christopher Townsend
| Status: | Merged | ||||
|---|---|---|---|---|---|
| Approved by: | Larry Price | ||||
| Approved revision: | 52 | ||||
| Merged at revision: | 52 | ||||
| Proposed branch: | lp://qastaging/~townsend/libertine-scope/release-1.3.1 | ||||
| Merge into: | lp://qastaging/libertine-scope/release | ||||
| Diff against target: |
1329 lines (+222/-423) 46 files modified
CMakeLists.txt (+38/-24) README.md (+1/-12) data/CMakeLists.txt (+2/-16) data/libertine-scope.ini.in (+0/-7) debian/changelog (+13/-0) debian/control (+1/-1) debian/rules (+3/-1) libertine-scope.apparmor (+1/-1) manifest.json.in (+1/-1) po/CMakeLists.txt (+12/-8) po/POTFILES.in.in (+1/-1) po/en_AU.po (+5/-31) po/en_GB.po (+5/-31) po/es.po (+5/-31) po/fi.po (+5/-31) po/fr.po (+5/-31) po/gl.po (+4/-30) po/libertine-scope.pot (+22/-18) po/ms.po (+5/-31) po/pt.po (+5/-31) po/uk.po (+5/-31) scope/CMakeLists.txt (+2/-0) scope/apps/CMakeLists.txt (+28/-13) scope/apps/action.cpp (+6/-5) scope/apps/action.h (+1/-1) scope/apps/applauncher.cpp (+1/-1) scope/apps/blacklist.cpp (+1/-1) scope/apps/config.h.in (+0/-1) scope/apps/container.cpp (+1/-1) scope/apps/container.h (+1/-1) scope/apps/hidden_apps.cpp (+1/-1) scope/apps/libertine-scope.ubuntu_libertine-scope.ini.in.in (+11/-0) scope/apps/libertine.cpp (+2/-2) scope/apps/preview.cpp (+2/-2) scope/apps/query.cpp (+8/-8) scope/apps/query.h (+3/-3) scope/apps/scope.cpp (+5/-5) scope/apps/scope.h (+1/-1) tests/CMakeLists.txt (+1/-1) tests/fake_container.h (+1/-1) tests/fake_libertine.h (+1/-1) tests/scopefixture.h (+1/-1) tests/test_blacklist.cpp (+1/-1) tests/test_hidden_apps.cpp (+1/-1) tests/test_preview.cpp (+1/-1) tests/test_query.cpp (+2/-2) |
||||
| To merge this branch: | bzr merge lp://qastaging/~townsend/libertine-scope/release-1.3.1 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Larry Price | Approve | ||
|
Review via email:
|
|||
Commit message
* Rename the scope to "Desktop Apps" per product management and design. (LP: #1602393)
* Fix parallel make and prevent generation of translations except during debuild.
* Suppress compiler warnings for header files included from libubuntu-
* Restructure libertine-scope in preparation for adding the store scope.
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
lgtm!