Merge lp://qastaging/~osomon/bamf-qt/libdir into lp://qastaging/bamf-qt
Proposed by
Olivier Tilloy
| Status: | Needs review | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://qastaging/~osomon/bamf-qt/libdir | ||||
| Merge into: | lp://qastaging/bamf-qt | ||||
| Diff against target: |
151 lines (+40/-24) 7 files modified
.bzrignore (+3/-0) CMakeLists.txt (+20/-9) debian/changelog (+5/-1) debian/libqtbamf-dev.dirs (+0/-2) debian/libqtbamf-dev.install.in (+3/-3) debian/libqtbamf1.install.in (+3/-3) libqtbamf.pc.in (+6/-6) |
||||
| To merge this branch: | bzr merge lp://qastaging/~osomon/bamf-qt/libdir | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| unity-2d-team | Pending | ||
|
Review via email:
|
|||
Commit message
Un-hardcode standard install paths (use GNUInstallDirs.
To post a comment you must log in.
Revision history for this message
| Balló György (ballogy) wrote | # |
Unmerged revisions
- 395. By Olivier Tilloy
-
Fix the substitutions in debian/
libqtbamf1. install. in to account for the latest changes from the trunk. - 394. By Olivier Tilloy
-
Merge the latest changes from the trunk, and resolve conflicts.
- 393. By Olivier Tilloy
-
Add changes to the debian changelog.
- 392. By Olivier Tilloy
-
Merge the latest changes from the trunk.
- 391. By Olivier Tilloy
-
Un-hardcode install paths in debian install files.
- 390. By Olivier Tilloy
-
Remove unused file.
- 389. By Olivier Tilloy
-
Have the pkg-config file generated with correct target directories.
Fix its version number (hardcoded in want of a better solution) and its dependencies. - 388. By Olivier Tilloy
-
Un-hardcode standard install paths (use GNUInstallDirs.
cmake).
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Please use ${QT_IMPORTS_