r40595 - in /desktop/experimental/gtk+3.0/debian: changelog rules

[pochu at users.alioth.debian.org]

Author: pochu
Date: Mon Feb 17 09:40:24 2014
New Revision: 40595

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40595
Log:
* debian/rules:
   + Break colord<->gtk+ loop when bootstrapping. Thanks Daniel Schepler.
     Closes: #738603.

Modified:
    desktop/experimental/gtk+3.0/debian/changelog
    desktop/experimental/gtk+3.0/debian/rules

Modified: desktop/experimental/gtk+3.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/changelog?rev=40595&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/changelog	[utf-8] Mon Feb 17 09:40:24 2014
@@ -16,6 +16,9 @@
       gdk.
   * debian/patches/080_disable-parallel-docs-build.patch:
      + Dropped, gtk-doc 1.20 works fine with parallel builds.
+  * debian/rules:
+     + Break colord<->gtk+ loop when bootstrapping. Thanks Daniel Schepler.
+       Closes: #738603.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Sun, 16 Feb 2014 19:00:43 +0100
 

Modified: desktop/experimental/gtk+3.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gtk%2B3.0/debian/rules?rev=40595&op=diff
==============================================================================
--- desktop/experimental/gtk+3.0/debian/rules	[utf-8] (original)
+++ desktop/experimental/gtk+3.0/debian/rules	[utf-8] Mon Feb 17 09:40:24 2014
@@ -70,8 +70,13 @@
 			--enable-gtk-doc \
 			--enable-shared \
 			--enable-introspection \
-			--enable-colord \
 			--disable-static
+
+ifeq (,$(filter stage1,$(DEB_BUILD_PROFILES)))
+DEB_CONFIGURE_FLAGS_shared += --enable-colord
+else
+DEB_CONFIGURE_FLAGS_shared += --disable-colord
+endif
 
 ifeq (linux,$(DEB_HOST_ARCH_OS))
 DEB_CONFIGURE_FLAGS_shared += --enable-wayland-backend