Merge lp:~didrocks/unity/fix-ftbfs-2013 into lp:unity

[Didier Roche-Tolomelli]

Fix 3 causes of FTBFS in the packaged version right now:
- pch seems to have issues with the way cmake is passing "-g -02", distro default
- compiz breaks its API and ABI but the build-dep version wasn't bumped
- nux breaks its API and ABI but the build-dep version wasn't bumped

Fix 3 causes of FTBFS in the packaged version right now:
- pch seems to have issues with the way cmake is passing "-g -02, distro default
- compiz breaks its API and ABI but the build-dep version wasn't bumped
- nux breaks its API and ABI but the build-dep version wasn't bumped

[Łukasz Zemczak (sil2100)]

Works and fixes the failures. Jussi's fix of -DCMAKE_BUILD_TYPE=relwithdebinfo is also fine, but let's give it some more time for testing until we include it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2012-12-11 17:38:03 +0000
+++ debian/changelog	2013-01-04 09:53:22 +0000
@@ -3,13 +3,17 @@
   [ Didier Roche ]
   * debian/control:
     - bump some missed build-deps
+    - bump compiz and nux build-deps for the API and ABI breakages
+      (LP: #1095981)
+  * debian/rules:
+    - disable pch for now as it's not working with -g -02 (LP: #1095978)
 
   [ Brandon Schaefer ]
   * Ported Compiz to 0.9.9
   * debian/control:
     - bump the build-deps
 
- -- Didier Roche <[e-mail]>  Wed, 05 Dec 2012 16:46:53 +0100
+ -- Didier Roche <[e-mail]>  Fri, 04 Jan 2013 10:41:18 +0100
 
 unity (6.12.0daily12.12.05-0ubuntu1) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2012-12-11 17:38:03 +0000
+++ debian/control	2013-01-04 09:53:22 +0000
@@ -27,8 +27,8 @@
                libunity-misc-dev (>= 4.0.4),
                libgrail-dev (>= 1.0.20),
                libxcb-icccm4-dev,
-               libnux-4.0-dev (>= 4.0.0),
-               compiz-dev (>= 1:0.9.9~daily12.12.05-0ubuntu2),
+               libnux-4.0-dev (>= 4.0.0daily12.12.05bzr742),
+               compiz-dev (>= 1:0.9.9~daily12.12.05bzr3519),
                libcompizconfig0-dev (>= 1:0.9.9~daily12.12.05-0ubuntu2),
                xsltproc,
                libboost-dev,

=== modified file 'debian/rules'
--- debian/rules	2012-11-15 16:12:59 +0000
+++ debian/rules	2013-01-04 09:53:22 +0000
@@ -18,9 +18,9 @@
 
 override_dh_auto_configure:
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
-	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
+	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON -Duse_pch=OFF
 else
-	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
+	dh_auto_configure -- -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package -Duse_pch=OFF
 endif
 
 override_dh_install: