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
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-09-21 10:51:40 +0000
3+++ CMakeLists.txt 2015-11-02 02:37:14 +0000
4@@ -1,7 +1,7 @@
5 project(mediascanner2 CXX C)
6 cmake_minimum_required(VERSION 2.8.9)
7
8-set(MEDIASCANNER_VERSION "0.107")
9+set(MEDIASCANNER_VERSION "0.108")
10
11 execute_process(
12 COMMAND /bin/sh ${CMAKE_CURRENT_SOURCE_DIR}/get-soversion.sh
13@@ -60,8 +60,9 @@
14 DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
15
16 # Install Upstart user session job
17+configure_file(mediascanner-2.0.conf.in mediascanner-2.0.conf)
18 install(
19- FILES mediascanner-2.0.conf
20+ FILES ${CMAKE_CURRENT_BINARY_DIR}/mediascanner-2.0.conf
21 DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions
22 )
23
24
25=== modified file 'debian/changelog'
26--- debian/changelog 2015-09-22 12:11:11 +0000
27+++ debian/changelog 2015-11-02 02:37:14 +0000
28@@ -1,3 +1,10 @@
29+mediascanner2 (0.108-0ubuntu1) UNRELEASED; urgency=medium
30+
31+ * Rename QML plugin package to qml-module-* and add transitional package
32+ for upgrades. (LP: #1342031)
33+
34+ -- James Henstridge <james.henstridge@canonical.com> Thu, 08 Oct 2015 12:18:08 +0800
35+
36 mediascanner2 (0.107+15.10.20150922.1-0ubuntu1) wily; urgency=medium
37
38 [ James Henstridge ]
39
40=== modified file 'debian/control'
41--- debian/control 2015-09-22 06:51:42 +0000
42+++ debian/control 2015-11-02 02:37:14 +0000
43@@ -7,7 +7,7 @@
44 Section: libs
45 Priority: optional
46 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
47-Standards-Version: 3.9.5
48+Standards-Version: 3.9.6
49 Build-Depends: cmake,
50 cmake-extras,
51 dbus,
52@@ -25,7 +25,6 @@
53 libsqlite3-dev (>= 3.8.5),
54 libudisks2-dev,
55 lsb-release,
56- qt5-default,
57 qtbase5-dev,
58 qtbase5-dev-tools,
59 qtdeclarative5-dev,
60@@ -57,6 +56,7 @@
61
62 Package: mediascanner2.0
63 Architecture: any
64+Multi-Arch: foreign
65 Pre-Depends: ${misc:Pre-Depends},
66 Depends: gstreamer1.0-plugins-base,
67 gstreamer1.0-plugins-good,
68@@ -81,10 +81,26 @@
69
70 Package: qtdeclarative5-ubuntu-mediascanner0.1
71 Architecture: any
72+Multi-Arch: same
73+Section: oldlibs
74+Depends: qml-module-ubuntu-mediascanner0.1,
75+ ${misc:Depends},
76+Description: transitional dummy package for QML plugin for the Ubuntu Media Scanner
77+ This package provides components that allow access to the media
78+ scanner index from Qt Quick 2 / QML applications.
79+ .
80+ This is a transitional dummy package for qml-module-ubuntu-mediascanner0.1
81+ which can be safely removed.
82+
83+Package: qml-module-ubuntu-mediascanner0.1
84+Architecture: any
85+Multi-Arch: same
86 Pre-Depends: ${misc:Pre-Depends},
87 Depends: mediascanner2.0 (= ${binary:Version}),
88 ${misc:Depends},
89 ${shlibs:Depends},
90+Breaks: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
91+Replaces: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
92 Description: QML plugin for the Ubuntu Media Scanner
93 This package provides components that allow access to the media
94 scanner index from Qt Quick 2 / QML applications.
95
96=== modified file 'debian/control.in'
97--- debian/control.in 2015-09-22 06:51:42 +0000
98+++ debian/control.in 2015-11-02 02:37:14 +0000
99@@ -2,7 +2,7 @@
100 Section: libs
101 Priority: optional
102 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
103-Standards-Version: 3.9.5
104+Standards-Version: 3.9.6
105 Build-Depends: cmake,
106 cmake-extras,
107 dbus,
108@@ -20,7 +20,6 @@
109 libsqlite3-dev (>= 3.8.5),
110 libudisks2-dev,
111 lsb-release,
112- qt5-default,
113 qtbase5-dev,
114 qtbase5-dev-tools,
115 qtdeclarative5-dev,
116@@ -52,6 +51,7 @@
117
118 Package: mediascanner2.0
119 Architecture: any
120+Multi-Arch: foreign
121 Pre-Depends: ${misc:Pre-Depends},
122 Depends: gstreamer1.0-plugins-base,
123 gstreamer1.0-plugins-good,
124@@ -76,10 +76,26 @@
125
126 Package: qtdeclarative5-ubuntu-mediascanner0.1
127 Architecture: any
128+Multi-Arch: same
129+Section: oldlibs
130+Depends: qml-module-ubuntu-mediascanner0.1,
131+ ${misc:Depends},
132+Description: transitional dummy package for QML plugin for the Ubuntu Media Scanner
133+ This package provides components that allow access to the media
134+ scanner index from Qt Quick 2 / QML applications.
135+ .
136+ This is a transitional dummy package for qml-module-ubuntu-mediascanner0.1
137+ which can be safely removed.
138+
139+Package: qml-module-ubuntu-mediascanner0.1
140+Architecture: any
141+Multi-Arch: same
142 Pre-Depends: ${misc:Pre-Depends},
143 Depends: mediascanner2.0 (= ${binary:Version}),
144 ${misc:Depends},
145 ${shlibs:Depends},
146+Breaks: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
147+Replaces: qtdeclarative5-ubuntu-mediascanner0.1 (<< 0.108~)
148 Description: QML plugin for the Ubuntu Media Scanner
149 This package provides components that allow access to the media
150 scanner index from Qt Quick 2 / QML applications.
151
152=== modified file 'debian/copyright'
153--- debian/copyright 2014-01-16 15:10:25 +0000
154+++ debian/copyright 2015-11-02 02:37:14 +0000
155@@ -34,7 +34,7 @@
156
157 Files: src/mediascanner/mozilla/fts*
158 Copyright: Public Domain
159-License:
160+License: public-domain
161 The author disclaims copyright to this source code. In place of
162 a legal notice, here is a blessing:
163 .
164
165=== modified file 'debian/mediascanner2.0.install'
166--- debian/mediascanner2.0.install 2014-06-24 15:47:53 +0000
167+++ debian/mediascanner2.0.install 2015-11-02 02:37:14 +0000
168@@ -1,4 +1,4 @@
169-usr/bin/*
170+usr/bin/mediascanner-service-2.0
171 usr/lib/*/mediascanner-2.0/mediascanner-dbus-2.0
172 usr/share/dbus-1/services/*
173 usr/share/upstart/sessions/*
174
175=== renamed file 'debian/qtdeclarative5-ubuntu-mediascanner0.1.install' => 'debian/qml-module-ubuntu-mediascanner0.1.install'
176=== modified file 'debian/rules'
177--- debian/rules 2015-09-21 10:20:38 +0000
178+++ debian/rules 2015-11-02 02:37:14 +0000
179@@ -11,6 +11,8 @@
180 # http://ccache.samba.org/manual.html#_precompiled_headers
181 export CCACHE_SLOPPINESS=time_macros
182
183+export QT_SELECT=qt5
184+
185 %:
186 dh $@ --parallel --fail-missing
187
188
189=== renamed file 'mediascanner-2.0.conf' => 'mediascanner-2.0.conf.in'
190--- mediascanner-2.0.conf 2013-12-18 10:57:10 +0000
191+++ mediascanner-2.0.conf.in 2015-11-02 02:37:14 +0000
192@@ -4,4 +4,4 @@
193 start on started dbus
194
195 respawn
196-exec mediascanner-service-2.0
197+exec @CMAKE_INSTALL_FULL_BINDIR@/mediascanner-service-2.0
198
199=== modified file 'src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt'
200--- src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt 2014-08-29 07:02:13 +0000
201+++ src/qml/Ubuntu/MediaScanner.0.1/CMakeLists.txt 2015-11-02 02:37:14 +0000
202@@ -17,7 +17,9 @@
203 SongsSearchModel.cc
204 )
205
206-set_target_properties(mediascanner-qml PROPERTIES AUTOMOC TRUE)
207+set_target_properties(mediascanner-qml PROPERTIES
208+ AUTOMOC TRUE
209+ NO_SONAME TRUE)
210 qt5_use_modules(mediascanner-qml Qml Concurrent DBus)
211 target_link_libraries(mediascanner-qml mediascanner ms-dbus)
212

Subscribers

People subscribed via source and target branches