Merge lp://staging/~mrpouit/xscreensaver/restore-vanished-changes into lp://staging/~ubuntu-desktop/xscreensaver/ubuntu
Proposed by
Lionel Le Folgoc
| Status: | Merged |
|---|---|
| Merged at revision: | 20 |
| Proposed branch: | lp://staging/~mrpouit/xscreensaver/restore-vanished-changes |
| Merge into: | lp://staging/~ubuntu-desktop/xscreensaver/ubuntu |
| Diff against target: |
122 lines (+73/-15) 4 files modified
debian/changelog (+29/-0) debian/patches/50_driver_screensaver-properties-desktop.patch (+0/-14) debian/patches/60_sequential_glslideshow.patch (+43/-0) debian/patches/series (+1/-1) |
| To merge this branch: | bzr merge lp://staging/~mrpouit/xscreensaver/restore-vanished-changes |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Desktop | Pending | ||
|
Review via email:
|
|||
Description of the change
* Restore changes from 5.11-1ubuntu2 that disappeared with 5.12-0ubuntu1:
- debian/
it's not really a vectorized svg and it breaks xfce4-settings-
startup notification doesn't work as the dialog never removes itself.
lp: #603222
- debian/
(also, resync the latest upload with the archive, otherwise it might as well disappear...)
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
