[Pkg-kde-commits] rev 1464 - in branches/kde-3.4.0/packages/kdelibs/debian: . patches

Christopher Martin chrsmrtn-guest at costa.debian.org
Tue Aug 16 15:25:19 UTC 2005 

Author: chrsmrtn-guest
Date: 2005-08-16 15:25:18 +0000 (Tue, 16 Aug 2005)
New Revision: 1464

Added:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r449719.diff
Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/changelog
   branches/kde-3.4.0/packages/kdelibs/debian/control
Log:
New branch.diff for kdelibs. Sync kdelibs4-dev' deps
with kdelibs's build-deps, and get the changelog
ready for release.


Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-16 14:57:49 UTC (rev 1463)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog	2005-08-16 15:25:18 UTC (rev 1464)
@@ -1,8 +1,9 @@
-kdelibs (4:3.4.2-1) UNRELEASED; urgency=low
+kdelibs (4:3.4.2-1) unstable; urgency=low
 
   * New upstream release. Includes a forward declaration of KXMLGUIClient in
     kactioncollection.h, which makes gcc-4.0 happy and thus closes: #317543,
-    #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS). 
+    #318017, #319154, #323093 (arson, smb4k, kile and amarok FTBFS).
+  * KDE_3_4_BRANCH update.
 
   +++ Changes by Christopher Martin:
   
@@ -20,7 +21,7 @@
   * Remove obsolete conflicts/replaces relationships against packages/versions
     not present in Sarge.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon,  6 Jun 2005 13:04:22 -0400
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 16 Aug 2005 11:16:00 -0400
  
 kdelibs (4:3.4.1-1) experimental; urgency=low
 

Modified: branches/kde-3.4.0/packages/kdelibs/debian/control
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-16 14:57:49 UTC (rev 1463)
+++ branches/kde-3.4.0/packages/kdelibs/debian/control	2005-08-16 15:25:18 UTC (rev 1464)
@@ -66,7 +66,7 @@
 Package: kdelibs4-dev
 Section: libdevel
 Architecture: any
-Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev, libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.1), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
+Depends: kdelibs4c2 (= ${Source-Version}), kdelibs-bin (= ${Source-Version}), libart-2.0-dev (>= 2.3.17), libarts1-dev (>= 1.4.2), libasound2-dev, libaspell-dev, libbz2-dev, libcupsys2-dev, libfam-dev (>= 2.7.0-7.1), libidn11-dev, libjasper-1.701-dev, libkrb5-dev, libopenexr-dev (>= 1.2.2-3), libpcre3-dev, libqt3-mt-dev (>= 3:3.3.4-4), libsasl2-dev, libssl-dev, libtiff4-dev (>= 3.7.3-1), libxml2-dev, libxml2-utils, libxslt1-dev
 Provides: kdelibs-dev
 Replaces: kdebase-dev (<< 4:3.4.0)
 Description: development files for the KDE core libraries

Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r449719.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r449719.diff	2005-08-16 14:57:49 UTC (rev 1463)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r449719.diff	2005-08-16 15:25:18 UTC (rev 1464)
@@ -0,0 +1,215 @@
+#DPATCHLEVEL=0
+--- libkscreensaver/kscreensaver.cpp	(revision 438047)
++++ libkscreensaver/kscreensaver.cpp	(revision 449719)
+@@ -65,6 +65,7 @@
+     if ( w == 0 ) w = 600;
+     if ( h == 0 ) h = 420;
+     resize( w, h );
++    KApplication::sendPostedEvents();
+     show();
+ }
+ 
+@@ -76,10 +77,12 @@
+ 
+ void KScreenSaver::embed( QWidget *w )
+ {
++    KApplication::sendPostedEvents();
+ #ifdef Q_WS_X11 //FIXME
+     XReparentWindow(qt_xdisplay(), w->winId(), winId(), 0, 0);
+ #endif
+-    w->resize( width(), height() );
++    w->setGeometry( 0, 0, width(), height() );
++    KApplication::sendPostedEvents();
+ }
+ 
+ bool KScreenSaver::eventFilter( QObject *o, QEvent *e )
+--- kate/part/katesearch.cpp	(revision 438047)
++++ kate/part/katesearch.cpp	(revision 449719)
+@@ -130,6 +130,7 @@
+   searchFlags.replace = false;
+   searchFlags.finished = false;
+   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
++  searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
+ 
+   if ( searchFlags.selected )
+   {
+@@ -225,6 +226,7 @@
+   searchFlags.replace = false;
+   searchFlags.finished = false;
+   searchFlags.regExp = KateViewConfig::global()->searchFlags() & KFindDialog::RegularExpression;
++  searchFlags.useBackRefs = KateViewConfig::global()->searchFlags() & KReplaceDialog::BackReference;
+ 
+   searchFlags.backward = searchFlags.backward != back;
+   searchFlags.fromBeginning = false;
+--- mimetypes/audio/x-scpls.desktop	(revision 438047)
++++ mimetypes/audio/x-scpls.desktop	(revision 449719)
+@@ -31,7 +31,7 @@
+ Comment[hu]=MP3 ShoutCast-lejátszási lista
+ Comment[id]=Playlist MP3 ShoutCast
+ Comment[is]=Mp3 ShoutCast lagalisti
+-Comment[it]=Playlist MP3 ShoutCast
++Comment[it]=Scaletta MP3 ShoutCast
+ Comment[ja]=MP3 ShoutCast プレイリスト
+ Comment[ko]=MP3 샤우트캐스트 연주 목록
+ Comment[lt]=MP3 ShoutCast gaidaraštis
+--- mimetypes/application/x-gettext.desktop	(revision 438047)
++++ mimetypes/application/x-gettext.desktop	(revision 449719)
+@@ -6,6 +6,7 @@
+ Comment[az]=GNU Gettext İsmarış Kataloqu
+ Comment[bg]=Съобщения за превод (GNU Gettext)
+ Comment[bn]=গনিউ গেট-টেক্সট বার্তা ক্যাটালগ
++Comment[br]=Katalog ar c'hemennadoù GNU Gettext
+ Comment[bs]=GNU Gettext katalog poruka
+ Comment[ca]=Catàleg de missatges Gettext de GNU
+ Comment[cs]=Katalog zpráv (Gettext)
+--- kioslave/file/file.cc	(revision 438047)
++++ kioslave/file/file.cc	(revision 449719)
+@@ -1445,7 +1445,7 @@
+     QString pmountProg = KGlobal::dirs()->findExe("pmount", path);
+ 
+     if (pmountProg.isEmpty())
+-        pmountProg = "pmount";
++        return false;
+ 
+     QCString buffer;
+     buffer.sprintf( "%s %s", QFile::encodeName(pmountProg).data(),
+--- kio/kio/kmimemagic.cpp	(revision 438047)
++++ kio/kio/kmimemagic.cpp	(revision 449719)
+@@ -2262,6 +2262,15 @@
+ 			tmp += "src";
+ 		r->setMimeType(tmp);
+ 	}
++	else
++	if ( tmp == "application/x-sharedlib" )
++	{
++		if ( _filename.find( ".so" ) == -1 ) 
++		{
++			tmp = "application/x-executable";
++			r->setMimeType( tmp );
++		}
++	}
+ }
+ 
+ KMimeMagicResult *
+--- kio/misc/kpac/eventsrc	(revision 438047)
++++ kio/misc/kpac/eventsrc	(revision 449719)
+@@ -77,7 +77,7 @@
+ Name[cy]=Sgript dirprwy annilys
+ Name[da]=Ugyldigt proxy-script
+ Name[de]=Ungültiges Proxy-Skript
+-Name[el]=Άκυρο σενάριο διαμεσολαβητή
++Name[el]=Μη έγκυρο σενάριο διαμεσολαβητή
+ Name[eo]=Nevalida prokurila skripto
+ Name[es]=Procedimiento inválido del proxy
+ Name[et]=Vigane proxy skript
+@@ -137,7 +137,7 @@
+ Comment[cy]=Mae'r sgript ffurfweddu'r dirprwy a chafodd ei lawrlwytho yn annilys
+ Comment[da]=Det downloadede proxy-indstillingsscript er ugyldigt
+ Comment[de]=Das heruntergeladene Proxy-Einrichtungsskript ist nicht verwendbar
+-Comment[el]=Το κατεβασμένο σενάριο ρύθμισης διαμεσολαβητή είναι άκυρο
++Comment[el]=Το κατεβασμένο σενάριο ρύθμισης διαμεσολαβητή δεν είναι έγκυρο
+ Comment[eo]=La ŝarĝita prokuragordoskript estas nevalida
+ Comment[es]=El procedimiento descargado para la configuración del proxy es inválido
+ Comment[et]=Alla laaditud proxy seadistuse skript on vigane
+--- khtml/ecma/kjs_events.cpp	(revision 438047)
++++ khtml/ecma/kjs_events.cpp	(revision 449719)
+@@ -635,6 +635,9 @@
+     return Boolean(static_cast<DOM::MouseEvent>(event).metaKey());
+   case Button:
+   {
++    if ( exec->interpreter()->compatMode() == Interpreter::NetscapeCompat ) {
++        return Number(static_cast<DOM::MouseEvent>(event).button());
++    }
+     // Tricky. The DOM (and khtml) use 0 for LMB, 1 for MMB and 2 for RMB
+     // but MSIE uses 1=LMB, 2=RMB, 4=MMB, as a bitfield
+     int domButton = static_cast<DOM::MouseEvent>(event).button();
+--- kresources/kresources.desktop	(revision 438047)
++++ kresources/kresources.desktop	(revision 449719)
+@@ -14,6 +14,7 @@
+ Name[af]=KDE Hulpbronne
+ Name[bg]=Системни ресурси
+ Name[bn]=কে.ডি.ই রিসোর্সসমূহ
++Name[br]=Danvezioù KDE
+ Name[bs]=KDE resursi
+ Name[ca]=Recursos KDE
+ Name[cs]=Zdroje KDE
+@@ -56,6 +57,7 @@
+ Comment[be]=Настроіць рэсурсы KDE
+ Comment[bg]=Настройки на системните ресурсите
+ Comment[bn]=কে.ডি.ই. রিসোর্সসমূহ কনফিগার করো
++Comment[br]=Kefluniañ danvezioù KDE
+ Comment[bs]=Podesite KDE resurse
+ Comment[ca]=Configura els recursos KDE
+ Comment[cs]=Nastavení zdrojů KDE
+--- dcop/dcopsignals.cpp	(revision 438047)
++++ dcop/dcopsignals.cpp	(revision 449719)
+@@ -154,7 +154,7 @@
+ 
+    list->append( current );
+    conn->signalConnectionList()->append(current);
+-   if (senderConn)
++   if (senderConn && senderConn != conn)
+       senderConn->signalConnectionList()->append(current);
+    return true;
+ #else //!Q_OS_UNIX
+--- configure.in.in	(revision 438047)
++++ configure.in.in	(revision 449719)
+@@ -26,7 +26,6 @@
+ 
+ dnl Checks for programs.
+ AC_CHECK_COMPILERS
+-KDE_ENABLE_HIDDEN_VISIBILITY
+ AC_LIBLTDL_CONVENIENCE
+ 
+ AC_ENABLE_SHARED(yes)
+@@ -59,6 +58,8 @@
+ 
+ dnl Checks for libraries etc
+ AC_BASE_PATH_KDE([don't test]) dnl kdelibs is a special case
++KDE_ENABLE_HIDDEN_VISIBILITY
++
+ AC_CREATE_KFSSTND(default)
+ AC_SUBST_KFSSTND
+ 
+--- kdeui/ksyntaxhighlighter.cpp	(revision 438047)
++++ kdeui/ksyntaxhighlighter.cpp	(revision 449719)
+@@ -102,6 +102,7 @@
+     int wordCount, errorCount;
+     int checksRequested, checksDone;
+     int disablePercentage;
++    int disableWordCount;
+     bool completeRehighlightRequired;
+     bool active, automatic, autoReady;
+     bool globalConfig, spellReady;
+@@ -293,6 +294,7 @@
+     KConfigGroupSaver cs( config, "KSpell" );
+     d->disablePercentage = config->readNumEntry( "KSpell_AsYouTypeDisablePercentage", 42 );
+     d->disablePercentage = QMIN( d->disablePercentage, 101 );
++    d->disableWordCount = config->readNumEntry( "KSpell_AsYouTypeDisableWordCount", 100 );
+ 
+     textEdit->installEventFilter( this );
+     textEdit->viewport()->installEventFilter( this );
+@@ -565,7 +567,7 @@
+ 
+     if ( d->automatic ) {
+ 	// tme = Too many errors
+-	bool tme = d->errorCount * 100 >= d->disablePercentage * d->wordCount;
++	bool tme = d->wordCount >= d->disableWordCount && d->errorCount * 100 >= d->disablePercentage * d->wordCount;
+ 	if ( d->active && tme )
+ 	    d->active = false;
+ 	else if ( !d->active && !tme )
+--- kdeui/klistview.cpp	(revision 438047)
++++ kdeui/klistview.cpp	(revision 449719)
+@@ -369,10 +369,10 @@
+         QListViewItem *i=item;
+         col=0;
+         item=0;
+-        hide(); // will call focusOutEvent, that's why we set item=0 before
++        p->setFocus();// will call focusOutEvent, that's why we set item=0 before
++        hide();
+         if (commit)
+             emit done(i,c);
+-        i->listView()->setFocus();
+     }
+ }
+

More information about the Pkg-kde-commits mailing list