Merge lp://qastaging/~kalikiana/u1db-qt/pkgdaily into lp://qastaging/u1db-qt

Proposed by Cris Dywan
Status: Merged
Approved by: Timo Jyrinki
Approved revision: 101
Merged at revision: 93
Proposed branch: lp://qastaging/~kalikiana/u1db-qt/pkgdaily
Merge into: lp://qastaging/u1db-qt
Diff against target: 91 lines (+12/-13)
5 files modified
.bzr-builddeb/default.conf (+2/-0)
debian/changelog (+3/-2)
debian/control (+7/-6)
debian/copyright (+0/-4)
debian/source/format (+0/-1)
To merge this branch: bzr merge lp://qastaging/~kalikiana/u1db-qt/pkgdaily
Reviewer Review Type Date Requested Status
Timo Jyrinki Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+172327@code.qastaging.launchpad.net

Commit message

Debian packaging tweaks according to https://wiki.ubuntu.com/DailyRelease/InlinePackaging

Description of the change

Debian packaging tweaks according to https://wiki.ubuntu.com/DailyRelease/InlinePackaging

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:91
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/~kalikiana/u1db-qt/pkgdaily/+merge/172327/+edit-commit-message

http://91.189.93.70:8080/job/u1db-qt-ci/1/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-quantal-amd64-ci/1
    SUCCESS: http://91.189.93.70:8080/job/u1db-qt-raring-amd64-ci/1

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/u1db-qt-ci/1/rebuild

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

- Add the .bzr-builddeb/default.conf as indicated
- Add "-0" in the version number, ie. 0.1.5-0ubuntu1
- Change debian/source/format to 3.0 (quilt)

After that, run 'bzr bd' and check if it builds fine (you need bzr-builddeb installed) - for me a test fails. If that gets resolved, look at the lintian errors at the end of the run and fix those if any.

review: Needs Fixing
Revision history for this message
Cris Dywan (kalikiana) wrote :

I can reproduce the failure, the puzzling thing is that I can't make test of it. gcc uses the same locale but somehow the logged error message has more ??? than the expected error. The real string is btw "u1db: Invalid docID 日本語".

  <testcase result="fail" name="U1dbDatabase::test_2_databaseError">
    <!-- message="u1db: Invalid docID ?????????" type="qwarn" -->
    <!-- message="Did not receive message: &quot;u1db: Invalid docID ???&quot;" type="info" -->
    <failure message="Not all expected messages were received" result="fail"/>
  </testcase>

Revision history for this message
Cris Dywan (kalikiana) wrote :

bzr push's ever so counter-intuitive command line failed me and I pushed all to trunk… I made an empty commit in the hopes that this triggers Jenkins again.
bzr bd succeeds for me after I basically disabled the specific test case. I've not found any more help on the unicode output problems so I don't think it makes sense to block on forever.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
94. By Cris Dywan

Empty commit

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
95. By Cris Dywan

Empty commit

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
96. By Cris Dywan

Empty commit

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
97. By Cris Dywan

Don't exceed 80 columns in debian/changelog

98. By Cris Dywan

Resolve lintian complaints about debian/control

99. By Cris Dywan

Make debian/copyright not look like a template

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

I'm down to 1 lintian warning (desktop-command-not-in-package) due to qmlscene.
But I can't make it build after changing the version and source/format, it will try to fetch a tarball from somewhere - isn't the correct type "native" seeing as this is upstream trunk builds? We don't need to add quilt patches either…

100. By Cris Dywan

Change to downstream version, quilt and "split" package

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
101. By Cris Dywan

Drop debian/source/format file

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Good fixes, approving!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: