[Merge] lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054 into lp:ubuntu/cairo-dock-plug-ins

[Matthieu Baerts]

Matthieu Baerts has proposed merging lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054 into lp:ubuntu/cairo-dock-plug-ins.

Requested reviews:
  Ubuntu Sponsors Team (ubuntu-sponsors)
Related bugs:
  Bug #984054 in cairo-dock-plug-ins (Ubuntu): "package cairo-dock-plug-ins-data 3.0.0.0rc1-0ubuntu1 failed to install/upgrade: intentando sobreescribir `/usr/share/cairo-dock/gauges/Battery/background.svg', que está también en el paquete cairo-dock-data 3.0.0.0rc1-0ubuntu1"
  https://bugs.launchpad.net/ubuntu/+source/cairo-dock-plug-ins/+bug/984054

For more details, see:
https://code.launchpad.net/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054/+merge/102353

Hello,

This branch should fix a possible bug at the upgrade:
=> Avoid an upgrade problem if cairo-dock-plug-ins-data is updated before cairo-dock-data (LP: #984054)

Thank you for your help! :)
-- 
https://code.launchpad.net/~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054/+merge/102353
Your team Ubuntu Sponsors Team is requested to review the proposed merge of lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054 into lp:ubuntu/cairo-dock-plug-ins.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1093 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-sponsors/attachments/20120417/152e55cd/attachment.diff>