Merge lp://qastaging/~noskcaj/ubuntu/wily/xfce4-panel/merge into lp://qastaging/ubuntu/wily/xfce4-panel
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://qastaging/~noskcaj/ubuntu/wily/xfce4-panel/merge |
| Merge into: | lp://qastaging/ubuntu/wily/xfce4-panel |
| Diff against target: |
762 lines (+690/-3) 7 files modified
.pc/02_pager-size-for-viewport.patch/plugins/pager/pager.c (+623/-0) .pc/applied-patches (+1/-0) debian/changelog (+26/-0) debian/control (+2/-3) debian/patches/02_pager-size-for-viewport.patch (+25/-0) debian/patches/series (+1/-0) plugins/pager/pager.c (+12/-0) |
| To merge this branch: | bzr merge lp://qastaging/~noskcaj/ubuntu/wily/xfce4-panel/merge |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sean Davis (community) | Approve | ||
|
Review via email:
|
|||
Description of the change
Merge from debian.
Debian has now completely split the gtk2 and gtk3 panel libs, so we should follow suit.
Unmerged revisions
- 80. By Jackson Doak
-
* Merge from debian. Remaining changes:
- debian/patches:
+ xubuntu_migrate- tasklist- separator. patch: added, try to be smart and
work around the non-expandable tasklist plugin from 4.10 by setting
as expandable the separator next to it (should work with the default
panel layouts from Xubuntu, Mythbuntu and UbuntuStudio).
+ 02_support-dmtool. patch: Add support for dm-tool for user-switching
- Use dh-autoreconf to update libtool for ppc64el.
* debian/control:
- Make libxfce4panel-2.0-dev depend on libxfce4panel- 2.0-4.
* Add 02_pager-size-for- viewport. patch. (Closes: #785582)
* debian/control:
- drop libxfce4panel-2.0-4 dependency on xfce4-panel.
Looks good, tested and uploaded.