unity-2d

Merge lp:~sil2100/unity-2d/bump_new_nux_libunity into lp:unity-2d

  1. bump_new_nux_libunity
  2. Merge into trunk
Proposed by Łukasz Zemczak
Status: Rejected
Rejected by: Didier Roche-Tolomelli
Proposed branch: lp:~sil2100/unity-2d/bump_new_nux_libunity
Merge into: lp:unity-2d
Diff against target: 68 lines (+12/-5)
5 files modified
CMakeLists.txt (+1/-1)
debian/changelog (+7/-0)
debian/control (+2/-2)
libunity-2d-private/CMakeLists.txt (+1/-1)
panel/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~sil2100/unity-2d/bump_new_nux_libunity
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Didier Roche-Tolomelli Approve
jenkins (community) continuous-integration Needs Fixing
Review via email: mp+113563@code.launchpad.net

Commit message

Since we are releasing nux 3.0 and unity 6.0, we need to depend on newer (different) libnux and libunity packages.

Description of the change

This is a merge request for any branch that resulting binaries will end up in quantal.

This merge request DOES NOT APPLY when the target is precise!

In quantal, we're releasing nux 3.0 and unity 6.0, meaning that we need to build against new versions. This way we do that.

To post a comment you must log in.
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:1121
http://s-jenkins:8080/job/unity-2d-ci/13/

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:1122
http://s-jenkins:8080/job/unity-2d-ci/14/

review: Needs Fixing (continuous-integration)
Revision history for this message
jenkins (martin-mrazik+qa) wrote :

FAILED: Continuous integration, rev:1123
http://s-jenkins:8080/job/unity-2d-ci/15/

review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

Its missing the libunity-2d-private/CMakeLists.txt change for libunity-core.

review: Needs Fixing
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

in fact, it's there, the diff didn't refresh here and I had to look at the tree :/
Approving then ;)

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity-2d/308/console reported an error when processing this lp:~sil2100/unity-2d/bump_new_nux_libunity branch.
Not merging it.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

unity-2d isn't in the distro anymore. Cleaning up the list.

Unmerged revisions

1123. By Łukasz Zemczak

One more missing 5.0 -> 6.0 switch.

1122. By Łukasz Zemczak

One more missing place where the switch to 6.0 was needed.

1121. By Łukasz Zemczak

Since we are releasing nux 3.0 and unity 6.0, we need to depend on newer (different) libnux and libunity packages.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2012-03-08 15:25:42 +0000
3+++ CMakeLists.txt 2012-07-06 14:47:22 +0000
4@@ -41,7 +41,7 @@
5 pkg_check_modules(GIO REQUIRED gio-2.0)
6 pkg_check_modules(WNCK REQUIRED libwnck-3.0)
7 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
8-pkg_check_modules(NUXCORE REQUIRED nux-core-2.0)
9+pkg_check_modules(NUXCORE REQUIRED nux-core-3.0)
10 pkg_check_modules(PANGO REQUIRED pango)
11 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
12
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2012-04-27 12:31:20 +0000
16+++ debian/changelog 2012-07-06 14:47:22 +0000
17@@ -1,3 +1,10 @@
18+unity-2d (5.14.0-0ubuntu1) UNRELEASED; urgency=low
19+
20+ * debian/control:
21+ - switch to new libunity-core-6.0-dev and libnux-3.0-dev
22+
23+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com> Thu, 05 Jul 2012 13:58:12 +0200
24+
25 unity-2d (5.12.0-0ubuntu1) precise-proposed; urgency=low
26
27 * New upstream release:
28
29=== modified file 'debian/control'
30--- debian/control 2012-04-12 09:02:31 +0000
31+++ debian/control 2012-07-06 14:47:22 +0000
32@@ -22,8 +22,8 @@
33 libgtk-3-dev,
34 libutouch-geis-dev,
35 libstartup-notification0-dev,
36- libunity-core-5.0-dev (>= 5.8.0),
37- libnux-2.0-dev (>= 2.10),
38+ libunity-core-6.0-dev (>= 6.0.0),
39+ libnux-3.0-dev (>= 3.0),
40 libxi-dev,
41 libxtst-dev,
42 libxfixes-dev (>= 1:5.0-4ubuntu4~),
43
44=== modified file 'libunity-2d-private/CMakeLists.txt'
45--- libunity-2d-private/CMakeLists.txt 2012-02-08 19:22:58 +0000
46+++ libunity-2d-private/CMakeLists.txt 2012-07-06 14:47:22 +0000
47@@ -7,7 +7,7 @@
48 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
49 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
50 pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
51-pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)
52+pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
53 pkg_check_modules(DEE REQUIRED dee-1.0)
54 pkg_check_modules(XINPUT REQUIRED xi)
55 pkg_check_modules(GEIS REQUIRED libutouch-geis)
56
57=== modified file 'panel/CMakeLists.txt'
58--- panel/CMakeLists.txt 2011-12-09 10:19:49 +0000
59+++ panel/CMakeLists.txt 2012-07-06 14:47:22 +0000
60@@ -1,7 +1,7 @@
61 project(unity-2d-panel)
62
63 # Dependencies
64-pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)
65+pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
66
67 # Source
68 include_directories(

Subscribers

People subscribed via source and target branches