dee

Merge lp:~mpt/dee/mutiple-multiple into lp:dee

  1. mutiple-multiple
  2. Merge into trunk
Proposed by Matthew Paul Thomas
Status: Merged
Approved by: Francis Ginther
Approved revision: 417
Merged at revision: 417
Proposed branch: lp:~mpt/dee/mutiple-multiple
Merge into: lp:dee
Diff against target: 48 lines (+5/-5)
1 file modified
debian/control (+5/-5)
To merge this branch: bzr merge lp:~mpt/dee/mutiple-multiple
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Ken VanDine Approve
Review via email: mp+170777@code.launchpad.net

Commit message

Corrects spelling of 'multiple'.

Description of the change

Corrects spelling of 'multiple'.

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

FAILED: Continuous integration, rev:417
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/~mpt/dee/mutiple-multiple/+merge/170777/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/dee-ci/5/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-ci/2/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-ci/2/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/dee-ci/5/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Great

review: Approve
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/dee-autolanding/8/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-autolanding/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-autolanding/6/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-autolanding/6/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Matthew Paul Thomas (mpt) wrote :

The Jenkins error is:

ERROR:pbuilderjenkins:Error during workspace setup
ERROR:pbuilderjenkins:H05set_package_version not found in hooks

I have no clue what that means.

Revision history for this message
Francis Ginther (fginther) wrote :

I know what this is. This build hook is no longer applicable to dee. Will remove from the jenkins config and retry.

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/dee-autolanding/9/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-autolanding/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-autolanding/7/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-autolanding/7/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

GRRR. Missed another one...

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/dee-autolanding/10/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-autolanding/8/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-autolanding/8/console
        deb: http://jenkins.qa.ubuntu.com/job/dee-saucy-armhf-autolanding/8/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-autolanding/8/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

Results format is not supported now, trying a different hook.

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/dee-autolanding/11/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-amd64-autolanding/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/dee-saucy-i386-autolanding/9/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Francis Ginther (fginther) wrote :

*sigh* that didn't work either. I've removed the collection of the test results and will fix later. Note: the tests are still being run and must pass, but we're just not collecting statistics until I can fix the hook.

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
=== modified file 'debian/control'
--- debian/control 2013-06-07 19:56:07 +0000
+++ debian/control 2013-06-21 10:35:39 +0000
@@ -31,7 +31,7 @@
31Architecture: any31Architecture: any
32Pre-Depends: ${misc:Pre-Depends}32Pre-Depends: ${misc:Pre-Depends}
33Depends: ${shlibs:Depends}, ${misc:Depends}33Depends: ${shlibs:Depends}, ${misc:Depends}
34Description: model to synchronize mutiple instances over DBus - shared lib34Description: model to synchronize multiple instances over DBus - shared lib
35 libdee is a shared library that provides objects that help35 libdee is a shared library that provides objects that help
36 having multiple instances communicating over DBus.36 having multiple instances communicating over DBus.
37 .37 .
@@ -46,7 +46,7 @@
46 libglib2.0-dev (>= 2.22.0),46 libglib2.0-dev (>= 2.22.0),
47 libdbus-glib-1-dev (>= 0.80)47 libdbus-glib-1-dev (>= 0.80)
48Suggests: libdee-doc48Suggests: libdee-doc
49Description: model to synchronize mutiple instances over DBus - dev files49Description: model to synchronize multiple instances over DBus - dev files
50 libdee is a shared library that provides objects that help50 libdee is a shared library that provides objects that help
51 having multiple instances communicating over DBus.51 having multiple instances communicating over DBus.
52 .52 .
@@ -58,7 +58,7 @@
58Priority: extra58Priority: extra
59Depends: libdee-1.0-4 (= ${binary:Version}),59Depends: libdee-1.0-4 (= ${binary:Version}),
60 ${misc:Depends}60 ${misc:Depends}
61Description: model to synchronize mutiple instances over DBus61Description: model to synchronize multiple instances over DBus
62 libdee is a shared library that provides objects that help62 libdee is a shared library that provides objects that help
63 having multiple instances communicating over DBus.63 having multiple instances communicating over DBus.
64 .64 .
@@ -69,7 +69,7 @@
69Architecture: all69Architecture: all
70Depends: ${misc:Depends}70Depends: ${misc:Depends}
71Suggests: devhelp71Suggests: devhelp
72Description: model to synchronize mutiple instances over DBus - documentation72Description: model to synchronize multiple instances over DBus - documentation
73 libdee is a shared library that provides objects that help73 libdee is a shared library that provides objects that help
74 having multiple instances communicating over DBus.74 having multiple instances communicating over DBus.
75 .75 .
@@ -91,7 +91,7 @@
91Package: dee-tools91Package: dee-tools
92Architecture: any92Architecture: any
93Depends: ${shlibs:Depends}, ${misc:Depends}93Depends: ${shlibs:Depends}, ${misc:Depends}
94Description: model to synchronize mutiple instances over DBus - tooling94Description: model to synchronize multiple instances over DBus - tooling
95 libdee is a shared library that provides objects that help95 libdee is a shared library that provides objects that help
96 having multiple instances communicating over DBus.96 having multiple instances communicating over DBus.
97 .97 .

Subscribers

People subscribed via source and target branches