r43298 - in /desktop/experimental/gnome-desktop3/debian: changelog rules

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Oct  1 00:37:57 2014
New Revision: 43298

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43298
Log:
Merge changes from unstable branch

Modified:
    desktop/experimental/gnome-desktop3/debian/changelog
    desktop/experimental/gnome-desktop3/debian/rules

Modified: desktop/experimental/gnome-desktop3/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/changelog?rev=43298&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/changelog	[utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/changelog	[utf-8] Wed Oct  1 00:37:57 2014
@@ -1,3 +1,10 @@
+gnome-desktop3 (3.14.0-2) UNRELEASED; urgency=medium
+
+  [ Tim Lunn ]
+  * debian/rules: Drop obsolete scrollkeeper configure flag
+
+ -- Michael Biebl <biebl at debian.org>  Wed, 01 Oct 2014 02:37:05 +0200
+
 gnome-desktop3 (3.14.0-1) unstable; urgency=medium
 
   * debian/watch: only search for stable releases.

Modified: desktop/experimental/gnome-desktop3/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/gnome-desktop3/debian/rules?rev=43298&op=diff
==============================================================================
--- desktop/experimental/gnome-desktop3/debian/rules	[utf-8] (original)
+++ desktop/experimental/gnome-desktop3/debian/rules	[utf-8] Wed Oct  1 00:37:57 2014
@@ -18,7 +18,6 @@
 DEB_CONFIGURE_EXTRA_FLAGS += \
 			--with-gnome-distributor=$(shell dpkg-vendor --query vendor) \
 			--with-pnp-ids-path=/usr/share/hwdata/pnp.ids \
-			--disable-scrollkeeper \
 			--enable-gtk-doc \
 			--enable-desktop-docs \
 			--enable-introspection