Merge lp://qastaging/~noskcaj/ubuntu/utopic/sensors-applet/merge into lp://qastaging/ubuntu/utopic/sensors-applet

Proposed by Jackson Doak
Status: Needs review
Proposed branch: lp://qastaging/~noskcaj/ubuntu/utopic/sensors-applet/merge
Merge into: lp://qastaging/ubuntu/utopic/sensors-applet
Diff against target: 389 lines (+35/-310)
7 files modified
.pc/applied-patches (+0/-1)
.pc/enable-deprecated/configure.ac (+0/-288)
configure.ac (+1/-1)
debian/changelog (+23/-0)
debian/patches/enable-deprecated (+0/-19)
debian/patches/enable-deprecated.patch (+10/-0)
debian/patches/series (+1/-1)
To merge this branch: bzr merge lp://qastaging/~noskcaj/ubuntu/utopic/sensors-applet/merge
Reviewer Review Type Date Requested Status
Daniel Holbach (community) Approve
Review via email: mp+224011@code.qastaging.launchpad.net

Description of the change

Merge from debian

To post a comment you must log in.
Revision history for this message
Daniel Holbach (dholbach) wrote :

Thanks. Uploaded.

review: Approve

Unmerged revisions

28. By Jackson Doak

* Merge from debian. Remaining changes:
  - debian/rules:
    + Enable nvidia compilation flag.
  - debian/control:
    + Build-depend on nvidia-settings and update description accordingly.
* Use debian's enable-deprecated patch

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: