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

Proposed by Francis Ginther on 2012-09-06
Status: Merged
Approved by: Gerry Boland on 2012-09-07
Approved revision: 752
Merge reported by: Łukasz Zemczak
Merged at revision: not available
Proposed branch: lp:~fginther/unity-2d/libgeis-rename-oneiric
Merge into: lp:unity-2d/4.0
Diff against target: 36 lines (+8/-2)
3 files modified
debian/changelog (+6/-0)
debian/control (+1/-1)
launcher/app/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~fginther/unity-2d/libgeis-rename-oneiric
Reviewer Review Type Date Requested Status
Chase Douglas (community) Approve on 2012-09-06
Gerry Boland 2012-09-06 Needs Information on 2012-09-06
Review via email: mp+123139@code.launchpad.net

Commit message

Update build dependency to the renamed libgeis-dev (LP: #1046392)

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

Note:
 - requires build with libgeis-dev currently in precise-proposed

To post a comment you must log in.
Gerry Boland (gerboland) wrote :

 - requires build with libgeis-dev currently in precise-proposed
You mean oneiric-proposed? Will this be made into an SRU? I just want to ensure all Oneiric users will update correctly.

review: Needs Information
Chase Douglas (chasedouglas) wrote :

Looks good :).

review: Approve
Francis Ginther (fginther) wrote :

> - requires build with libgeis-dev currently in precise-proposed
> You mean oneiric-proposed? Will this be made into an SRU? I just want to
> ensure all Oneiric users will update correctly.

Yes, you are correct. This is targeted for oneiric and an SRU delivery.

Łukasz Zemczak (sil2100) wrote :

Merged in manually to lp:unity/4.0.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-06-13 16:38:23 +0000
3+++ debian/changelog 2012-09-06 18:06:25 +0000
4@@ -1,3 +1,9 @@
5+unity-2d (4.12.0-0ubuntu1.3) UNRELEASED; urgency=low
6+
7+ * Update build dependency to the renamed libgeis-dev (LP: #1046392)
8+
9+ -- Francis Ginther <francis.ginther@canonical.com> Wed, 05 Sep 2012 13:44:49 -0500
10+
11 unity-2d (4.12.0-0ubuntu1.2) oneiric-security; urgency=low
12
13 * Fix issue with dropdown boxes on sites stop working (LP: #1010466)
14
15=== modified file 'debian/control'
16--- debian/control 2011-09-19 17:11:45 +0000
17+++ debian/control 2012-09-06 18:06:25 +0000
18@@ -20,7 +20,7 @@
19 libx11-dev,
20 libindicator3-dev,
21 libgtk-3-dev,
22- libutouch-geis-dev,
23+ libgeis-dev,
24 libstartup-notification0-dev,
25 libunity-core-4.0-dev (>= 4.14.2),
26 libnux-1.0-dev (>= 1.8),
27
28=== modified file 'launcher/app/CMakeLists.txt'
29--- launcher/app/CMakeLists.txt 2011-07-27 12:29:17 +0000
30+++ launcher/app/CMakeLists.txt 2012-09-06 18:06:25 +0000
31@@ -1,5 +1,5 @@
32 # Dependencies
33-pkg_check_modules(GEIS REQUIRED libutouch-geis)
34+pkg_check_modules(GEIS REQUIRED libgeis)
35 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
36 pkg_check_modules(DCONFQT REQUIRED dconf-qt)
37

Subscribers

People subscribed via source and target branches

to all changes: