Merge lp:~cyphermox/compiz/compiz_destdir_for_packaging into lp:~compiz/compiz/ubuntu

[Mathieu Trudel-Lapierre]

I'm not sure how this ties in to plans to remove the use of COMPIZ_DESTDIR and general overhaul of the build system for compiz, but this here disables setting COMPIZ_DESTDIR to the contents of DESTDIR and avoids issues with duplicated paths when building plugins such as unity, when building with compiz in packaging mode.

[Didier Roche-Tolomelli (didrocks)]

Hey Mathieu

Can you propose that upstream directly? ping smspillaz when he's around. Thanks :)

[Didier Roche-Tolomelli (didrocks)]

btw, as you don't have the issue building unity on a new box, maybe it would be worth to see why COMPIZ_DESTDIR is set for you in the bad case as well?
I prefer a real patch, understanding what's wrong, rather than a workaround :/

[Sam Spilsbury (smspillaz)]

Please resubmit this against lp:compiz/0.9.8

review: Needs Resubmitting

Unmerged revisions

528. By Mathieu Trudel-Lapierre on 2011-02-09

debian/patches/088_compiz_packaging_compiz_destdir.patch: Don't set
COMPIZ_DESTDIR in packaging mode.

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-08 09:31:07 +0000
+++ debian/changelog	2011-02-10 19:32:58 +0000
@@ -1,3 +1,10 @@
+compiz (1:0.9.2.1+glibmainloop4-0ubuntu11) UNRELEASED; urgency=low
+
+  * debian/patches/088_compiz_packaging_compiz_destdir.patch: Don't set
+    COMPIZ_DESTDIR in packaging mode.
+
+ -- Mathieu Trudel-Lapierre <[e-mail]>  Wed, 09 Feb 2011 12:57:33 -0500
+
 compiz (1:0.9.2.1+glibmainloop4-0ubuntu10) natty; urgency=low
 
   * debian/patches/080_migrate_gconf_from_alpha1.patch

=== added file 'debian/patches/088_compiz_packaging_compiz_destdir.patch'
--- debian/patches/088_compiz_packaging_compiz_destdir.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/088_compiz_packaging_compiz_destdir.patch	2011-02-10 19:32:58 +0000
@@ -0,0 +1,13 @@
+Index: compiz-0.9.2.1+glibmainloop4/cmake/CompizCommon.cmake
+===================================================================
+--- compiz-0.9.2.1+glibmainloop4.orig/cmake/CompizCommon.cmake	2011-02-09 12:56:50.542061878 -0500
++++ compiz-0.9.2.1+glibmainloop4/cmake/CompizCommon.cmake	2011-02-09 12:57:02.292061878 -0500
+@@ -20,7 +20,7 @@
+ option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)
+ set (COMPIZ_DESTDIR "${DESTDIR}" CACHE STRING "Leave blank unless building packages")
+ 
+-if (NOT COMPIZ_DESTDIR)
++if (NOT COMPIZ_DESTDIR AND NOT COMPIZ_PACKAGING_ENABLED)
+     set (COMPIZ_DESTDIR $ENV{DESTDIR})
+ endif ()
+ 

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-08 09:31:04 +0000
+++ debian/patches/series	2011-02-10 19:32:58 +0000
@@ -23,3 +23,4 @@
 065_add_bailer_and_detection_plugins.patch
 085_add_grid_plugin.patch
 086_fix_unreachable_options_crash.patch
+088_compiz_packaging_compiz_destdir.patch