Merge lp:~ubuntu-branches/ubuntu/utopic/cairo-dock-plug-ins/utopic-201408192140 into lp:ubuntu/utopic/cairo-dock-plug-ins

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/utopic/cairo-dock-plug-ins reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/utopic/cairo-dock-plug-ins/utopic-201408192140. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

57. By Matthieu Baerts on 2014-08-19

* New upstream snapshot.
* Short Upstream ChangeLog:
  - All: updated due to recent API changes and changes in the global style
  - All: removed GTK2 support
  - DnD2Share: refresh support of some backend
  - GMenu:
    - Do not create empty menus
    - Show dialogue to open a new app after the end of the installation
    - Added an option to not show this dialogue
  - Gnome: support Cinnamon logout
  - Logout: display a message to reboot after the end of the update
  - Shortcuts: improve the support of bookmarks
  - Status-Notifier: support scroll events
  - System-Monitor: fixed RAM info
  - Terminal: open terminal on middle click, support Maj+Ctrl+[CV]
  - UPower: support 0.99 version (LP: #1330037 - was already patched)
  - Stop using GTK Stock icons
  - po: updated translations (added Korean)
  - Some bugs have been fixed, other tweaks (LP: #1303263)
* debian/control:
  - Bumped Cairo-Dock (core) versions
  - Added libwayland (initial support, not enabled by default)
* debian/patches:
  - Removed all patches: all of them were created from this version

56. By Matthieu Baerts on 2014-06-16

* debian/control:
  - Removed unused build-dep: libgnutls-dev (used only by libetpan)

55. By Matthieu Baerts on 2014-06-15

* debian/patches/bzr3083-3084_Support_UPower0.99.patch:
  - UPower 0.99+: 'changed' signal has been replaced by 'notify' signal

54. By Matthieu Baerts on 2014-05-30

* debian/patches/bzr3083-3084_Support_UPower0.99.patch:
  - Support UPower 0.99+: UPower 0.99 no longer supports logout features:
    suspend/hibernate. We can also remove suspend/hibernate features of
    PowerManager applet: they are already supported by the logout applet.