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

Proposed by Matthieu Baerts on 2012-04-17
Status: Merged
Merged at revision: 29
Proposed branch: lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054
Merge into: lp:ubuntu/precise/cairo-dock-plug-ins
Diff against target: 30 lines (+11/-1)
2 files modified
debian/changelog (+8/-0)
debian/control (+3/-1)
To merge this branch: bzr merge lp:~cairo-dock-team/ubuntu/precise/cairo-dock-plug-ins/984054
Reviewer Review Type Date Requested Status
Micah Gersten 2012-04-17 Approve on 2012-04-18
Review via email: mp+102353@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Micah Gersten (micahg) wrote :

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

@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) wrote :

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

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

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

Looks good, will upload in a bit

review: Approve
Matthieu Baerts (matttbe) wrote :

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

Micah Gersten (micahg) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-04-17 13:33:07 +0000
3+++ debian/changelog 2012-04-18 20:33:19 +0000
4@@ -1,3 +1,11 @@
5+cairo-dock-plug-ins (3.0.0.1-0ubuntu2) precise; urgency=low
6+
7+ * debian/control:
8+ - Avoid an upgrade problem if cairo-dock-plug-ins-data is updated before
9+ cairo-dock-data (LP: #984054)
10+
11+ -- Matthieu Baerts (matttbe) <matttbe@gmail.com> Tue, 17 Apr 2012 18:19:20 +0200
12+
13 cairo-dock-plug-ins (3.0.0.1-0ubuntu1) precise; urgency=low
14
15 * New upstream release. (LP: #983289)
16
17=== modified file 'debian/control'
18--- debian/control 2012-04-16 23:35:08 +0000
19+++ debian/control 2012-04-18 20:33:19 +0000
20@@ -97,7 +97,9 @@
21 Section: graphics
22 Architecture: all
23 Conflicts: cairo-dock-plug-ins (<= 2.0.8.0)
24-Replaces: cairo-dock-plug-ins (<= 2.0.8.0)
25+Replaces: cairo-dock-plug-ins (<= 2.0.8.0),
26+ cairo-dock-data (<< 3.0.0.1)
27+Breaks: cairo-dock-data (<< 3.0.0.1)
28 Depends: ${misc:Depends}
29 Description: Common files for cairo-dock-plug-ins
30 Cairo-Dock-plug-ins is a set of plug-ins for Cairo-Dock. It provides some new

Subscribers

People subscribed via source and target branches