Merge lp:~didrocks/ubuntu-docviewer-app/build-fix into lp:~chocanto/ubuntu-docviewer-app/plainText
Proposed by
Didier Roche-Tolomelli
| Status: | Merged |
|---|---|
| Approved by: | Anthony Granger |
| Approved revision: | 8 |
| Merged at revision: | 8 |
| Proposed branch: | lp:~didrocks/ubuntu-docviewer-app/build-fix |
| Merge into: | lp:~chocanto/ubuntu-docviewer-app/plainText |
| Diff against target: |
21 lines (+3/-2) 2 files modified
launcher/src/docviewer-launcher.pri (+2/-2) main.pro (+1/-0) |
| To merge this branch: | bzr merge lp:~didrocks/ubuntu-docviewer-app/build-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Anthony Granger | Approve | ||
|
Review via email:
|
|||
Commit message
add a .pro file at the root of the directory so that debhelper builds with it. Rename the .pro to .pri for the included qmake file as it's the rule, and change paths
Description of the change
add a .pro file at the root of the directory so that debhelper builds with it. Rename the .pro to .pri for the included qmake file as it's the rule, and change paths
---
Note that with distro flags (warnings being treated as errors), a small fix to main.cpp is needed.
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
Thank you for your help !