r36364 - in /desktop/experimental/gnome-control-center/debian: changelog control control.in rules

[aron at users.alioth.debian.org]

Author: aron
Date: Mon Nov 26 11:52:36 2012
New Revision: 36364

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

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

Modified: desktop/experimental/gnome-control-center/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/changelog?rev=36364&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog [utf-8] Mon Nov 26 11:52:36 2012
@@ -9,6 +9,10 @@
   * debian/gnome-control-center.sgml, debian/gnome-control-center.install
     debian/rules
     - Ship improved man page from GNOME
+
+  [ Aron Xu ]
+  * debian/control.in debian/rules: disable ibus integration.
+    (Closes: #694301, #691656)
 
  -- Sjoerd Simons <sjoerd at debian.org>  Tue, 13 Nov 2012 16:45:46 +0100
 

Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=36364&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control [utf-8] Mon Nov 26 11:52:36 2012
@@ -56,7 +56,6 @@
                network-manager-dev (>= 0.9) [linux-any],
                libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
                shared-mime-info,
-               libibus-1.0-dev (>= 1.4.99),
                libpwquality-dev,
                xsltproc,
                docbook-xsl,

Modified: desktop/experimental/gnome-control-center/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control.in?rev=36364&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in [utf-8] Mon Nov 26 11:52:36 2012
@@ -51,7 +51,6 @@
                network-manager-dev (>= 0.9) [linux-any],
                libgnome-bluetooth-dev (>= 3.5.5) [linux-any],
                shared-mime-info,
-               libibus-1.0-dev (>= 1.4.99),
                libpwquality-dev,
                xsltproc,
                docbook-xsl,

Modified: desktop/experimental/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/rules?rev=36364&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/rules [utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/rules [utf-8] Mon Nov 26 11:52:36 2012
@@ -13,6 +13,7 @@
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper \
                              --disable-update-mimedb \
+			     --disable-ibus \
                              --with-libsocialweb
 
 DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act