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

[Łukasz Zemczak]

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

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.

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[jenkins (martin-mrazik+qa)]

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

review: Needs Fixing (continuous-integration)

[Didier Roche (didrocks)]

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

review: Needs Fixing

[Didier Roche (didrocks)]

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

review: Approve

[Unity Merger (unity-merger)]

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.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1123
http://s-jenkins:8080/job/unity-2d-ci/22/
Executed test runs:
    FAILURE: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=amd64/22/console
    FAILURE: http://s-jenkins:8080/job/unity-2d-ci/./distribution=precise,flavor=i386/22/console

review: Needs Fixing (continuous-integration)

Unmerged revisions

1123. By Łukasz Zemczak on 2012-07-06

One more missing 5.0 -> 6.0 switch.

1122. By Łukasz Zemczak on 2012-07-05

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

1121. By Łukasz Zemczak on 2012-07-05

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

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-03-08 15:25:42 +0000
+++ CMakeLists.txt	2012-07-06 14:47:22 +0000
@@ -41,7 +41,7 @@
 pkg_check_modules(GIO REQUIRED gio-2.0)
 pkg_check_modules(WNCK REQUIRED libwnck-3.0)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
-pkg_check_modules(NUXCORE REQUIRED nux-core-2.0)
+pkg_check_modules(NUXCORE REQUIRED nux-core-3.0)
 pkg_check_modules(PANGO REQUIRED pango)
 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
 

=== modified file 'debian/changelog'
--- debian/changelog	2012-04-27 12:31:20 +0000
+++ debian/changelog	2012-07-06 14:47:22 +0000
@@ -1,3 +1,10 @@
+unity-2d (5.14.0-0ubuntu1) UNRELEASED; urgency=low
+
+  * debian/control:
+    - switch to new libunity-core-6.0-dev and libnux-3.0-dev
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Thu, 05 Jul 2012 13:58:12 +0200
+
 unity-2d (5.12.0-0ubuntu1) precise-proposed; urgency=low
 
   * New upstream release:

=== modified file 'debian/control'
--- debian/control	2012-04-12 09:02:31 +0000
+++ debian/control	2012-07-06 14:47:22 +0000
@@ -22,8 +22,8 @@
                libgtk-3-dev,
                libutouch-geis-dev,
                libstartup-notification0-dev,
-               libunity-core-5.0-dev (>= 5.8.0),
-               libnux-2.0-dev (>= 2.10),
+               libunity-core-6.0-dev (>= 6.0.0),
+               libnux-3.0-dev (>= 3.0),
                libxi-dev,
                libxtst-dev,
                libxfixes-dev (>= 1:5.0-4ubuntu4~),

=== modified file 'libunity-2d-private/CMakeLists.txt'
--- libunity-2d-private/CMakeLists.txt	2012-02-08 19:22:58 +0000
+++ libunity-2d-private/CMakeLists.txt	2012-07-06 14:47:22 +0000
@@ -7,7 +7,7 @@
 pkg_check_modules(DBUSMENUQT REQUIRED dbusmenu-qt)
 pkg_check_modules(STARTUPNOTIFICATION REQUIRED libstartup-notification-1.0)
 pkg_check_modules(INDICATOR REQUIRED indicator3-0.4)
-pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)
+pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
 pkg_check_modules(DEE REQUIRED dee-1.0)
 pkg_check_modules(XINPUT REQUIRED xi)
 pkg_check_modules(GEIS REQUIRED libutouch-geis)

=== modified file 'panel/CMakeLists.txt'
--- panel/CMakeLists.txt	2011-12-09 10:19:49 +0000
+++ panel/CMakeLists.txt	2012-07-06 14:47:22 +0000
@@ -1,7 +1,7 @@
 project(unity-2d-panel)
 
 # Dependencies
-pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)
+pkg_check_modules(UNITYCORE REQUIRED unity-core-6.0)
 
 # Source
 include_directories(