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

[Francis Ginther]

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

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

[Gerry Boland (gerboland)]

 - 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)]

Looks good :).

review: Approve

[Francis Ginther (fginther)]

> - 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)]

Merged in manually to lp:unity/4.0.

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-13 16:38:23 +0000
+++ debian/changelog	2012-09-06 18:06:25 +0000
@@ -1,3 +1,9 @@
+unity-2d (4.12.0-0ubuntu1.3) UNRELEASED; urgency=low
+
+  * Update build dependency to the renamed libgeis-dev (LP: #1046392)
+
+ -- Francis Ginther <[e-mail]>  Wed, 05 Sep 2012 13:44:49 -0500
+
 unity-2d (4.12.0-0ubuntu1.2) oneiric-security; urgency=low
 
   * Fix issue with dropdown boxes on sites stop working (LP: #1010466)
 
=== modified file 'debian/control'
--- debian/control	2011-09-19 17:11:45 +0000
+++ debian/control	2012-09-06 18:06:25 +0000
@@ -20,7 +20,7 @@
                libx11-dev,
                libindicator3-dev,
                libgtk-3-dev,
-               libutouch-geis-dev,
+               libgeis-dev,
                libstartup-notification0-dev,
                libunity-core-4.0-dev (>= 4.14.2),
                libnux-1.0-dev (>= 1.8),
 
=== modified file 'launcher/app/CMakeLists.txt'
--- launcher/app/CMakeLists.txt	2011-07-27 12:29:17 +0000
+++ launcher/app/CMakeLists.txt	2012-09-06 18:06:25 +0000
@@ -1,5 +1,5 @@
 # Dependencies
-pkg_check_modules(GEIS REQUIRED libutouch-geis)
+pkg_check_modules(GEIS REQUIRED libgeis)
 pkg_check_modules(QTGCONF REQUIRED libqtgconf)
 pkg_check_modules(DCONFQT REQUIRED dconf-qt)