cairo-dock-team team mailing list archive

[Matthieu Baerts <matttbe@xxxxxxxxx>]

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 Cairo-Dock Team is subscribed to branch lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054.

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-17 13:33:07 +0000
+++ debian/changelog	2012-04-17 16:38:28 +0000
@@ -1,3 +1,11 @@
+cairo-dock-plug-ins (3.0.0.1-0ubuntu2) precise; urgency=low
+
+  * debian/control:
+   - Avoid an upgrade problem if cairo-dock-plug-ins-data is updated before
+      cairo-dock-data (LP: #984054)
+
+ -- Matthieu Baerts (matttbe) <matttbe@xxxxxxxxx>  Tue, 17 Apr 2012 18:19:20 +0200
+
 cairo-dock-plug-ins (3.0.0.1-0ubuntu1) precise; urgency=low
 
   * New upstream release. (LP: #983289)

=== modified file 'debian/control'
--- debian/control	2012-04-16 23:35:08 +0000
+++ debian/control	2012-04-17 16:38:28 +0000
@@ -97,7 +97,9 @@
 Section: graphics
 Architecture: all
 Conflicts: 	cairo-dock-plug-ins (<= 2.0.8.0)
-Replaces: 	cairo-dock-plug-ins (<= 2.0.8.0)
+Replaces: 	cairo-dock-plug-ins (<= 2.0.8.0),
+		cairo-dock-data (<= 3.0.0.0rc1)
+Breaks: 	cairo-dock-data (<= 3.0.0.0rc1)
 Depends: 	${misc:Depends}
 Description: Common files for cairo-dock-plug-ins
  Cairo-Dock-plug-ins is a set of plug-ins for Cairo-Dock. It provides some new