Merge lp:~bregma/compiz/lp-1156294 into lp:compiz/0.9.12

[Stephen M. Webb]

debian/compizconfig: renamed from debian/config to avoid debconf clashes

A file name "debian/config" can cause problems suring package reconfiguration (it's reserved for use by debconf). This MP renames the original file to avoid that conflict while still installing the file with the correct name at its final destination.

[Christopher Townsend (townsend)]

LGTM

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:3890
http://jenkins.qa.ubuntu.com/job/compiz-ci/7/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-amd64-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-armhf-ci/7
    SUCCESS: http://jenkins.qa.ubuntu.com/job/compiz-utopic-i386-ci/7

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/compiz-ci/7/rebuild

review: Approve (continuous-integration)

=== renamed file 'debian/config' => 'debian/compizconfig'
=== modified file 'debian/libcompizconfig0.install'
--- debian/libcompizconfig0.install	2012-06-19 11:22:48 +0000
+++ debian/libcompizconfig0.install	2014-10-30 18:10:06 +0000
@@ -3,4 +3,4 @@
 debian/tmp/usr/lib/compizconfig/backends/libini.so
 debian/tmp/usr/share/compiz/ccp.xml
 debian/tmp/usr/lib/compiz/libccp.so
-debian/config /etc/compizconfig
+config /etc/compizconfig

=== modified file 'debian/rules'
--- debian/rules	2013-04-25 11:01:36 +0000
+++ debian/rules	2014-10-30 18:10:06 +0000
@@ -68,6 +68,9 @@
 	mkdir -p debian/tmp/usr/share/gnome-control-center/keybindings
 	find */gtk/gnome -name *.xml | xargs cp -at debian/tmp/usr/share/gnome-control-center/keybindings/
 
+	# work around having a file with a conflicted special name (#1156294)
+	cp debian/compizconfig debian/tmp/config
+
 	dh_install --fail-missing
 
 	# remove the compizconfig dev file from compiz-dev