Unity

Merge lp:~didrocks/unity/change-unity-common-dep into lp:unity

  1. change-unity-common-dep
  2. Merge into trunk
Proposed by Didier Roche-Tolomelli
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: no longer in the source branch.
Merged at revision: 2915
Proposed branch: lp:~didrocks/unity/change-unity-common-dep
Merge into: lp:unity
Diff against target: 34 lines (+5/-1)
2 files modified
debian/changelog (+4/-0)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~didrocks/unity/change-unity-common-dep
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+135139@code.launchpad.net

Commit message

add libunity-core -> unity-common dep (LP: #1079132)
do not have unity-common dep on compiz-gnome: the migration code is only
ran if compiz-gnome is installed, but compiz-gnome is pulled by compiz
directly. We don't care if the migration code isn't executed.

Description of the change

add libunity-core -> unity-common dep (LP: #1079132)
do not have unity-common dep on compiz-gnome: the migration code is only
ran if compiz-gnome is installed, but compiz-gnome is pulled by compiz
directly. We don't care if the migration code isn't executed.

To post a comment you must log in.
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Seems ok, and at least should fix the problem in mention.

review: Approve

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-11-16 19:57:23 +0000
3+++ debian/changelog 2012-11-20 12:30:44 +0000
4@@ -22,6 +22,10 @@
5 * debian/control:
6 - adding libgtest-dev and google-mock build-dep now that there are in main
7 (LP: #1076763)
8+ - add libunity-core -> unity-common dep (LP: #1079132)
9+ - do not have unity-common dep on compiz-gnome: the migration code is only
10+ ran if compiz-gnome is installed, but compiz-gnome is pulled by compiz
11+ directly. We don't care if the migration code isn't executed.
12
13 [ bschaefer ]
14 * Ported to nux 4.0
15
16=== modified file 'debian/control'
17--- debian/control 2012-11-15 16:12:59 +0000
18+++ debian/control 2012-11-20 12:30:44 +0000
19@@ -111,7 +111,6 @@
20 Pre-Depends: ${misc:Pre-Depends},
21 Depends: ${misc:Depends},
22 ${python:Depends},
23- compiz-gnome (>> 1:0.9.8+bzr3319),
24 Description: Common files for the Unity interface.
25 Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
26 community, Unity is all about the combination of familiarity and the future. We
27@@ -128,6 +127,7 @@
28 Depends: ${shlibs:Depends},
29 ${misc:Depends},
30 unity-services (= ${binary:Version}),
31+ unity-common (= ${source:Version}),
32 Description: Core library for the Unity interface.
33 Unity is a desktop experience that sings. Designed by Canonical and the Ayatana
34 community, Unity is all about the combination of familiarity and the future. We