Mir

Merge lp:~alan-griffiths/mir/fix-1297100 into lp:mir

  1. fix-1297100
  2. Merge into development-branch
Proposed by Alan Griffiths
Status: Merged
Approved by: Alexandros Frantzis
Approved revision: no longer in the source branch.
Merged at revision: 1792
Proposed branch: lp:~alan-griffiths/mir/fix-1297100
Merge into: lp:mir
Diff against target: 19 lines (+0/-3)
1 file modified
debian/control (+0/-3)
To merge this branch: bzr merge lp:~alan-griffiths/mir/fix-1297100
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Alexandros Frantzis (community) Approve
Kevin DuBois (community) Approve
Review via email: mp+228123@code.launchpad.net

Commit message

debian: The Mir API documentation doesn't really depend on the -dev packages and the demos shouldn't recommend the docs as recommendations install by default.

Description of the change

debian: The Mir API documentation doesn't really depend on the -dev packages and the demos shouldn't recommend the docs as recommendations install by default.

To post a comment you must log in.
Revision history for this message
Kevin DuBois (kdub) wrote :

okay

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

FAILED: Continuous integration, rev:1792
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/2227/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/1068
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/1074
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/1059
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-amd64-ci/749/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/750
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-utopic-armhf-ci/750/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3686
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/3686/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/2175
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/10362

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-team-mir-development-branch-ci/2227/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks reasonable.

review: Approve
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
1=== modified file 'debian/control'
2--- debian/control 2014-07-23 05:25:36 +0000
3+++ debian/control 2014-07-24 14:20:51 +0000
4@@ -233,7 +233,6 @@
5 Architecture: i386 amd64 armhf arm64
6 Depends: ${misc:Depends},
7 ${shlibs:Depends},
8-Recommends: mir-doc
9 Description: Display server for Ubuntu - demonstration programs
10 Mir is a display server running on linux systems, with a focus on efficiency,
11 robust operation and a well-defined driver model.
12@@ -254,8 +253,6 @@
13 Section: doc
14 Architecture: all
15 Depends: ${misc:Depends},
16- libmirclient-dev,
17- libmirserver-dev,
18 Description: API documentation for mir
19 This package installs the mir API documentation.
20

Subscribers

People subscribed via source and target branches