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

[bigon at users.alioth.debian.org]

Author: bigon
Date: Sat Aug 24 11:31:04 2013
New Revision: 39274

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=39274
Log:
* debian/control.in, debian/rules: Re-enable ibus support (Closes: #720489)
* debian/control.in: Bump Standards-Version to 3.9.4 (no further changes)
* debian/rules: Drop removed --enable-pulse configure flag

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=39274&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/changelog	[utf-8] Sat Aug 24 11:31:04 2013
@@ -1,3 +1,11 @@
+gnome-settings-daemon (3.8.4-2) UNRELEASED; urgency=low
+
+  * debian/control.in, debian/rules: Re-enable ibus support (Closes: #720489)
+  * debian/control.in: Bump Standards-Version to 3.9.4 (no further changes)
+  * debian/rules: Drop removed --enable-pulse configure flag
+
+ -- Laurent Bigonville <bigon at debian.org>  Sat, 24 Aug 2013 13:30:34 +0200
+
 gnome-settings-daemon (3.8.4-1) experimental; urgency=low
 
   [ Thomas Bechtold ]

Modified: desktop/experimental/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/control?rev=39274&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control	[utf-8] Sat Aug 24 11:31:04 2013
@@ -7,7 +7,7 @@
 Section: gnome
 Priority: optional
 Maintainer: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
-Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Josselin Mouette <joss at debian.org>, Michael Biebl <biebl at debian.org>, Sjoerd Simons <sjoerd at debian.org>
+Uploaders: Andreas Henriksson <andreas at fatal.se>, Emilio Pozuelo Monfort <pochu at debian.org>, Laurent Bigonville <bigon at debian.org>, Sjoerd Simons <sjoerd at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 8.1.0~),
                gnome-pkg-tools,
@@ -26,6 +26,7 @@
                libx11-dev,
                libgnomekbd-dev (>= 2.91.90),
                libxklavier-dev (>= 5.0),
+               libibus-1.0-dev (>= 1.5.2),
                gsettings-desktop-schemas-dev (>= 3.7.2.1),
                libgnome-desktop-3-dev (>= 3.8.0.1-2~),
                libpulse-dev (>= 2.0),

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=39274&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/control.in	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/control.in	[utf-8] Sat Aug 24 11:31:04 2013
@@ -21,6 +21,7 @@
                libx11-dev,
                libgnomekbd-dev (>= 2.91.90),
                libxklavier-dev (>= 5.0),
+               libibus-1.0-dev (>= 1.5.2),
                gsettings-desktop-schemas-dev (>= 3.7.2.1),
                libgnome-desktop-3-dev (>= 3.8.0.1-2~),
                libpulse-dev (>= 2.0),
@@ -39,7 +40,7 @@
                xsltproc,
                docbook-xsl,
                docbook-xsl-doc-html
-Standards-Version: 3.9.3
+Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/gnome-settings-daemon/
 Vcs-Svn: svn://anonscm.debian.org/pkg-gnome/desktop/unstable/gnome-settings-daemon/
 

Modified: desktop/experimental/gnome-settings-daemon/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-settings-daemon/debian/rules?rev=39274&op=diff
==============================================================================
--- desktop/experimental/gnome-settings-daemon/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-settings-daemon/debian/rules	[utf-8] Sat Aug 24 11:31:04 2013
@@ -13,8 +13,6 @@
 LDFLAGS += -Wl,-O1 -Wl,--warn-unresolved-symbols -Wl,--as-needed
 
 DEB_DH_MAKESHLIBS_ARGS_ALL += --no-act
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-pulse \
-			    --disable-ibus
 
 binary-install/gnome-settings-daemon::
 	find debian -name '*.a' -delete