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

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Aug 24 11:54:18 2013
New Revision: 39275

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39275
Log:
debian/control.in, debian/rules: Re-enable ibus support (Closes: #720585)

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=39275&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/changelog	[utf-8] Sat Aug 24 11:54:18 2013
@@ -19,12 +19,13 @@
   * gnome-control-center-data.maintscript: Remove /etc/xdg/menus/gnomecc.menu
     and /etc/xdg/autostart/gnome-sound-applet.desktop on upgrade, the files
     are no longer shipped (Closes: #712831)
+  * debian/control.in, debian/rules: Re-enable ibus support (Closes: #720585)
 
   [ Jeremy Bicha ]
   * Build-depend on gtk-doc-tools instead of docbook directly
   * Don't build-depend on gnome-doc-utils
 
- -- Emilio Pozuelo Monfort <pochu at debian.org>  Sat, 08 Jun 2013 19:48:07 +0200
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 24 Aug 2013 13:32:16 +0200
 
 gnome-control-center (1:3.8.3-1) experimental; urgency=low
 

Modified: desktop/experimental/gnome-control-center/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/control?rev=39275&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control	[utf-8] Sat Aug 24 11:54:18 2013
@@ -2,6 +2,7 @@
 # 
 # Modifications should be made to debian/control.in instead.
 # This file is regenerated automatically in the clean target.
+
 Source: gnome-control-center
 Section: gnome
 Priority: optional
@@ -35,6 +36,7 @@
                libgnome-desktop-3-dev (>= 3.7.5),
                libgnome-menu-3-dev,
                libgnomekbd-dev (>= 2.91.91),
+               libibus-1.0-dev (>= 1.5.2),
                libgoa-1.0-dev (>= 3.8.1),
                libgtk-3-dev (>= 3.7.7),
                libgtop2-dev,

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=39275&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/control.in	[utf-8] Sat Aug 24 11:54:18 2013
@@ -31,6 +31,7 @@
                libgnome-desktop-3-dev (>= 3.7.5),
                libgnome-menu-3-dev,
                libgnomekbd-dev (>= 2.91.91),
+               libibus-1.0-dev (>= 1.5.2),
                libgoa-1.0-dev (>= 3.8.1),
                libgtk-3-dev (>= 3.7.7),
                libgtop2-dev,

Modified: desktop/experimental/gnome-control-center/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-control-center/debian/rules?rev=39275&op=diff
==============================================================================
--- desktop/experimental/gnome-control-center/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-control-center/debian/rules	[utf-8] Sat Aug 24 11:54:18 2013
@@ -13,7 +13,6 @@
 include /usr/share/dpkg/buildflags.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --disable-update-mimedb \
-			     --disable-ibus \
                              --with-libsocialweb
 
 DEB_DH_MAKESHLIBS_ARGS_gnome-control-center = --no-act