Autopilot Qt Support

Merge lp:~ps-jenkins/autopilot-qt/latestsnapshot-1.3daily13.05.03ubuntu.unity.next-0ubuntu1 into lp:autopilot-qt

  1. latestsnapshot-1.3daily13.05.03ubuntu.unity.next-0ubuntu1
  2. Merge into trunk
Proposed by PS Jenkins bot
Status: Merged
Merged at revision: 57
Proposed branch: lp:~ps-jenkins/autopilot-qt/latestsnapshot-1.3daily13.05.03ubuntu.unity.next-0ubuntu1
Merge into: lp:autopilot-qt
Diff against target: 37 lines (+21/-1) (has conflicts)
1 file modified
debian/changelog (+21/-1)
Text conflict in debian/changelog
To merge this branch: bzr merge lp:~ps-jenkins/autopilot-qt/latestsnapshot-1.3daily13.05.03ubuntu.unity.next-0ubuntu1
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Needs Fixing
Autopilot Hackers Pending
Review via email: mp+162402@code.launchpad.net

Commit message

Releasing 1.3daily13.05.03ubuntu.unity.next-0ubuntu1 to ubuntu

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

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
Build was skipped, merge only
Executed test runs:

review: Needs Fixing (continuous-integration)
Revision history for this message
Martin Mrazik (mrazik) wrote :

There is a conflict :-/

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

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/autopilot-qt-ci/58/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-amd64-ci/28/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/autopilot-qt-raring-armhf-ci/27/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/autopilot-qt-ci/58/rebuild

review: Needs Fixing (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 2013-05-03 14:17:19 +0000
3+++ debian/changelog 2013-05-03 16:20:56 +0000
4@@ -1,13 +1,33 @@
5-autopilot-qt (1.3) UNRELEASED; urgency=low
6+autopilot-qt (1.3daily13.05.03ubuntu.unity.next-0ubuntu1) raring; urgency=low
7
8 [ Christopher Lee ]
9 * Bump version number
10
11+<<<<<<< TREE
12 [ Mathieu Trudel-Lapierre ]
13 * debian/control: don't build the binary packages on powerpc; also remove
14 armel from the list since we don't build for it anymore.
15
16 -- Christopher Lee <chris.lee@canonical.com> Thu, 18 Apr 2013 15:53:10 +1200
17+=======
18+ [ Michael Zanetti ]
19+ * [FFE] autopilot-qt lacks testing (LP: #1157697)
20+
21+ [ Thomi Richards <thomi.richards@canonical.com>, Christopher Lee ]
22+ * DBus wire protocol changes required (LP: #1155351)
23+
24+ [ Thomi Richards ]
25+ * DBus wire protocol changes required (LP: #1155351)
26+
27+ [ Olivier Tilloy ]
28+ * Value of MouseArea.enabled property always incorrectly reported as
29+ True (LP: #1170764)
30+
31+ [ Ubuntu daily release ]
32+ * Automatic snapshot from revision 54 (ubuntu-unity/next)
33+
34+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Fri, 03 May 2013 00:00:55 +0000
35+>>>>>>> MERGE-SOURCE
36
37 autopilot-qt (0.8daily13.03.22-0ubuntu1) raring; urgency=low
38

Subscribers

People subscribed via source and target branches