Merge lp:~xnox/qtubuntu-sensors/inline-packaging into lp:qtubuntu-sensors

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Didier Roche
Approved revision: 26
Merged at revision: 22
Proposed branch: lp:~xnox/qtubuntu-sensors/inline-packaging
Merge into: lp:qtubuntu-sensors
Diff against target: 82 lines (+23/-20)
3 files modified
debian/changelog (+6/-0)
debian/control (+12/-8)
debian/rules (+5/-12)
To merge this branch: bzr merge lp:~xnox/qtubuntu-sensors/inline-packaging
Reviewer Review Type Date Requested Status
Didier Roche Approve
PS Jenkins bot continuous-integration Approve
Ubuntu Phablet Team Pending
Review via email: mp+153771@code.launchpad.net

Commit message

Packaging cleanup in preparation for daily landing.

Description of the change

Following:
https://wiki.ubuntu.com/DailyRelease/InlinePackaging

I'm at the step "Push merge proposal & pester didrocks".

Note this package has never been in ubuntu archive, proper yet.

Note not all dependencies are in raring yet.

Test-build against: ppa:phablet-team/ppa (with all other dependencies enabled)

Only minor tweaks were required.

To post a comment you must log in.
Revision history for this message
Didier Roche (didrocks) wrote :

Looks mostly good, thanks ;)

I think we should merge it once we have the build-dep boostrapped.
You need to have UNRELEASED instead of raring to have it daily-released including your message.

3 small requests (feel free to update the wiki if it's not clear):
- order deps and build-deps, one per lines, and an additonal , at the end (so that the diff doesn't have 2 lines, but just one, when adding a new dep)
- the info debian/control is missing about who to ping if things are not correct (the lines next to Vcs-Bzr…)
- you can directly add the boostrap message (commit 21 for instance to not list older bugs that have been opened and fixed before entering ubuntu) to debian/changelog.

Thanks a lot!

review: Needs Fixing
23. By Dimitri John Ledkov

Address didrocks' comments

24. By Dimitri John Ledkov

there is no reason not to have intel libhybris, for now at least.

25. By Dimitri John Ledkov

m-a predepends, set source format to 1.0

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

FAILED: Continuous integration, rev:25
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~xnox/qtubuntu-sensors/inline-packaging/+merge/153771/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-ci/1/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-quantal-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-quantal-armhf-ci/1/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtubuntu-sensors-quantal-i386-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qtubuntu-sensors-ci/1/rebuild

review: Needs Fixing (continuous-integration)
26. By Dimitri John Ledkov

Improve commit message

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

Can this be merged please? I think I addressed all issues.

Revision history for this message
Didier Roche (didrocks) wrote :

Everything looks good to me, it's missing the bootstrap commit that we can add in another review.

Please think about filling the spreadsheet and looking at missing parts ;)

review: Approve

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 2013-02-15 18:42:30 +0000
3+++ debian/changelog 2013-03-22 14:07:22 +0000
4@@ -1,3 +1,9 @@
5+qtubuntu-sensors (0.5.1-0ubuntu1) UNRELEASED; urgency=low
6+
7+ * Packaging cleanup in preparation for daily landing.
8+
9+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Mon, 18 Mar 2013 10:01:04 +0000
10+
11 qtubuntu-sensors (0.5-0ubuntu1) quantal; urgency=low
12
13 * Bumping package version number for a release.
14
15=== modified file 'debian/control'
16--- debian/control 2013-02-13 14:45:04 +0000
17+++ debian/control 2013-03-22 14:07:22 +0000
18@@ -1,21 +1,25 @@
19 Source: qtubuntu-sensors
20 Section: libs
21-Priority: extra
22+Priority: optional
23 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
24 Build-Depends: debhelper (>= 9),
25 libubuntu-platform-api1-dev,
26- qtsensors5-dev,
27+ pkg-config,
28 qt5-default,
29 qtbase5-dev,
30- pkg-config
31-Standards-Version: 3.9.3
32+ qtsensors5-dev,
33+Standards-Version: 3.9.4
34+Homepage: https://launchpad.net/qtubuntu-sensors
35+# If you aren't a member of http://pad.lv/~phablet-team but need to upload packaging changes,
36+# just go ahead. http://pad.lv/~phablet-team will notice and sync up the code again.
37 Vcs-Bzr: lp:qtubuntu-sensors
38 Vcs-Browser: https://code.launchpad.net/qtubuntu-sensors
39
40 Package: qtubuntu-sensors
41-Section: libs
42-Architecture: armhf
43-Depends: ${shlibs:Depends},
44- ${misc:Depends},
45+Architecture: any
46+Pre-Depends: ${misc:Pre-Depends},
47+Multi-Arch: same
48+Depends: ${misc:Depends},
49+ ${shlibs:Depends},
50 Description: QtSensors plugins for Android sensors
51 QtSensors plugins for the qtubuntu (hybris) sensors backend
52
53=== modified file 'debian/rules'
54--- debian/rules 2013-02-07 01:31:14 +0000
55+++ debian/rules 2013-03-22 14:07:22 +0000
56@@ -1,17 +1,7 @@
57 #!/usr/bin/make -f
58-# -*- makefile -*-
59-# Sample debian/rules that uses debhelper.
60-#
61-# This file was originally written by Joey Hess and Craig Small.
62-# As a special exception, when this file is copied by dh-make into a
63-# dh-make output file, you may use that output file without restriction.
64-# This special exception was added by Craig Small in version 0.37 of dh-make.
65-#
66-# Modified to make a template file for a multi-binary package with separated
67-# build-arch and build-indep targets by Bill Allombert 2001
68
69-# Uncomment this to turn on verbose mode.
70-#export DH_VERBOSE=1
71+# Daily release standard
72+export DPKG_GENSYMBOLS_CHECK_LEVEL=4
73
74 # This has to be exported to make some magic below work.
75 export DH_OPTIONS
76@@ -19,3 +9,6 @@
77
78 %:
79 dh $@ --parallel --buildsystem=qmake
80+
81+override_dh_install:
82+ dh_install --fail-missing

Subscribers

People subscribed via source and target branches