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

[Matthew Paul Thomas]

Corrects spelling of 'multiple'.

Corrects spelling of 'multiple'.

[PS Jenkins bot (ps-jenkins)]

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)

[Ken VanDine (ken-vandine)]

Great

review: Approve

[PS Jenkins bot (ps-jenkins)]

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)

[Matthew Paul Thomas (mpt)]

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.

[Francis Ginther (fginther)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Francis Ginther (fginther)]

GRRR. Missed another one...

[PS Jenkins bot (ps-jenkins)]

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)

[Francis Ginther (fginther)]

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

[PS Jenkins bot (ps-jenkins)]

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)

[Francis Ginther (fginther)]

*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.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== 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 @@
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: model to synchronize mutiple instances over DBus - shared lib
+Description: model to synchronize multiple instances over DBus - shared lib
  libdee is a shared library that provides objects that help
  having multiple instances communicating over DBus.
  .
@@ -46,7 +46,7 @@
          libglib2.0-dev (>= 2.22.0),
          libdbus-glib-1-dev (>= 0.80)
 Suggests: libdee-doc
-Description: model to synchronize mutiple instances over DBus - dev files
+Description: model to synchronize multiple instances over DBus - dev files
  libdee is a shared library that provides objects that help
  having multiple instances communicating over DBus.
  .
@@ -58,7 +58,7 @@
 Priority: extra
 Depends: libdee-1.0-4 (= ${binary:Version}),
          ${misc:Depends}
-Description: model to synchronize mutiple instances over DBus
+Description: model to synchronize multiple instances over DBus
  libdee is a shared library that provides objects that help
  having multiple instances communicating over DBus.
  .
@@ -69,7 +69,7 @@
 Architecture: all
 Depends: ${misc:Depends}
 Suggests: devhelp
-Description: model to synchronize mutiple instances over DBus - documentation
+Description: model to synchronize multiple instances over DBus - documentation
  libdee is a shared library that provides objects that help
  having multiple instances communicating over DBus.
  .
@@ -91,7 +91,7 @@
 Package: dee-tools
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: model to synchronize mutiple instances over DBus - tooling
+Description: model to synchronize multiple instances over DBus - tooling
  libdee is a shared library that provides objects that help
  having multiple instances communicating over DBus.
  .