r36559 - in /desktop/experimental/glib2.0/debian: changelog control control.in rules

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Thu Jan 10 05:46:36 2013
New Revision: 36559

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36559
Log:
* Configure cross builds with --disable-modular-tests --disable-gtk-doc.
* Build-depend on python:any. Build dependencies on python-dbus and
  python-gi can be ignored for the cross builds.

Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/control
    desktop/experimental/glib2.0/debian/control.in
    desktop/experimental/glib2.0/debian/rules

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=36559&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog [utf-8] Thu Jan 10 05:46:36 2013
@@ -1,3 +1,12 @@
+glib2.0 (2.34.3-2) UNRELEASED; urgency=low
+
+  [ Matthias Klose ]
+  * Configure cross builds with --disable-modular-tests --disable-gtk-doc.
+  * Build-depend on python:any. Build dependencies on python-dbus and
+    python-gi can be ignored for the cross builds.
+
+ -- Martin Pitt <mpitt at debian.org>  Wed, 09 Jan 2013 15:41:04 +0100
+
 glib2.0 (2.34.3-1) experimental; urgency=low
 
   * New upstream release.

Modified: desktop/experimental/glib2.0/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control?rev=36559&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control [utf-8] Thu Jan 10 05:46:36 2013
@@ -22,7 +22,7 @@
                dbus,
                dbus-x11,
                shared-mime-info,
-               python (>= 2.5),
+               python:any (>= 2.5),
                python-dbus,
                python-gi,
                libxml2-utils,

Modified: desktop/experimental/glib2.0/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/control.in?rev=36559&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/control.in [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/control.in [utf-8] Thu Jan 10 05:46:36 2013
@@ -22,7 +22,7 @@
                dbus,
                dbus-x11,
                shared-mime-info,
-               python (>= 2.5),
+               python:any (>= 2.5),
                python-dbus,
                python-gi,
                libxml2-utils,

Modified: desktop/experimental/glib2.0/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/rules?rev=36559&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/rules [utf-8] (original)
+++ desktop/experimental/glib2.0/debian/rules [utf-8] Thu Jan 10 05:46:36 2013
@@ -68,6 +68,12 @@
 			--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 			--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