Merge lp:~jamesh/mediascanner2/packaging-fixes into lp:mediascanner2
Status: | Merged |
---|---|
Approved by: | Michi Henning |
Approved revision: | 318 |
Merge reported by: | James Henstridge |
Merged at revision: | not available |
Proposed branch: | lp:~jamesh/mediascanner2/packaging-fixes |
Merge into: | lp:mediascanner2 |
Diff against target: |
211 lines (+54/-10) 9 files modified
CMakeLists.txt (+3/-2) debian/changelog (+7/-0) debian/control (+18/-2) debian/control.in (+18/-2) debian/copyright (+1/-1) debian/mediascanner2.0.install (+1/-1) debian/rules (+2/-0) mediascanner-2.0.conf.in (+1/-1) src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt (+3/-1) |
To merge this branch: | bzr merge lp:~jamesh/mediascanner2/packaging-fixes |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Michi Henning (community) | Approve | ||
PS Jenkins bot (community) | continuous-integration | Approve | |
Review via email: mp+273784@code.launchpad.net |
Commit message
Update packaging to rename qtdeclarative5-
Description of the change
Some updates to the packaging for mediascanner2, most based on lintian complaints:
1. Rename the QML module binary package to qml-module-* and add a transitional package so things can upgrade.
2. Don't build a soname into the QML module.
3. Fix up the debian/copyright file to include a short license string for the mozilla FTS files.
4. Don't build-depend on qt5-default: instead use the QT_SELECT environment variable.
5. Move the mediascanner-
Looks good!