r36363 - in /desktop/experimental/gnome-settings-daemon/debian: changelog control control.in rules

[aron at users.alioth.debian.org]

Author: aron
Date: Mon Nov 26 11:46:49 2012
New Revision: 36363

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36363
Log:
Disable ibus integration (Closes: #694301)
 * debian/rules: configure with --disable-ibus
 * debian/control{,.in}: remove ibus related dependencies
 * debian/changelog: update changelog

Modified:
    desktop/experimental/gnome-settings-daemon/debian/changelog
    desktop/experimental/gnome-settings-daemon/debian/control
    desktop/experimental/gnome-settings-daemon/debian/control.in
    desktop/experimental/gnome-settings-daemon/debian/rules

Modified: desktop/experimental/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/changelog?rev=36363&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog [utf-8] Mon Nov 26 11:46:49 2012
@@ -1,6 +1,10 @@
 gnome-settings-daemon (3.6.1-2) UNRELEASED; urgency=low
 
+  [ Frederic Peters ]
   * debian/control.in: bump {build-,}dependency on gsettings-desktop-schemas.
+
+  [ Aron Xu ]
+  * debian/control.in debian/rules: disable ibus integration (Closes: #694301).
 
  -- Frederic Peters <fpeters at debian.org>  Mon, 15 Oct 2012 14:45:04 +0200
 

Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=36363&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control [utf-8] Mon Nov 26 11:46:49 2012
@@ -42,7 +42,6 @@
                libnss3-dev,
                libwacom-dev (>= 0.6) [!hurd-any !kfreebsd-any !s390 !s390x],
                xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
-               libibus-1.0-dev (>= 1.4.99),
                xsltproc,
                docbook-xsl,
                docbook-xsl-doc-html

Modified: desktop/experimental/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control.in?rev=36363&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in [utf-8] Mon Nov 26 11:46:49 2012
@@ -37,7 +37,6 @@
                libnss3-dev,
                libwacom-dev (>= 0.6) [!hurd-any !kfreebsd-any !s390 !s390x],
                xserver-xorg-input-wacom [!hurd-any !kfreebsd-any !s390 !s390x],
-               libibus-1.0-dev (>= 1.4.99),
                xsltproc,
                docbook-xsl,
                docbook-xsl-doc-html

Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=36363&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules [utf-8] Mon Nov 26 11:46:49 2012
@@ -13,7 +13,8 @@
 LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-pulse
+DEB_CONFIGURE_EXTRA_FLAGS = --enable-pulse \
+			    --disable-ibus
 
 binary-install/gnome-settings-daemon::
 	find debian -name '*.a' -delete