[Pkg-kde-commits] rev 1095 - in trunk/packages/kdelibs/debian: . patches

[Christopher Martin]

Author: chrsmrtn-guest
Date: 2005-05-23 13:09:18 +0000 (Mon, 23 May 2005)
New Revision: 1095

Modified:
   trunk/packages/kdelibs/debian/changelog
   trunk/packages/kdelibs/debian/patches/22_kaccel2.diff
Log:
Commit NMU changes.


Modified: trunk/packages/kdelibs/debian/changelog
===================================================================
--- trunk/packages/kdelibs/debian/changelog	2005-05-22 17:08:45 UTC (rev 1094)
+++ trunk/packages/kdelibs/debian/changelog	2005-05-23 13:09:18 UTC (rev 1095)
@@ -1,3 +1,10 @@
+kdelibs (4:3.3.2-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Export modXModeSwitch. Patch by Mattia Dongili (Closes: #309955)
+
+ -- Frank Lichtenheld <djpig@debian.org>  Sat, 21 May 2005 22:02:29 +0200
+
 kdelibs (4:3.3.2-6) unstable; urgency=high
 
   +++ Changes by Christopher Martin:

Modified: trunk/packages/kdelibs/debian/patches/22_kaccel2.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/22_kaccel2.diff	2005-05-22 17:08:45 UTC (rev 1094)
+++ trunk/packages/kdelibs/debian/patches/22_kaccel2.diff	2005-05-23 13:09:18 UTC (rev 1095)
@@ -60,3 +60,29 @@
  
  uint accelModMaskX()
  {
+--- kdelibs.orig/kdecore/kkeyserver_x11.h	2003-08-18 10:45:04.000000000 +0200
++++ kdelibs.patched/kdecore/kkeyserver_x11.h	2005-05-21 21:59:58.125989608 +0200
+@@ -303,6 +303,14 @@
+ 	uint modXScrollLock();
+ 
+ 	/**
++	 * Returns the X11 Mode_switch modifier mask/flag. 
++	 * @return the X11 Mode_switch modifier mask/flag. 
++	 * @see accelModMaskX()
++	 * @since 3.5
++	 */
++	uint modXModeSwitch();
++
++	/**
+ 	 * Returns bitwise OR'ed mask containing Shift, Ctrl, Alt, and
+ 	 * Win (if available).
+ 	 * @see modXShift()
+--- kdelibs.orig/kdecore/kkeynative_x11.cpp    2003-06-02 09:04:39.000000000 +0200
++++ kdelibs.patched/kdecore/kkeynative_x11.cpp        2005-05-22 22:54:08.191019328 +0200
+@@ -169,5 +169,6 @@
+ uint KKeyNative::modXNumLock()                 { return KKeyServer::modXNumLock(); }
+ uint KKeyNative::modXLock()                    { return KKeyServer::modXLock(); }
+ uint KKeyNative::modXScrollLock()              { return KKeyServer::modXScrollLock(); }
++uint KKeyNative::modXModeSwitch()              { return KKeyServer::modXModeSwitch(); }
+
+ #endif // Q_WS_X11