Merge lp:~fginther/unity/oneiric-libgeis-rename into lp:unity/4.0

Proposed by Francis Ginther on 2012-09-11
Status: Merged
Approved by: Łukasz Zemczak on 2012-09-12
Approved revision: 1737
Merged at revision: 1737
Proposed branch: lp:~fginther/unity/oneiric-libgeis-rename
Merge into: lp:unity/4.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/oneiric-libgeis-rename
Reviewer Review Type Date Requested Status
Unity Team 2012-09-11 Pending
Review via email: mp+123760@code.launchpad.net

Commit message

Update build dependency on the renamed libgeis

Description of the change

Update build dependency on the renamed libgeis-dev. Libgeis-dev can be found in oneiric-proposed. This change is only to use the renamed library, there is no functional change.

This change requires packaging branch changes which can be found here: lp:~fginther/unity/oneiric-libgeis-rename-packaging

[Testing]
 - Built package with pbuilder chroot
 - Install and run on oneiric system
   - Performed very basic testing of panel, dash, launcher and switcher. No regressions observed.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-01-05 13:44:38 +0000
+++ CMakeLists.txt 2012-09-11 14:32:20 +0000
@@ -121,7 +121,7 @@
121#121#
122# Compiz Plugins122# Compiz Plugins
123#123#
124set (UNITY_PLUGIN_DEPS "compiz;nux-1.0 >= 1.2.2;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;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")124set (UNITY_PLUGIN_DEPS "compiz;nux-1.0 >= 1.2.2;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;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")
125125
126126
127find_package (Compiz REQUIRED)127find_package (Compiz REQUIRED)
128128
=== modified file 'HACKING'
--- HACKING 2011-06-03 16:33:49 +0000
+++ HACKING 2012-09-11 14:32:20 +0000
@@ -7,7 +7,7 @@
7 - gthread-2.07 - gthread-2.0
8 - indicator8 - indicator
9 - atk9 - atk
10 - libutouch-geis10 - libgeis
1111
12Or if you are on ubuntu run the command, apt-get build-dep unity12Or if you are on ubuntu run the command, apt-get build-dep unity
1313

Subscribers

People subscribed via source and target branches

to all changes: