mediascanner2

Merge lp:~jamesh/mediascanner2/packaging-fixes into lp:mediascanner2

  1. packaging-fixes
  2. Merge into trunk
Proposed by James Henstridge
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
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-ubuntu-mediascanner0.1 package to qml-module-*, and fix a few other problems pointed out by Lintian.

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-service-2.0 binary from /usr/bin to $(libdir)/mediascanner-2.0/ since it is not intended to be called directly (silences warning about missing man page).

To post a comment you must log in.
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:317
http://jenkins.qa.ubuntu.com/job/mediascanner2-ci/193/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-amd64-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/30
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-armhf-ci/30/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-vivid-i386-ci/30
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-amd64-ci/5
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/5
        deb: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-armhf-ci/5/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mediascanner2-wily-i386-ci/5

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mediascanner2-ci/193/rebuild

review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2015-09-21 10:51:40 +0000
+++ CMakeLists.txt 2015-11-02 02:37:14 +0000
@@ -1,7 +1,7 @@
1project(mediascanner2 CXX C)1project(mediascanner2 CXX C)
2cmake_minimum_required(VERSION 2.8.9)2cmake_minimum_required(VERSION 2.8.9)
33
4set(MEDIASCANNER_VERSION "0.107")4set(MEDIASCANNER_VERSION "0.108")
55
6execute_process(6execute_process(
7 COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/get-soversion.sh7 COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/get-soversion.sh
@@ -60,8 +60,9 @@
60 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)60 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
6161
62# Install Upstart user session job62# Install Upstart user session job
63configure_file(mediascanner-2.0.conf.in mediascanner-2.0.conf)
63install(64install(
64 FILES mediascanner-2.0.conf65 FILES ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-2.0.conf
65 DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions66 DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
66)67)
6768
6869
=== modified file 'debian/changelog'
--- debian/changelog 2015-09-22 12:11:11 +0000
+++ debian/changelog 2015-11-02 02:37:14 +0000
@@ -1,3 +1,10 @@
1mediascanner2 (0.108-0ubuntu1) UNRELEASED; urgency=medium
2
3 * Rename QML plugin package to qml-module-* and add transitional package
4 for upgrades. (LP: #1342031)
5
6 -- James Henstridge <james.henstridge@canonical.com> Thu, 08 Oct 2015 12:18:08 +0800
7
1mediascanner2 (0.107+15.10.20150922.1-0ubuntu1) wily; urgency=medium8mediascanner2 (0.107+15.10.20150922.1-0ubuntu1) wily; urgency=medium
29
3 [ James Henstridge ]10 [ James Henstridge ]
411
=== modified file 'debian/control'
--- debian/control 2015-09-22 06:51:42 +0000
+++ debian/control 2015-11-02 02:37:14 +0000
@@ -7,7 +7,7 @@
7Section: libs7Section: libs
8Priority: optional8Priority: optional
9Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>9Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
10Standards-Version: 3.9.510Standards-Version: 3.9.6
11Build-Depends: cmake,11Build-Depends: cmake,
12 cmake-extras,12 cmake-extras,
13 dbus,13 dbus,
@@ -25,7 +25,6 @@
25 libsqlite3-dev (>= 3.8.5),25 libsqlite3-dev (>= 3.8.5),
26 libudisks2-dev,26 libudisks2-dev,
27 lsb-release,27 lsb-release,
28 qt5-default,
29 qtbase5-dev,28 qtbase5-dev,
30 qtbase5-dev-tools,29 qtbase5-dev-tools,
31 qtdeclarative5-dev,30 qtdeclarative5-dev,
@@ -57,6 +56,7 @@
5756
58Package: mediascanner2.057Package: mediascanner2.0
59Architecture: any58Architecture: any
59Multi-Arch: foreign
60Pre-Depends: ${misc:Pre-Depends},60Pre-Depends: ${misc:Pre-Depends},
61Depends: gstreamer1.0-plugins-base,61Depends: gstreamer1.0-plugins-base,
62 gstreamer1.0-plugins-good,62 gstreamer1.0-plugins-good,
@@ -81,10 +81,26 @@
8181
82Package: qtdeclarative5-ubuntu-mediascanner0.182Package: qtdeclarative5-ubuntu-mediascanner0.1
83Architecture: any83Architecture: any
84Multi-Arch: same
85Section: oldlibs
86Depends: qml-module-ubuntu-mediascanner0.1,
87 ${misc:Depends},
88Description: transitional dummy package for QML plugin for the Ubuntu Media Scanner
89 This package provides components that allow access to the media
90 scanner index from Qt Quick 2 / QML applications.
91 .
92 This is a transitional dummy package for qml-module-ubuntu-mediascanner0.1
93 which can be safely removed.
94
95Package: qml-module-ubuntu-mediascanner0.1
96Architecture: any
97Multi-Arch: same
84Pre-Depends: ${misc:Pre-Depends},98Pre-Depends: ${misc:Pre-Depends},
85Depends: mediascanner2.0 (= ${binary:Version}),99Depends: mediascanner2.0 (= ${binary:Version}),
86 ${misc:Depends},100 ${misc:Depends},
87 ${shlibs:Depends},101 ${shlibs:Depends},
102Breaks: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
103Replaces: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
88Description: QML plugin for the Ubuntu Media Scanner104Description: QML plugin for the Ubuntu Media Scanner
89 This package provides components that allow access to the media105 This package provides components that allow access to the media
90 scanner index from Qt Quick 2 / QML applications.106 scanner index from Qt Quick 2 / QML applications.
91107
=== modified file 'debian/control.in'
--- debian/control.in 2015-09-22 06:51:42 +0000
+++ debian/control.in 2015-11-02 02:37:14 +0000
@@ -2,7 +2,7 @@
2Section: libs2Section: libs
3Priority: optional3Priority: optional
4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>4Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
5Standards-Version: 3.9.55Standards-Version: 3.9.6
6Build-Depends: cmake,6Build-Depends: cmake,
7 cmake-extras,7 cmake-extras,
8 dbus,8 dbus,
@@ -20,7 +20,6 @@
20 libsqlite3-dev (>= 3.8.5),20 libsqlite3-dev (>= 3.8.5),
21 libudisks2-dev,21 libudisks2-dev,
22 lsb-release,22 lsb-release,
23 qt5-default,
24 qtbase5-dev,23 qtbase5-dev,
25 qtbase5-dev-tools,24 qtbase5-dev-tools,
26 qtdeclarative5-dev,25 qtdeclarative5-dev,
@@ -52,6 +51,7 @@
5251
53Package: mediascanner2.052Package: mediascanner2.0
54Architecture: any53Architecture: any
54Multi-Arch: foreign
55Pre-Depends: ${misc:Pre-Depends},55Pre-Depends: ${misc:Pre-Depends},
56Depends: gstreamer1.0-plugins-base,56Depends: gstreamer1.0-plugins-base,
57 gstreamer1.0-plugins-good,57 gstreamer1.0-plugins-good,
@@ -76,10 +76,26 @@
7676
77Package: qtdeclarative5-ubuntu-mediascanner0.177Package: qtdeclarative5-ubuntu-mediascanner0.1
78Architecture: any78Architecture: any
79Multi-Arch: same
80Section: oldlibs
81Depends: qml-module-ubuntu-mediascanner0.1,
82 ${misc:Depends},
83Description: transitional dummy package for QML plugin for the Ubuntu Media Scanner
84 This package provides components that allow access to the media
85 scanner index from Qt Quick 2 / QML applications.
86 .
87 This is a transitional dummy package for qml-module-ubuntu-mediascanner0.1
88 which can be safely removed.
89
90Package: qml-module-ubuntu-mediascanner0.1
91Architecture: any
92Multi-Arch: same
79Pre-Depends: ${misc:Pre-Depends},93Pre-Depends: ${misc:Pre-Depends},
80Depends: mediascanner2.0 (= ${binary:Version}),94Depends: mediascanner2.0 (= ${binary:Version}),
81 ${misc:Depends},95 ${misc:Depends},
82 ${shlibs:Depends},96 ${shlibs:Depends},
97Breaks: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
98Replaces: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
83Description: QML plugin for the Ubuntu Media Scanner99Description: QML plugin for the Ubuntu Media Scanner
84 This package provides components that allow access to the media100 This package provides components that allow access to the media
85 scanner index from Qt Quick 2 / QML applications.101 scanner index from Qt Quick 2 / QML applications.
86102
=== modified file 'debian/copyright'
--- debian/copyright 2014-01-16 15:10:25 +0000
+++ debian/copyright 2015-11-02 02:37:14 +0000
@@ -34,7 +34,7 @@
3434
35Files: src/mediascanner/mozilla/fts*35Files: src/mediascanner/mozilla/fts*
36Copyright: Public Domain36Copyright: Public Domain
37License:37License: public-domain
38 The author disclaims copyright to this source code. In place of38 The author disclaims copyright to this source code. In place of
39 a legal notice, here is a blessing:39 a legal notice, here is a blessing:
40 .40 .
4141
=== modified file 'debian/mediascanner2.0.install'
--- debian/mediascanner2.0.install 2014-06-24 15:47:53 +0000
+++ debian/mediascanner2.0.install 2015-11-02 02:37:14 +0000
@@ -1,4 +1,4 @@
1usr/bin/*1usr/bin/mediascanner-service-2.0
2usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.02usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0
3usr/share/dbus-1/services/*3usr/share/dbus-1/services/*
4usr/share/upstart/sessions/*4usr/share/upstart/sessions/*
55
=== renamed file 'debian/qtdeclarative5-ubuntu-mediascanner0.1.install' => 'debian/qml-module-ubuntu-mediascanner0.1.install'
=== modified file 'debian/rules'
--- debian/rules 2015-09-21 10:20:38 +0000
+++ debian/rules 2015-11-02 02:37:14 +0000
@@ -11,6 +11,8 @@
11# http://ccache.samba.org/manual.html#_precompiled_headers11# http://ccache.samba.org/manual.html#_precompiled_headers
12export CCACHE_SLOPPINESS=time_macros12export CCACHE_SLOPPINESS=time_macros
1313
14export QT_SELECT=qt5
15
14%:16%:
15 dh $@ --parallel --fail-missing17 dh $@ --parallel --fail-missing
1618
1719
=== renamed file 'mediascanner-2.0.conf' => 'mediascanner-2.0.conf.in'
--- mediascanner-2.0.conf 2013-12-18 10:57:10 +0000
+++ mediascanner-2.0.conf.in 2015-11-02 02:37:14 +0000
@@ -4,4 +4,4 @@
4start on started dbus4start on started dbus
55
6respawn6respawn
7exec mediascanner-service-2.07exec @CMAKE_INSTALL_FULL_BINDIR@/mediascanner-service-2.0
88
=== modified file 'src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt'
--- src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt 2014-08-29 07:02:13 +0000
+++ src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt 2015-11-02 02:37:14 +0000
@@ -17,7 +17,9 @@
17 SongsSearchModel.cc17 SongsSearchModel.cc
18)18)
1919
20set_target_properties(mediascanner-qml PROPERTIES AUTOMOC TRUE)20set_target_properties(mediascanner-qml PROPERTIES
21 AUTOMOC TRUE
22 NO_SONAME TRUE)
21qt5_use_modules(mediascanner-qml Qml Concurrent DBus)23qt5_use_modules(mediascanner-qml Qml Concurrent DBus)
22target_link_libraries(mediascanner-qml mediascanner ms-dbus)24target_link_libraries(mediascanner-qml mediascanner ms-dbus)
2325

Subscribers

People subscribed via source and target branches