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

[Matthieu Baerts]

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! :)

[Micah Gersten (micahg)]

This needs the Breaks/Replaces on the upstream version where the change occurred, you can use << in this case which means less than, alternatively, you can specify the full last Ubuntu version with <=.

review: Needs Fixing

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

30. By Matthieu Baerts on 2012-04-18

cairo-dock-plug-ins-data replaces the version 3.0.0.0rc1-0ubuntu1 of cairo-dock-data -> we can use 3.0.0.0rc2

[Matthieu Baerts (matttbe)]

@micahg: I prefer to use '3.0.0.0rc2' because the 3.0.0.0rc1 version was also available on our 'Weekly' ppa.

[Micah Gersten (micahg)]

This doesn't make sense 3.0.0.0rc2 was never published anywhere, unless you're telling me that 3.0.0.1 from the stable PPA has different file layouts than the archive version, I'd suggest going with << 3.0.0.1

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

31. By Matthieu Baerts on 2012-04-18

cairo-dock-plug-ins-data replaces the previous versions of cairo-dock-data -> (<< 3.0.0.1)

[Matthieu Baerts (matttbe)]

> This doesn't make sense 3.0.0.0rc2 was never published anywhere, unless you're
> telling me that 3.0.0.1 from the stable PPA has different file layouts than
> the archive version, I'd suggest going with << 3.0.0.1

Yes, sorry, it was a bad idea :-/
The new version should be better! :)

[Micah Gersten (micahg)]

Looks good, will upload in a bit

review: Approve

[Matthieu Baerts (matttbe)]

> Looks good, will upload in a bit
Thank you for the help!

[Micah Gersten (micahg)]

I just added '; This is due to files moving between packages ' to the changelog entry to make it clearer why the change was necessary

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-17 13:33:07 +0000
+++ debian/changelog	2012-04-18 20:33:19 +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) <[e-mail]>  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-18 20:33:19 +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.1)
+Breaks: 	cairo-dock-data (<< 3.0.0.1)
 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