Merge lp://staging/~noskcaj/ubuntu/wily/redshift/merge2 into lp://staging/ubuntu/wily/redshift
Proposed by
Jackson Doak
| Status: | Merged |
|---|---|
| Approved by: | Michael Terry |
| Approved revision: | 22 |
| Merge reported by: | Michael Terry |
| Merged at revision: | not available |
| Proposed branch: | lp://staging/~noskcaj/ubuntu/wily/redshift/merge2 |
| Merge into: | lp://staging/ubuntu/wily/redshift |
| Diff against target: |
1046 lines (+108/-795) 16 files modified
.pc/applied-patches (+0/-2) .pc/remove_autostart.patch/src/redshift-gtk/statusicon.py (+0/-520) .pc/retry-geoclue.patch/src/location-geoclue.c (+0/-217) debian/README.Debian (+0/-24) debian/changelog (+36/-0) debian/control (+1/-1) debian/gbp.conf (+2/-0) debian/patches/add-desktop-file.patch (+34/-0) debian/patches/retry-geoclue.patch (+8/-6) debian/patches/series (+1/-1) debian/redshift-gtk.docs (+0/-1) debian/redshift-gtk.install (+2/-1) debian/redshift.install (+1/-0) debian/rules (+3/-2) src/location-geoclue.c (+8/-20) src/redshift-gtk/statusicon.py (+12/-0) |
| To merge this branch: | bzr merge lp://staging/~noskcaj/ubuntu/wily/redshift/merge2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Michael Terry | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian. package is currently broken in wily, this merge is required for it to work as intended
To post a comment you must log in.
Revision history for this message
| Michael Terry (mterry) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
Looks good, thanks! Uploaded to wily.