Merge lp:~ken-vandine/unity-asset-pool/lp_1157747 into lp:unity-asset-pool

Proposed by Ken VanDine
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 70
Proposed branch: lp:~ken-vandine/unity-asset-pool/lp_1157747
Merge into: lp:unity-asset-pool
Diff against target: 46 lines (+26/-0)
2 files modified
debian/changelog (+8/-0)
debian/control (+18/-0)
To merge this branch: bzr merge lp:~ken-vandine/unity-asset-pool/lp_1157747
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+154396@code.launchpad.net

Commit message

  * debian/control
    - Added breaks/replaces for the account-plugins that contained
      icons (LP: #1157747)

Description of the change

Added breaks/replaces for the account-plugins that contained icons (LP: #1157747)

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

approved!

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)
70. By Ken VanDine

  * debian/control
    - Added breaks/replaces for the account-plugins that contained
      icons (LP: #1157747)
. Fixes: https://bugs.launchpad.net/bugs/1157747.

Approved by PS Jenkins bot, Didier Roche.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2013-03-20 04:01:52 +0000
+++ debian/changelog 2013-03-20 15:02:27 +0000
@@ -1,3 +1,11 @@
1unity-asset-pool (0.8.24daily13.03.20-0ubuntu2) UNRELEASED; urgency=low
2
3 * debian/control
4 - Added breaks/replaces for the account-plugins that contained
5 icons (LP: #1157747)
6
7 -- Ken VanDine <ken.vandine@canonical.com> Wed, 20 Mar 2013 10:54:26 -0400
8
1unity-asset-pool (0.8.24daily13.03.20-0ubuntu1) raring; urgency=low9unity-asset-pool (0.8.24daily13.03.20-0ubuntu1) raring; urgency=low
210
3 [ Chris Townsend ]11 [ Chris Townsend ]
412
=== modified file 'debian/control'
--- debian/control 2013-03-01 16:52:40 +0000
+++ debian/control 2013-03-20 15:02:27 +0000
@@ -18,8 +18,26 @@
18 hicolor-icon-theme18 hicolor-icon-theme
19Provides: unity-icon-theme19Provides: unity-icon-theme
20Replaces: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),20Replaces: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
21 account-plugin-google (<= 0.10bzr13.02.27-0ubuntu1),
22 account-plugin-facebook (<= 0.10bzr13.02.27-0ubuntu1),
23 account-plugin-twitter (<= 0.10bzr13.02.27-0ubuntu1),
24 account-plugin-flickr (<= 0.10bzr13.02.27-0ubuntu1),
25 account-plugin-identica (<= 0.10bzr13.02.27-0ubuntu1),
26 account-plugin-foursquare (<= 0.10bzr13.02.27-0ubuntu1),
27 account-plugin-windows-live (<= 0.10bzr13.02.27-0ubuntu1),
28 account-plugin-sohu (<= 0.10bzr13.02.27-0ubuntu1),
29 account-plugin-sina (<= 0.10bzr13.02.27-0ubuntu1),
21 unity-webapps-common (<= 2.4.13-0ubuntu1)30 unity-webapps-common (<= 2.4.13-0ubuntu1)
22Breaks: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),31Breaks: account-plugin-icons (<= 0.10bzr13.02.27-0ubuntu1),
32 account-plugin-google (<= 0.10bzr13.02.27-0ubuntu1),
33 account-plugin-facebook (<= 0.10bzr13.02.27-0ubuntu1),
34 account-plugin-twitter (<= 0.10bzr13.02.27-0ubuntu1),
35 account-plugin-flickr (<= 0.10bzr13.02.27-0ubuntu1),
36 account-plugin-identica (<= 0.10bzr13.02.27-0ubuntu1),
37 account-plugin-foursquare (<= 0.10bzr13.02.27-0ubuntu1),
38 account-plugin-windows-live (<= 0.10bzr13.02.27-0ubuntu1),
39 account-plugin-sohu (<= 0.10bzr13.02.27-0ubuntu1),
40 account-plugin-sina (<= 0.10bzr13.02.27-0ubuntu1),
23 unity-webapps-common (<= 2.4.13-0ubuntu1)41 unity-webapps-common (<= 2.4.13-0ubuntu1)
24Description: Unity Assets Pool42Description: Unity Assets Pool
25 Includes icons and other images for Unity43 Includes icons and other images for Unity

Subscribers

People subscribed via source and target branches

to all changes: