kubuntu-packaging

Merge lp:~timo-jyrinki/kubuntu-packaging/qtsensors_sync_debian_521 into lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src

  1. qtsensors_sync_debian_521
  2. Merge into qtsensors-opensource-src
Proposed by Timo Jyrinki
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 53
Merged at revision: 53
Proposed branch: lp:~timo-jyrinki/kubuntu-packaging/qtsensors_sync_debian_521
Merge into: lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src
Diff against target: 284 lines (+165/-19)
8 files modified
debian/changelog (+75/-1)
debian/control (+29/-3)
debian/libqt5sensors5.install (+0/-7)
debian/libqt5sensors5.install-common (+6/-0)
debian/libqt5sensors5.install-linux (+1/-0)
debian/qtsensors5-doc-html.install (+1/-0)
debian/qtsensors5-doc.install (+1/-0)
debian/rules (+52/-8)
To merge this branch: bzr merge lp:~timo-jyrinki/kubuntu-packaging/qtsensors_sync_debian_521
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Kubuntu Packagers Pending
Review via email: mp+208546@code.launchpad.net

Commit message

* Sync with Debian 5.2.1+dfsg-2, remaining changes:
  - Keep transitional package for this Ubuntu cycle
  - Tests enabled

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:53
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-ci/4/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-trusty-amd64-ci/4/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-trusty-armhf-ci/4/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-ci/4/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

This one should be able to find the tarball from qt5-beta2 PPA without going to upstream (and upstream doesn't have "dfsg" versions).

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

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-autolanding/1/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-trusty-amd64-autolanding/1/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/kubuntu-packagers-kubuntu-packaging-qtsensors-opensource-src-trusty-armhf-autolanding/1

review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Ok the amd64 looks like a random archive update failure.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2014-02-13 07:06:25 +0000
3+++ debian/changelog 2014-02-27 08:29:21 +0000
4@@ -1,12 +1,86 @@
5-qtsensors-opensource-src (5.2.1+dfsg~ubuntu-0ubuntu1) UNRELEASED; urgency=low
6+qtsensors-opensource-src (5.2.1+dfsg-2ubuntu1) UNRELEASED; urgency=low
7
8 [ Timo Jyrinki ]
9 * New upstream version
10 * Reduce delta to Debian by dropping private headers too
11 * Re-enable tests
12+ * Sync with Debian 5.2.1+dfsg-2, remaining changes:
13+ - Keep transitional package for this Ubuntu cycle
14+ - Tests enabled
15
16 -- Timo Jyrinki <timo-jyrinki@ubuntu.com> Thu, 13 Feb 2014 07:06:20 +0000
17
18+qtsensors-opensource-src (5.2.1+dfsg-2) experimental; urgency=medium
19+
20+ [ Dmitry Shachnev ]
21+ * Build documentation packages (closes: #737712).
22+ * Properly clean the build.
23+
24+ [ Lisandro Damián Nicanor Pérez Meyer ]
25+ * Add Build-Depends-Indep with libqt5sql5-sqlite and qttools5-dev-tools to be
26+ able to build the doc.
27+
28+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Tue, 25 Feb 2014 15:03:18 -0300
29+
30+qtsensors-opensource-src (5.2.1+dfsg-1) experimental; urgency=medium
31+
32+ * New upstream release.
33+ * Bump Qt build dependencies.
34+
35+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Sun, 16 Feb 2014 18:33:42 -0300
36+
37+qtsensors-opensource-src (5.2.0+dfsg-3) unstable; urgency=medium
38+
39+ * Upload to unstable.
40+ * Move mkspec files to their new location.
41+ - B-D on qtbase5-private-dev 5.2.0+dfsg-7 which changed the location.
42+ * Update Standards-Version to 3.9.5, no changes required.
43+
44+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Fri, 31 Jan 2014 20:45:12 -0300
45+
46+qtsensors-opensource-src (5.2.0+dfsg-2) experimental; urgency=low
47+
48+ [ Dmitry Shachnev ]
49+ * Fix typo in the previous changelog entry.
50+ * Install libqtsensors_linuxsys.so only on Linux.
51+
52+ [ Pino Toscano ]
53+ * Do not install the private qmake stuff.
54+ * Remove the Pre-Depends on dpkg >= 1.15.6~, since that version is available
55+ in Squeeze already.
56+
57+ [ Lisandro Damián Nicanor Pérez Meyer ]
58+ * Move mkspec files to their new location.
59+ - B-D on qtbase5-private-dev 5.2.0+dfsg-7 which changed the location.
60+ * Update Standards-Version to 3.9.5, no changes required.
61+
62+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Thu, 26 Dec 2013 15:18:42 -0300
63+
64+qtsensors-opensource-src (5.2.0+dfsg-1) experimental; urgency=low
65+
66+ [ Dmitry Shachnev ]
67+ * New upstream release.
68+ * Update libqt5sensors5.symbols.
69+ * Bump qtbase and qtdeclarative build-dependencies to 5.2.0.
70+ * Make Vcs-Browser field canonical by dropping useless attribute.
71+ * Run tests during build.
72+ * Explicitly define DEB_HOST_MULTIARCH in debian/rules.
73+ * Use my correct email for Uploaders field.
74+
75+ [ Lisandro Damián Nicanor Pérez Meyer ]
76+ * Remove transitional dummy package libqtsensors5-dev, it is no longer
77+ needed.
78+ * Regenerate symbols that used the qreal subst, they are no longer necessary.
79+
80+ -- Lisandro Damián Nicanor Pérez Meyer <lisandro@debian.org> Sat, 14 Dec 2013 00:06:08 -0300
81+
82+qtsensors-opensource-src (5.1.1+dfsg-3) unstable; urgency=low
83+
84+ * Substitute qreal in symbols file to fix FTBFS on armhf.
85+ * Add myself to uploaders
86+
87+ -- Dmitry Shachnev <mitya57@ubuntu.com> Tue, 12 Nov 2013 12:29:47 -0500
88+
89 qtsensors-opensource-src (5.1.1+dfsg-2ubuntu3) trusty; urgency=low
90
91 [ Iftikhar Ahmad (QA Engineer) ]
92
93=== modified file 'debian/control'
94--- debian/control 2014-02-11 05:02:19 +0000
95+++ debian/control 2014-02-27 08:29:21 +0000
96@@ -14,7 +14,9 @@
97 qtbase5-private-dev (>= 5.2.1+dfsg~),
98 qtdeclarative5-private-dev (>= 5.2.1~),
99 xauth,
100- xvfb,
101+ xvfb
102+Build-Depends-Indep: libqt5sql5-sqlite (>= 5.2.1+dfsg~),
103+ qttools5-dev-tools (>= 5.2.1~)
104 Standards-Version: 3.9.5
105 Homepage: http://qt-project.org/
106 Vcs-Bzr: lp:~kubuntu-packagers/kubuntu-packaging/qtsensors-opensource-src
107@@ -57,8 +59,8 @@
108 Section: libdevel
109 Architecture: any
110 Depends: libqt5sensors5 (= ${binary:Version}), qtbase5-dev, ${misc:Depends}
111-Breaks: qtsensors5-dev (<< 5.1.1+dfsg~)
112-Replaces: qtsensors5-dev (<< 5.1.1+dfsg~)
113+Breaks: libqtsensors5-dev (<< 5.1.1+dfsg-2~)
114+Replaces: libqtsensors5-dev (<< 5.1.1+dfsg-2~)
115 Description: Qt 5 Sensors development files
116 Qt is a cross-platform C++ application framework. Qt's primary feature
117 is its rich set of widgets that provide standard GUI functionality.
118@@ -91,3 +93,27 @@
119 .
120 This package contains the debugging symbols for the Qt 5 Sensors
121 libraries.
122+
123+Package: qtsensors5-doc
124+Priority: extra
125+Architecture: all
126+Section: doc
127+Depends: ${misc:Depends}
128+Description: Qt 5 Sensors documentation
129+ Qt is a cross-platform C++ application framework. Qt's primary feature
130+ is its rich set of widgets that provide standard GUI functionality.
131+ .
132+ This package contains the documentation for the Qt 5 Sensors library
133+ and binaries.
134+
135+Package: qtsensors5-doc-html
136+Priority: extra
137+Architecture: all
138+Section: doc
139+Depends: ${misc:Depends}
140+Description: Qt 5 Sensors HTML documentation
141+ Qt is a cross-platform C++ application framework. Qt's primary feature
142+ is its rich set of widgets that provide standard GUI functionality.
143+ .
144+ This package contains the HTML documentation for the Qt 5 Sensors
145+ libraries and binaries.
146
147=== removed file 'debian/libqt5sensors5.install'
148--- debian/libqt5sensors5.install 2013-08-30 07:22:15 +0000
149+++ debian/libqt5sensors5.install 1970-01-01 00:00:00 +0000
150@@ -1,7 +0,0 @@
151-usr/lib/*/libQt5Sensors.so.5*
152-usr/lib/*/qt5/plugins/sensorgestures/libqtsensorgestures_counterplugin.so
153-usr/lib/*/qt5/plugins/sensorgestures/libqtsensorgestures_plugin.so
154-usr/lib/*/qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.so
155-usr/lib/*/qt5/plugins/sensors/libqtsensors_dummy.so
156-usr/lib/*/qt5/plugins/sensors/libqtsensors_generic.so
157-usr/lib/*/qt5/plugins/sensors/libqtsensors_linuxsys.so
158
159=== added file 'debian/libqt5sensors5.install-common'
160--- debian/libqt5sensors5.install-common 1970-01-01 00:00:00 +0000
161+++ debian/libqt5sensors5.install-common 2014-02-27 08:29:21 +0000
162@@ -0,0 +1,6 @@
163+usr/lib/*/libQt5Sensors.so.5*
164+usr/lib/*/qt5/plugins/sensorgestures/libqtsensorgestures_counterplugin.so
165+usr/lib/*/qt5/plugins/sensorgestures/libqtsensorgestures_plugin.so
166+usr/lib/*/qt5/plugins/sensorgestures/libqtsensorgestures_shakeplugin.so
167+usr/lib/*/qt5/plugins/sensors/libqtsensors_dummy.so
168+usr/lib/*/qt5/plugins/sensors/libqtsensors_generic.so
169
170=== added file 'debian/libqt5sensors5.install-linux'
171--- debian/libqt5sensors5.install-linux 1970-01-01 00:00:00 +0000
172+++ debian/libqt5sensors5.install-linux 2014-02-27 08:29:21 +0000
173@@ -0,0 +1,1 @@
174+usr/lib/*/qt5/plugins/sensors/libqtsensors_linuxsys.so
175
176=== added file 'debian/qtsensors5-doc-html.install'
177--- debian/qtsensors5-doc-html.install 1970-01-01 00:00:00 +0000
178+++ debian/qtsensors5-doc-html.install 2014-02-27 08:29:21 +0000
179@@ -0,0 +1,1 @@
180+usr/share/qt5/doc/qtsensors
181
182=== added file 'debian/qtsensors5-doc.install'
183--- debian/qtsensors5-doc.install 1970-01-01 00:00:00 +0000
184+++ debian/qtsensors5-doc.install 2014-02-27 08:29:21 +0000
185@@ -0,0 +1,1 @@
186+usr/share/qt5/doc/qtsensors.qch
187
188=== modified file 'debian/rules'
189--- debian/rules 2014-02-11 05:02:19 +0000
190+++ debian/rules 2014-02-27 08:29:21 +0000
191@@ -3,11 +3,18 @@
192 # Uncomment this to turn on verbose mode.
193 #export DH_VERBOSE=1
194
195+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
196+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
197+
198 export CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
199 export CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(shell dpkg-buildflags --get CPPFLAGS)
200 export LDFLAGS := $(shell dpkg-buildflags --get LDFLAGS) -Wl,--as-needed
201 export QT_SELECT := qt5
202-export QT_QPA_PLATFORM := minimal
203+
204+# Retrieve packages that have a .install-common file
205+pkgs_with_common = $(patsubst debian/%.install-common,%,$(wildcard debian/*.install-common))
206+# Retrieve packages that have a .install-$DEB_HOST_ARCH_OS file
207+pkgs_with_os = $(patsubst debian/%.install-$(DEB_HOST_ARCH_OS),%,$(wildcard debian/*.install-$(DEB_HOST_ARCH_OS)))
208
209 %:
210 dh $@ --parallel --with pkgkde_symbolshelper --dbg-package=qtsensors5-dbg
211@@ -15,7 +22,19 @@
212 override_dh_auto_configure:
213 qmake QT_BUILD_PARTS+=tests
214
215-override_dh_auto_install:
216+override_dh_auto_build-arch:
217+ # This override may seem futile, but it helps us make sure that the tools
218+ # needed for building the docs are built before calling them.
219+ # If there's a better way, do not hesitate to tell us.
220+ dh_auto_build
221+
222+override_dh_auto_build-indep:
223+ dh_auto_build -Smakefile -- docs
224+
225+override_dh_auto_test:
226+ xvfb-run -a make check QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
227+
228+override_dh_auto_install-arch:
229 dh_auto_install
230
231 # Fix wrong path in pkgconfig files
232@@ -24,21 +43,46 @@
233
234 # Remove libtool-like files
235 rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
236-
237+
238 # Remove private headers
239 rm -fv debian/tmp/usr/include/qt5/QtSensors/*/QtSensors/private/*
240-
241- # Hack for a buggy installation
242- rm -rf debian/tmp/home debian/tmp/build
243+ # ... and other private stuff
244+ rm -fv debian/tmp/usr/lib/*/qt5/mkspecs/modules/qt_lib_sensors_private.pri
245+
246+override_dh_auto_install-indep:
247+ make INSTALL_ROOT=$(CURDIR)/debian/tmp install_docs
248
249 override_dh_install:
250+ # Now flush all the .install-* files as .install files.
251+ set -e; for pkg in $(pkgs_with_common); do \
252+ cat debian/$$pkg.install-common >> debian/$$pkg.install ; \
253+ done
254+
255+ set -e; for pkg in $(pkgs_with_os); do \
256+ cat debian/$$pkg.install-$(DEB_HOST_ARCH_OS) >> debian/$$pkg.install ; \
257+ done
258+
259 dh_install --fail-missing
260
261 override_dh_builddeb:
262 dh_builddeb -- -Zxz
263
264-override_dh_auto_test:
265- cd tests/auto/ && ( test -e Makefile || qmake auto.pro -o Makefile ) && xvfb-run -a make -f Makefile check
266+override_dh_auto_clean:
267+ dh_auto_clean
268+ rm -rf doc/qtsensors doc/qtsensors.qch
269+ rm -f examples/sensors/grue/detect_grue
270+
271+override_dh_clean:
272+ dh_clean
273+
274+ # Don't forget to remove the .install files we generated.
275+ for pkg in $(pkgs_with_common); do \
276+ rm -f debian/$$pkg.install ; \
277+ done
278+
279+ for pkg in $(pkgs_with_os); do \
280+ rm -f debian/$$pkg.install ; \
281+ done
282
283 prune-nonfree:
284 # Remove minified jquery without source.

Subscribers

People subscribed via source and target branches