Unity

Merge lp:~fginther/unity/unity-5.0-libgeis-rename into lp:unity/5.0

  1. unity-5.0-libgeis-rename
  2. Merge into 5.0
Proposed by Francis Ginther on 2012-08-28
Status: Merged
Approved by: Łukasz Zemczak on 2012-09-10
Approved revision: 2401
Merged at revision: 2401
Proposed branch: lp:~fginther/unity/unity-5.0-libgeis-rename
Merge into: lp:unity/5.0
Diff against target: 24 lines (+2/-2)
2 files modified
CMakeLists.txt (+1/-1)
HACKING (+1/-1)
To merge this branch: bzr merge lp:~fginther/unity/unity-5.0-libgeis-rename
Reviewer Review Type Date Requested Status
Sam Spilsbury (community) 2012-08-28 Approve on 2012-09-03
Review via email: mp+121654@code.launchpad.net

Commit Message

Updates dependency on the renamed libgeis.

Description of the Change

Updates dependency on the renamed libgeis.

The libutouch-geis project has been renamed to libgeis. Requires presence of libgeis-dev package and lp:~fginther/nux/nux-2.0-libgeis-rename.

Testing:
 - make
 - make check (no regressions)

UNBLOCK

To post a comment you must log in.
Sam Spilsbury (smspillaz) :
review: Approve
Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1178/console reported an error when processing this lp:~fginther/unity/unity-5.0-libgeis-rename branch.
Not merging it.

Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1260/console reported an error when processing this lp:~fginther/unity/unity-5.0-libgeis-rename branch.
Not merging it.

Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1262/console reported an error when processing this lp:~fginther/unity/unity-5.0-libgeis-rename branch.
Not merging it.

Unity Merger (unity-merger) wrote :

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-unity/1267/console reported an error when processing this lp:~fginther/unity/unity-5.0-libgeis-rename branch.
Not merging it.

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-07-19 09:05:13 +0000
3+++ CMakeLists.txt 2012-08-28 16:05:32 +0000
4@@ -122,7 +122,7 @@
5 #
6 # Compiz Plugins
7 #
8-set (UNITY_PLUGIN_DEPS "compiz;nux-2.0>=2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;libutouch-geis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu;xfixes")
9+set (UNITY_PLUGIN_DEPS "compiz;nux-2.0>=2.0.0;libbamf3;dee-1.0;gio-2.0;gio-unix-2.0;dbusmenu-glib-0.4;x11;libstartup-notification-1.0;gthread-2.0;indicator3-0.4>=0.4.90;atk;unity-misc>=0.4.0;gconf-2.0;libgeis;gtk+-3.0>=3.1;sigc++-2.0;json-glib-1.0;libnotify;gnome-desktop-3.0;gdu;xfixes")
10
11 add_subdirectory(plugins/unityshell)
12 add_subdirectory(plugins/gtkloader)
13
14=== modified file 'HACKING'
15--- HACKING 2012-03-14 06:24:18 +0000
16+++ HACKING 2012-08-28 16:05:32 +0000
17@@ -7,7 +7,7 @@
18 - gthread-2.0
19 - indicator
20 - atk
21- - libutouch-geis
22+ - libgeis
23
24 Or if you are on ubuntu run the command, apt-get build-dep unity
25

Subscribers

People subscribed via source and target branches

to all changes: