GNOME Software

Merge lp://qastaging/~attente/gnome-software/20160331 into lp://qastaging/~ubuntu-desktop/gnome-software/ubuntu

20160331
Merge into ubuntu

Proposed by William Hua on 2016-04-01

Status:

Merged

Merged at revision:

Proposed branch:

lp://qastaging/~attente/gnome-software/20160331

Merge into:

lp://qastaging/~ubuntu-desktop/gnome-software/ubuntu

Diff against target:

762 lines (+308/-112)

19 files modified

debian/changelog (+10/-0)
debian/patches/appstream-refresh.patch (+2/-2)
debian/patches/apt-plugin.patch (+12/-11)
debian/patches/dedup-source.patch (+2/-2)
debian/patches/disable-update-monitor.patch (+2/-2)
debian/patches/fwupd-error.patch (+4/-4)
debian/patches/hide-empty-fields.patch (+8/-8)
debian/patches/minimal-review-limits.patch (+2/-2)
debian/patches/no-daemon.patch (+44/-42)
debian/patches/no-history.patch (+4/-4)
debian/patches/no-kudo-details.patch (+4/-4)
debian/patches/no-notification-actions.patch (+169/-0)
debian/patches/no-offline-updates.patch (+2/-2)
debian/patches/rename-menu-item.patch (+25/-0)
debian/patches/series (+2/-0)
debian/patches/software-properties.patch (+5/-19)
debian/patches/ubuntu-review-submit.patch (+7/-6)
debian/patches/update-descriptions.patch (+2/-2)
debian/patches/window-decorations.patch (+2/-2)

To merge this branch:

bzr merge lp://qastaging/~attente/gnome-software/20160331

Related bugs:

Bug #1547608: Notifications use actions which are not appropriate in notify-osd	Medium	Fix Released
Bug #1551707: Installing local debs gives an error dialog	High	Fix Released

Link a bug report

Reviewer	Review Type	Date Requested	Status
Robert Ancell		2016-04-01	Approve on 2016-04-01
Review via email: mp+290674@code.qastaging.launchpad.net

Commit message

* New upstream snapshot
* debian/patches/rename-menu-item.patch:
- Rename 'Software Sources' menu item to 'Software & Updates'
* debian/patches/no-notification-actions.patch:
- Disable actions in notifications (LP: #1547608)