Merge lp:~darkxst/compiz/lp1481541 into lp:compiz/0.9.12

[Tim Lunn]

Remove unused code that causes a build-dep on gnome-control-center-dev (LP: #1481541)

This branch is based off lp:~azzar1/compiz/gcc5/

[Marco Trevisan (Treviño) (3v1n0)]

+1

review: Approve

[Stephen M. Webb (bregma)]

I'd just like to point out that this MP has a prerequisite of another MP that has not been approved will probably not merge successfully.

[Stephen M. Webb (bregma)]

Indeed, there are merge conflicts.

You need to resubmit this MP based on the current Compiz trunk instead.

review: Needs Fixing

[Tim Lunn (darkxst)]

trunk was FTBFS with gcc5 when I prepared the patched, have rebased now on trunk

[Stephen M. Webb (bregma)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-08-05 11:26:37 +0000
+++ debian/control	2015-08-13 22:53:48 +0000
@@ -53,7 +53,6 @@
                protobuf-compiler,
                python-all-dev,
                python-pyrex,
-               gnome-control-center-dev,
                gsettings-desktop-schemas-dev,
                xserver-xorg-dev (>= 0.7.0),
 Standards-Version: 3.9.6

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2015-06-12 18:43:05 +0000
+++ gtk/CMakeLists.txt	2015-08-13 22:53:48 +0000
@@ -52,17 +52,6 @@
 	    endif (GNOME_WINDOW_SETTINGS_FOUND)
 	endif (USE_GNOME)
 
-	if (USE_GNOME_KEYBINDINGS)
-	    compiz_pkg_check_modules (GNOME_KEY_BINDINGS gnome-keybindings)
-	    if (GNOME_KEY_BINDINGS_FOUND)
-		exec_program (${PKG_CONFIG_EXECUTABLE}
-		  ARGS "--variable=keysdir gnome-keybindings"
-		  OUTPUT_VARIABLE keybindingsdir
-		)
-	    else (GNOME_KEY_BINDINGS_FOUND)
-		compiz_set (USE_GNOME_KEYBINDINGS 0)
-	    endif (GNOME_KEY_BINDINGS_FOUND)
-        endif (USE_GNOME_KEYBINDINGS)
     else (GTK_WINDOW_DECORATOR_FOUND)
 	compiz_set (USE_GTK 0)
     endif (GTK_WINDOW_DECORATOR_FOUND)