r54281 - in /desktop/unstable/glib2.0/debian: changelog rules

[smcv at users.alioth.debian.org]

Author: smcv
Date: Fri Oct  6 06:54:14 2017
New Revision: 54281

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=54281
Log:
Skip gtk-doc documentation unless we are building libglib2.0-doc

* Skip gtk-doc documentation unless we are building libglib2.0-doc,
  fixing cross-builds (Closes: #870346)
  - Note that gtk-doc-tools is still in Build-Depends, not
    Build-Depends-Indep, because we need it for autoreconf
* Explicitly disable documentation for the udeb build

Modified:
    desktop/unstable/glib2.0/debian/changelog
    desktop/unstable/glib2.0/debian/rules

Modified: desktop/unstable/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/changelog?rev=54281&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/changelog	[utf-8] Fri Oct  6 06:54:14 2017
@@ -1,8 +1,16 @@
 glib2.0 (2.54.1-2) UNRELEASED; urgency=medium
 
+  [ Didier Roche ]
   * debian/patches/01_gettext-desktopfiles.patch:
     - fix untranslated desktop action names when using gettext
       (Closes: #877761)
+
+  [ Simon McVittie ]
+  * Skip gtk-doc documentation unless we are building libglib2.0-doc,
+    fixing cross-builds (Closes: #870346)
+    - Note that gtk-doc-tools is still in Build-Depends, not
+      Build-Depends-Indep, because we need it for autoreconf
+  * Explicitly disable documentation for the udeb build
 
  -- Didier Roche <didrocks at ubuntu.com>  Thu, 05 Oct 2017 09:40:31 +0200
 

Modified: desktop/unstable/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/glib2.0/debian/rules?rev=54281&op=diff
==============================================================================
--- desktop/unstable/glib2.0/debian/rules	[utf-8] (original)
+++ desktop/unstable/glib2.0/debian/rules	[utf-8] Fri Oct  6 06:54:14 2017
@@ -98,18 +98,17 @@
 			--with-python=/usr/bin/python3 \
 			--with-pcre=system
 
-ifneq ($(DEB_BUILD_ARCH),$(DEB_HOST_ARCH))
-  DEB_CONFIGURE_EXTRA_FLAGS += \
-			--disable-modular-tests \
-			--disable-gtk-doc
-endif
-
 DEB_CONFIGURE_FLAGS_deb := \
-			--enable-gtk-doc \
 			--enable-static \
 			--enable-installed-tests \
 			--enable-always-build-tests \
 			--enable-debug=minimum
+
+ifneq ($(filter libglib2.0-doc,$(binaries)),)
+DEB_CONFIGURE_FLAGS_deb += --enable-gtk-doc
+else
+DEB_CONFIGURE_FLAGS_deb += --disable-gtk-doc
+endif
 
 # libmount is available on linux only
 ifeq ($(DEB_HOST_ARCH_OS), linux)
@@ -123,7 +122,8 @@
 
 DEB_CONFIGURE_FLAGS_udeb := \
 			--disable-selinux \
-			--disable-libmount
+			--disable-libmount \
+			--disable-gtk-doc
 
 override_dh_auto_build:
 	mkdir -p debian/tmp-xdg-runtime-dir