[Pkg-kde-commits] rev 1966 - branches/kde-3.4.0/packages/kdebase/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Oct 15 17:56:16 UTC 2005


Author: chrsmrtn
Date: 2005-10-15 17:56:14 +0000 (Sat, 15 Oct 2005)
New Revision: 1966

Added:
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r470887.diff
Removed:
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r438047.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r452311.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r456201.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457706.diff
   branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r458655.diff
Log:
kdebase branch updates.


Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r438047.diff

Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r452311.diff

Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r456201.diff

Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r457706.diff

Deleted: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r458655.diff

Added: branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r470887.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r470887.diff	2005-10-15 17:53:07 UTC (rev 1965)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/01_kdebase_branch_r470887.diff	2005-10-15 17:56:14 UTC (rev 1966)
@@ -0,0 +1,198 @@
+#DPATCHLEVEL=0
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/voila.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -11,3 +11,4 @@
+ ServiceTypes=SearchProvider
+ Keys=voila
+ Query=http://search.ke.voila.fr/S/voila?lg=fr&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}
++Query[es]=http://search.ke.voila.fr/S/voila?lg=es&profil=geeks&rtype=kw&bhv=web_mondial&rdata=\\{@}
+--- kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kcontrol/ebrowsing/plugins/ikws/searchproviders/whatis.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -50,3 +50,4 @@
+ ServiceTypes=SearchProvider
+ Keys=wi,whatis
+ Query=http://whatis.techtarget.com/wsearchResults/1,290214,,00.html?query=\\{@}
++Query[pl]=http://whatis.techtarget.com/definitionsSearchResults/1,289878,sid9,00.html?query=\\{@}
+--- kioslave/fish/fish.protocol	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kioslave/fish/fish.protocol	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -14,6 +14,7 @@
+ Description=A kioslave for the FISH protocol
+ Description[af]='n KIOslaaf vir die FISH protokol
+ Description[bn]=ফিশ (FISH) প্রোটোকল-এর জন্য একটি kioslave
++Description[br]=Ur c'hioslave evit ar c'homenad FISH
+ Description[bs]=kioslave za FISH protokol
+ Description[ca]=Un kioslave pel protocol FISH
+ Description[cs]=Pomocný protokol FISH
+--- kioslave/mac/mac.protocol	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kioslave/mac/mac.protocol	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -9,6 +9,7 @@
+ Description=A kioslave for MacOS HFS+ partitions
+ Description[af]='n KIOslaaf vir MacOS HFS+ partisies
+ Description[bn]=ম্যাক-ও-এস HFS+ পার্টিশন-এর জন্য একটি kioslave
++Description[br]=Ur c'hioslave evit ar parzhadurioù MacOS HFS+
+ Description[bs]=kioslave za MacOS HFS+ particije
+ Description[ca]=Un kioslave per a particions MacOS HFS+
+ Description[cs]=Pomocný protokol pro diskové oddíly MacOS HFS+
+--- kioslave/sftp/sftp.protocol	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kioslave/sftp/sftp.protocol	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -15,6 +15,7 @@
+ Description=A kioslave for sftp
+ Description[af]='n Kioslave vir sftp
+ Description[bn]=এস.এফ.টি.পি-র জন্য একটি kioslave
++Description[br]=Ur kioslave evit sftp
+ Description[bs]=kioslave za SFTP
+ Description[ca]=Un kioslave per a sftp
+ Description[cs]=Protokol KDE pro sftp
+--- kappfinder/apps/Development/linguist.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kappfinder/apps/Development/linguist.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -46,6 +46,7 @@
+ GenericName[ar]=أداة للترجمة
+ GenericName[az]=Tərcümə Vasitəsi
+ GenericName[bn]=অনুবাদ টুল
++GenericName[br]=Ostilh troidigezh
+ GenericName[bs]=Alat za prevođenje
+ GenericName[ca]=Eina de traducció
+ GenericName[cs]=Překladatelský nástroj
+--- kappfinder/apps/Development/pose.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kappfinder/apps/Development/pose.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -5,6 +5,7 @@
+ GenericName[ar]=محاكي بالم/لاسلكي
+ GenericName[az]=Palm/Wireless Emulyatoru
+ GenericName[bn]=পাম (Palm) / বেতার (Wireless) এমুলেটর
++GenericName[br]=Kendarvanerezh Palm/Wireless
+ GenericName[bs]=Palm/Wireless simulator
+ GenericName[ca]=Emulador Palm/Wireless
+ GenericName[cs]=Emulátor Palm/Wireless
+--- kappfinder/apps/Games/GTali.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kappfinder/apps/Games/GTali.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -15,6 +15,7 @@
+ GenericName[az]=Zər Oyunu
+ GenericName[bg]=Игра със зарове
+ GenericName[bn]=ছক্কার খেলা
++GenericName[br]=C'hoari diñs
+ GenericName[bs]=Igra s kockama
+ GenericName[ca]=Joc de dades
+ GenericName[cs]=Kostky
+--- kappfinder/apps/Games/penguin-command.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kappfinder/apps/Games/penguin-command.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -5,6 +5,7 @@
+ Name[af]=Pikkewyn Opdrag
+ Name[ar]=بينجوين كوماند
+ Name[bn]=পেঙ্গুইন কমান্ড
++Name[br]=Urzhiad penn-gwenn
+ Name[ca]=Comand Pingüí
+ Name[cy]=Rheolaeth Pengwyn
+ Name[da]=Pingvin-kommando
+--- kappfinder/apps/Games/TacticStrategy/freecivserver.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kappfinder/apps/Games/TacticStrategy/freecivserver.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -72,6 +72,7 @@
+ Comment[be]=Сэрвэр для свабоднай Цывілізацыі
+ Comment[bg]=Сървър за играта цивилизация
+ Comment[bn]=ফ্রীসিভ-এর জন্য সার্ভার 
++Comment[br]=Ur servijer evit Free Civ
+ Comment[bs]=Server za Free Civ
+ Comment[ca]=Un servidor per a Free Civ
+ Comment[cs]=Server pro FreeCiv
+--- kappfinder/apps/Games/Emulators/qmamecat.desktop	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kappfinder/apps/Games/Emulators/qmamecat.desktop	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -5,6 +5,7 @@
+ GenericName[ar]=محاكي أركيد
+ GenericName[az]=Arcade Emulyatoru
+ GenericName[bn]=আর্কেড এমুলেটর
++GenericName[br]=Kendarvanerezh tavarn
+ GenericName[bs]=Simulator arkada
+ GenericName[ca]=Emulador arcade
+ GenericName[cs]=Arkádový emulátor
+--- kdesktop/lock/lockprocess.cc	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kdesktop/lock/lockprocess.cc	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -45,6 +45,7 @@
+ #include <qfile.h>
+ #include <qsocketnotifier.h>
+ #include <qvaluevector.h>
++#include <qtooltip.h>
+ 
+ #include <qdatetime.h>
+ 
+@@ -119,6 +120,10 @@
+                         qt_xscreen()), &rootAttr);
+     mRootWidth = rootAttr.width;
+     mRootHeight = rootAttr.height;
++    { // trigger creation of QToolTipManager, it does XSelectInput() on the root window
++    QWidget w;
++    QToolTip::add( &w, "foo" );
++    }
+     XSelectInput( qt_xdisplay(), qt_xrootwin(),
+         SubstructureNotifyMask | rootAttr.your_event_mask );
+ 
+@@ -857,7 +862,19 @@
+     killTimer(mAutoLogoutTimerId);
+     PasswordDlg passDlg( this, &greetPlugin);
+ 
+-    return execDialog( &passDlg ) == QDialog::Accepted;
++    int ret = execDialog( &passDlg );
++
++    XWindowAttributes rootAttr;
++    XGetWindowAttributes(qt_xdisplay(), RootWindow(qt_xdisplay(),
++                        qt_xscreen()), &rootAttr);
++    if(( rootAttr.your_event_mask & SubstructureNotifyMask ) == 0 )
++    {
++        kdWarning() << "ERROR: Something removed SubstructureNotifyMask from the root window!!!" << endl;
++        XSelectInput( qt_xdisplay(), qt_xrootwin(),
++            SubstructureNotifyMask | rootAttr.your_event_mask );
++    }
++
++    return ret == QDialog::Accepted;
+ }
+ 
+ static void fakeFocusIn( WId window )
+--- applnk/kde-games-strategy.directory	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ applnk/kde-games-strategy.directory	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -8,6 +8,7 @@
+ Name[be]=Тактыка і стратэгія
+ Name[bg]=Стратегически игри
+ Name[bn]=কৌশল এবং পরিকল্পনা
++Name[br]=Brezelekaouriezh ha kadouriezh
+ Name[bs]=Taktika i strategija
+ Name[ca]=Tàctiques i estratègia
+ Name[cs]=Taktické a strategické
+--- drkonqi/presets/enduserrc	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ drkonqi/presets/enduserrc	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -237,7 +237,7 @@
+ Name[cy]=Efallai y dymunwch yrru adroddiad o'r nam i'r awdur. Cywirwch os mae o wedi'i restru ar http://bugs.kde.org, neu anfonwch ebost i'r awdur.  Ceisiwch gynnwys cyn gymaint o wybodaeth â phosibl, ac efallai'r dogfennau gwreiddiol. Os oes modd i chi ail-greu'r gwall, cynhwyswch hwn hefyd.
+ Name[da]=Måske har du lyst til at sende en fejlrapport om dette program. Tjek om fejlen allerede er der på  listen ihttp://bugs.kde.org, skriv ellers til forfatteren. Husk at inkludere så meget information som muligt, måske de oprindelige dokumenter. Hvis du er i stand til at reproducere fejlen, så husk også at nævne dette.
+ Name[de]=Vielleicht möchten Sie einen Problembericht (Bug Report) für dieses Programm erstellen? Bitte überprüfen Sie in diesem Fall, ob es unter http://bugs.kde.org aufgeführt ist, sonst schreiben Sie bitte eine Mail an den Autor (im Zweifelsfall auf Englisch). Geben Sie so viele Informationen wie möglich, die zur Reproduktion des Problems beitragen können, evtl. einschließlich der Dokumente, bei denen es auftritt.
+-Name[el]=Ίσως θέλετε να στείλετε μια αναφορά σφάλματος γι' αυτήν την εφαρμογή. Ελέγξτε εάν είναι καταχωρημένη στο http://bugs.kde.org αλλιώς στείλετε email στο συγγραφέα. Παρακαλώ συμπεριλάβετε τη μέγιστη δυνατή πληροφορία, ίσως και τα αυθεντικά έγγραφα. Εάν έχετε κάποιον τρόπο να αναπαραχθεί το σφάλμα, συμπεριλάβετέ τον.
++Name[el]=Ίσως θέλετε να στείλετε μια αναφορά σφάλματος γι' αυτήν την εφαρμογή. Ελέγξτε εάν είναι καταχωρημένη στο http://bugs.kde.org αλλιώς στείλετε email στο συγγραφέα. Παρακαλούμε συμπεριλάβετε τη μέγιστη δυνατή πληροφορία, ίσως και τα αυθεντικά έγγραφα. Εάν έχετε κάποιον τρόπο να αναπαραχθεί το σφάλμα, συμπεριλάβετέ τον.
+ Name[eo]=Vi povus sendi eraroraporton pri ĉi tiu aplikaĵo. Kontrolu ĉu la listo ĉe http://bugs.kde.org jam enhavas ĝin, alie sendu retpoŝton al la aŭtoro. Bonvolu kunsendi tiom da informoj, kiom eblas, laŭeble la originalajn dokumentojn. Se vi trovis manieron reprodukti la eraron, bonvolu krome aldoni ĝin.
+ Name[es]=Puede que quiera enviar un informe de fallos de esta aplicación. Por favor, compruebe si aparece en http://bugs.kde.org, si no, envíe un mensaje al autor. Por favor, incluya tanta información como pueda, tal vez incluso los documentos originales. Si hay una forma de reproducir el error, inclúyala también.
+ Name[et]=Kui soovid rakenduse kohta veateadet saata, kontrolli kõigepealt, ega sellest ei tea juba http://bugs.kde.org. Kui mitte, saada veateade autorile ja lisa palun nii palju infot, kui võimalik. Kui võimalik, siis ka originaaldokumendid. Kui tead, kuidas viga korrata, siis lisa ka see info.
+--- kdm/backend/xdmcp.c	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kdm/backend/xdmcp.c	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -940,7 +940,12 @@
+ 			}
+ 			DisposeProtoDisplay( pdpy );
+ 			Debug( "starting display %s,%s\n", d->name, d->class2 );
+-			StartDisplay( d );
++			if (LoadDisplayResources( d ) < 0) {
++				LogError( "Unable to read configuration for display %s; "
++				          "stopping it.\n", d->name );
++				StopDisplay( d );
++			} else
++				StartDisplay( d );
+ 			CloseGetter();
+ 		}
+ 	}
+--- kdm/kfrontend/kgreeter.cpp	(.../tags/KDE/3.4.3/kdebase)	(revision 470887)
++++ kdm/kfrontend/kgreeter.cpp	(.../branches/KDE/3.4/kdebase)	(revision 470887)
+@@ -378,7 +378,10 @@
+ 		userView->clearSelection();
+ 	}
+   oke:
+-	QTimer::singleShot( 0, this, SLOT(slotLoadPrevWM()) );
++	if (isVisible())
++		slotLoadPrevWM();
++	else
++		QTimer::singleShot( 0, this, SLOT(slotLoadPrevWM()) );
+ }
+ 
+ void




More information about the pkg-kde-commits mailing list