r23611 - in /desktop/unstable/gnome-settings-daemon/debian: changelog control control.in patches/40_xklavier_5.0.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Thu Apr 8 22:17:07 UTC 2010


Author: joss
Date: Thu Apr  8 22:17:07 2010
New Revision: 23611

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=23611
Log:
* 40_xklavier_5.0.patch: new patch. Get 2.28 version to work with 
  libxklavier 5.0.
* Require said version to build.

Added:
    desktop/unstable/gnome-settings-daemon/debian/patches/40_xklavier_5.0.patch
Modified:
    desktop/unstable/gnome-settings-daemon/debian/changelog
    desktop/unstable/gnome-settings-daemon/debian/control
    desktop/unstable/gnome-settings-daemon/debian/control.in
    desktop/unstable/gnome-settings-daemon/debian/patches/series

Modified: desktop/unstable/gnome-settings-daemon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/changelog?rev=23611&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/changelog [utf-8] Thu Apr  8 22:17:07 2010
@@ -1,8 +1,11 @@
-gnome-settings-daemon (2.28.1-3) UNRELEASED; urgency=low
+gnome-settings-daemon (2.28.1-3) unstable; urgency=low
 
   * Depend on libgnome2-common for the GConf schemas.
-
- -- Josselin Mouette <joss at debian.org>  Mon, 05 Apr 2010 14:31:50 +0200
+  * 40_xklavier_5.0.patch: new patch. Get 2.28 version to work with 
+    libxklavier 5.0.
+  * Require said version to build.
+
+ -- Josselin Mouette <joss at debian.org>  Fri, 09 Apr 2010 00:17:00 +0200
 
 gnome-settings-daemon (2.28.1-2) unstable; urgency=low
 

Modified: desktop/unstable/gnome-settings-daemon/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control?rev=23611&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control [utf-8] Thu Apr  8 22:17:07 2010
@@ -28,7 +28,7 @@
                libxext-dev,
                libx11-dev,
                libgnomekbd-dev (>= 2.21.4),
-               libxklavier-dev (>= 4.0),
+               libxklavier-dev (>= 5.0),
                libgstreamer0.10-dev (>= 0.10.1.2),
                libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
                gnome-pkg-tools

Modified: desktop/unstable/gnome-settings-daemon/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/control.in?rev=23611&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/control.in [utf-8] Thu Apr  8 22:17:07 2010
@@ -23,7 +23,7 @@
                libxext-dev,
                libx11-dev,
                libgnomekbd-dev (>= 2.21.4),
-               libxklavier-dev (>= 4.0),
+               libxklavier-dev (>= 5.0),
                libgstreamer0.10-dev (>= 0.10.1.2),
                libgstreamer-plugins-base0.10-dev (>= 0.10.1.2),
                gnome-pkg-tools

Added: desktop/unstable/gnome-settings-daemon/debian/patches/40_xklavier_5.0.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/40_xklavier_5.0.patch?rev=23611&op=file
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/40_xklavier_5.0.patch (added)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/40_xklavier_5.0.patch [utf-8] Thu Apr  8 22:17:07 2010
@@ -1,0 +1,27 @@
+
+Index: gnome-settings-daemon-2.28.1/configure.ac
+===================================================================
+--- gnome-settings-daemon-2.28.1.orig/configure.ac	2010-04-09 00:06:20.434216920 +0200
++++ gnome-settings-daemon-2.28.1/configure.ac	2010-04-09 00:06:46.350216758 +0200
+@@ -220,7 +220,7 @@ AC_CHECK_X_LIB(Xxf86misc, XF86MiscQueryE
+ AC_SUBST(XF86MISC_LIBS)
+ AC_CHECK_X_HEADERS([X11/extensions/XKB.h])
+ 
+-PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4 libxklavier >= 4.0])
++PKG_CHECK_MODULES(LIBGNOMEKBD, [libgnomekbd >= 2.21.4 libxklavier >= 5.0])
+ AC_SUBST(LIBGNOMEKBD_CFLAGS)
+ AC_SUBST(LIBGNOMEKBD_LIBS)
+ 
+Index: gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c
+===================================================================
+--- gnome-settings-daemon-2.28.1.orig/plugins/keyboard/gsd-keyboard-xkb.c	2010-04-09 00:07:01.986713878 +0200
++++ gnome-settings-daemon-2.28.1/plugins/keyboard/gsd-keyboard-xkb.c	2010-04-09 00:07:42.686216451 +0200
+@@ -526,7 +526,7 @@ gsd_keyboard_xkb_shutdown (void)
+ 	if (!inited_ok)
+ 		return;
+ 
+-	xkl_engine_stop_listen (xkl_engine);
++	xkl_engine_stop_listen (xkl_engine, XKLL_MANAGE_LAYOUTS | XKLL_MANAGE_WINDOW_STATES);
+ 
+ 	gdk_window_remove_filter (NULL,
+ 				  (GdkFilterFunc)

Modified: desktop/unstable/gnome-settings-daemon/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-settings-daemon/debian/patches/series?rev=23611&op=diff
==============================================================================
--- desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-settings-daemon/debian/patches/series [utf-8] Thu Apr  8 22:17:07 2010
@@ -5,5 +5,6 @@
 12_monitor_network_fs.patch
 20_gstreamer.patch
 30_pkgconfig-path.patch
+40_xklavier_5.0.patch
 70_relibtoolize.patch
 99_ltmain_as-needed.patch




More information about the pkg-gnome-commits mailing list