Merge lp:~dbarth/libcompizconfig/oneiric-0.9.5.92-changes into lp:~compiz/libcompizconfig/ubuntu

[David Barth]

Prepare for the new upstream release

[Sam Spilsbury (smspillaz)]

28 +debian/tmp/usr/share/glib-2.0/schemas/org.freedesktop.compiz.ccp.gschema.xml

+1 although if you use -DUSE_GSETTINGS=OFF it shouldn't generate that file and shouldn't matter what arch you're on.

review: Approve

[Sam Spilsbury (smspillaz)]

This is old and still hanging around

Unmerged revisions

167. By David Barth on 2011-08-22

\-DUSE_GSETTINGS produces different results between x86 and amd64...

166. By David Barth on 2011-08-22

test build

165. By David Barth on 2011-08-22

test build

164. By David Barth on 2011-08-22

resort to installing the schema file anyway :/

163. By David Barth on 2011-08-22

force gsettings to off in the cmake build command

=== modified file 'debian/changelog'
--- debian/changelog	2011-08-10 09:59:25 +0000
+++ debian/changelog	2011-08-23 11:16:26 +0000
@@ -1,3 +1,15 @@
+libcompizconfig (1:0.9.5.92-0ubuntu2) oneiric; urgency=low
+
+  * resort to installing the bogus schema file
+
+ -- David Barth <[e-mail]>  Mon, 22 Aug 2011 20:08:48 +0200
+
+libcompizconfig (1:0.9.5.92) UNRELEASED; urgency=low 
+ 
+  * New upstream release (0.9.5.92) 
+ 
+ -- David Barth <[e-mail]>  Mon, 22 Aug 2011 14:15:27 +0200
+
 libcompizconfig (0.9.5.2-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release

=== modified file 'debian/libcompizconfig0.install'
--- debian/libcompizconfig0.install	2010-11-26 14:43:36 +0000
+++ debian/libcompizconfig0.install	2011-08-23 11:16:26 +0000
@@ -3,6 +3,7 @@
 debian/tmp/usr/lib/compizconfig/backends/libini.so
 debian/tmp/usr/share/compiz/ccp.xml
 debian/tmp/usr/share/gconf
+debian/tmp/usr/share/glib-2.0/schemas/org.freedesktop.compiz.ccp.gschema.xml
 debian/tmp/usr/lib/compiz/libccp.so
 debian/normal.profile	/usr/share/compizconfig
 debian/extra.profile	/usr/share/compizconfig