Merge lp:~fginther/unity-2d/libgeis-rename into lp:unity-2d

Proposed by Francis Ginther on 2012-09-05
Status: Merged
Approved by: Martin Mrazik on 2012-09-07
Approved revision: 1134
Merged at revision: 1134
Proposed branch: lp:~fginther/unity-2d/libgeis-rename
Merge into: lp:unity-2d
Diff against target: 39 lines (+8/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
libunity-2d-private/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~fginther/unity-2d/libgeis-rename
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve on 2012-09-06
Chase Douglas (community) 2012-09-05 Approve on 2012-09-05
jenkins (community) continuous-integration Needs Fixing on 2012-09-05
Review via email: mp+122924@code.launchpad.net

Commit message

Update build dependency to the renamed libgeis-dev

Description of the change

Renamed build dependency from libutouch-geis-dev to libgeis-dev due to a rename of the geis project. The change to libgeis is a rename of files and symbols only, there were no functional changes.

Testing:
 - built and booted with updated package on precise

To post a comment you must log in.
jenkins (martin-mrazik+qa) wrote :
review: Needs Fixing (continuous-integration)
Chase Douglas (chasedouglas) wrote :

Looks good to me!

review: Approve
Gerry Boland (gerboland) wrote :

Yep looks fine, thank you. Approving.

review: Approve
Unity Merger (unity-merger) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-04-27 12:31:20 +0000
+++ debian/changelog 2012-09-05 18:41:23 +0000
@@ -1,3 +1,9 @@
1unity-2d (5.14.0-0ubuntu1) UNRELEASED; urgency=low
2
3 * Update build dependency to the renamed libgeis-dev (LP: #1046392)
4
5 -- Francis Ginther <francis.ginther@canonical.com> Tue, 04 Sep 2012 14:39:28 -0500
6
1unity-2d (5.12.0-0ubuntu1) precise-proposed; urgency=low7unity-2d (5.12.0-0ubuntu1) precise-proposed; urgency=low
28
3 * New upstream release:9 * New upstream release:
410
=== modified file 'debian/control'
--- debian/control 2012-04-12 09:02:31 +0000
+++ debian/control 2012-09-05 18:41:23 +0000
@@ -20,7 +20,7 @@
20 libx11-dev,20 libx11-dev,
21 libindicator3-dev,21 libindicator3-dev,
22 libgtk-3-dev,22 libgtk-3-dev,
23 libutouch-geis-dev,23 libgeis-dev,
24 libstartup-notification0-dev,24 libstartup-notification0-dev,
25 libunity-core-5.0-dev (>= 5.8.0),25 libunity-core-5.0-dev (>= 5.8.0),
26 libnux-2.0-dev (>= 2.10),26 libnux-2.0-dev (>= 2.10),
2727
=== 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-09-05 18:41:23 +0000
@@ -10,7 +10,7 @@
10pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)10pkg_check_modules(UNITYCORE REQUIRED unity-core-5.0)
11pkg_check_modules(DEE REQUIRED dee-1.0)11pkg_check_modules(DEE REQUIRED dee-1.0)
12pkg_check_modules(XINPUT REQUIRED xi)12pkg_check_modules(XINPUT REQUIRED xi)
13pkg_check_modules(GEIS REQUIRED libutouch-geis)13pkg_check_modules(GEIS REQUIRED libgeis)
14pkg_check_modules(XFIXES REQUIRED xfixes)14pkg_check_modules(XFIXES REQUIRED xfixes)
1515
16set(libunity-2d-private_SOVERSION 0)16set(libunity-2d-private_SOVERSION 0)

Subscribers

People subscribed via source and target branches