Merge lp:~sil2100/unity/geis_rename into lp:unity

Proposed by Łukasz Zemczak on 2012-08-01
Status: Rejected
Rejected by: Łukasz Zemczak on 2012-08-02
Proposed branch: lp:~sil2100/unity/geis_rename
Merge into: lp:unity
Diff against target: 12 lines (+1/-1)
1 file modified
CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~sil2100/unity/geis_rename
Reviewer Review Type Date Requested Status
jenkins (community) continuous-integration Needs Fixing on 2012-08-01
Marco Trevisan (Treviño) 2012-08-01 Approve on 2012-08-01
Review via email: mp+117666@code.launchpad.net

Commit Message

Do to a recent name switch, rename libutouch-geis to libgeis.

Description of the Change

- Problem:
The name of libutouch-geis has changed to libgeis. Right now the change is being made as distro-patches in the distro trees (lp:ubuntu/unity) - but this actually doesn't make sense, since anyway the sources need to be buildable. The rightful place for such a switch is in the source.
Without this, we would have to often fix the distro patch whenever a change in CMakeLists.txt is made in trunk. For instance, right now all merges fail just because the debian/patches/libgeis-rename.patch is failing.

- Fix:
Renaming libutouch-geis to libgeis.
Also needed: removing the libgeis-rename.patch from the distro tree.

- Tests:
Not applicable.

To post a comment you must log in.
Marco Trevisan (Treviño) (3v1n0) wrote :

Ok for me

review: Approve
jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Unity Merger (unity-merger) wrote :

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

Unity Merger (unity-merger) wrote :

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

Unmerged revisions

2530. By Łukasz Zemczak on 2012-08-01

Do to a recent name switch, rename libutouch-geis to libgeis

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-26 11:42:22 +0000
3+++ CMakeLists.txt 2012-08-01 14:33:19 +0000
4@@ -133,7 +133,7 @@
5 #
6 # Compiz Plugins
7 #
8-set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.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;xfixes;unity-protocol-private>=5.93.1")
9+set (UNITY_PLUGIN_DEPS "compiz;nux-3.0>=3.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;xfixes;unity-protocol-private>=5.93.1")
10 # FIXME: unity-protocol-private shouldn't be there, but building of unityshell is just broken
11
12 find_package (PkgConfig)