SOURCES: kdelibs-branch.diff, kdegraphics-branch.diff - updated

arekm arekm at pld-linux.org
Fri Jan 13 19:47:46 CET 2006


Author: arekm                        Date: Fri Jan 13 18:47:44 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated

---- Files affected:
SOURCES:
   kdelibs-branch.diff (1.20 -> 1.21) , kdegraphics-branch.diff (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SOURCES/kdelibs-branch.diff
diff -u SOURCES/kdelibs-branch.diff:1.20 SOURCES/kdelibs-branch.diff:1.21
--- SOURCES/kdelibs-branch.diff:1.20	Sun Jan  8 23:26:18 2006
+++ SOURCES/kdelibs-branch.diff	Fri Jan 13 19:47:39 2006
@@ -1,7 +1,83 @@
+Index: COMPILING
+===================================================================
+--- COMPILING	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ COMPILING	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
+@@ -1,12 +1,12 @@
+-THIS DOCUMENT DESCRIBES HOW YOU CAN COMPILE KDE WHEN USING CVS
++THIS DOCUMENT DESCRIBES HOW YOU CAN COMPILE KDE WHEN USING SUBVERSION
+ 
+ (If you use source tarballs, you can skip "make -f Makefile.cvs" and
+-should use "make distclean" instead of "make cvs-clean")
++should use "make distclean" instead of "svn-clean")
+ 
+ What you need
+ =============
+ 
+-Make sure you get the following stuff from CVS:
++Make sure you get the following stuff from the repository:
+ 
+ qt-copy (This is qt-3.3.2)
+ arts
+@@ -55,15 +55,6 @@
+ See http://www.kde.org/kde2-and-kde3.html for tips about setting up
+ KDE 3.0 next to KDE 2.x.
+ 
+-Preparing CVS modules
+-=====================
+-All KDE modules require an "admin" sub-directory. You can create it by
+-making a symbolic link from kde-common/admin, make sure to check out the
+-kde-common module.
+-Example:
+-cd kdelibs
+-ln -s ../kde-common/admin
+-
+ Compiling
+ =========
+ 
+@@ -92,19 +83,19 @@
+ some struggle to get QTDIR/KDEDIR setup correctly your setup is actually 
+ correct, but old -incorrect- settings are still lying around.
+ 
+-The best thing to do in such a case is to do a "make cvs-clean". This 
+-removes all files which aren't stored in CVS. You can then start all over 
++The best thing to do in such a case is to do a "svn-clean" (from kdesdk/scripts).
++This removes all files which aren't stored in the repository. You can then start all over 
+ again with "makefile -f Makefile.cvs". Make sure you don't have any important 
+ files lying around in your source tree any more, they will be deleted!
+ 
+ New directories:
+-When a new directory gets added to CVS it usually only contains a 
++When a new directory gets added to the repository it usually only contains a 
+ Makefile.am but not a Makefile. If you try to compile such a directory
+ you will get an error like:
+ 
+   Making all in management
+   make[3]: Entering directory /home/gregturp/KDE/kdelibs/kdeprint/management'
+-  make[3]: *** No rule to make target ll'.  Stop.
++  make[3]: *** No rule to make target all'.  Stop.
+   make[3]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint/management'
+   make[2]: *** [all-recursive] Error 1
+   make[2]: Leaving directory /home/gregturp/KDE/kdelibs/kdeprint'
+@@ -125,13 +116,13 @@
+ and their solution.
+ 
+ If you encounter _LINK_ problems you are probably doing something wrong.
+-Do a "make cvs-clean" and start from scratch, usually this solves the problem.
++Do a "svn-clean" and start from scratch, usually this solves the problem.
+ 
+ If you encounter missing include files, especially if the files start with
+ a 'q', you probably have not setup your QTDIR correct or have the wrong 
+ version of Qt.
+ 
+-If you encounter compile errors after updating from CVS, check whether you 
++If you encounter compile errors after updating from SVN, check whether you 
+ need to update kdelibs as well. If the problems persists, wait a few hours,
+ usually compile errors are fixed shortly after they have been introduced.
+ 
 Index: libkscreensaver/kscreensaver_vroot.h
 ===================================================================
---- libkscreensaver/kscreensaver_vroot.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ libkscreensaver/kscreensaver_vroot.h	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- libkscreensaver/kscreensaver_vroot.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ libkscreensaver/kscreensaver_vroot.h	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -94,15 +94,18 @@
  				Atom actual_type;
  				int actual_format;
@@ -27,8 +103,8 @@
  			}
 Index: interfaces/kscript/sample/shellscript.desktop
 ===================================================================
---- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -14,7 +14,7 @@
  Name[eo]=Baŝoskriptlanĉilo
  Name[es]=Ejecutor de script para intĂŠrprete de comandos de bash
@@ -98,8 +174,8 @@
  Comment[zh_TW]=ć–źç¨‹ĺźĺ
§ĺŸˇčĄŒ bash shell script ćŞ”ćĄˆ
 Index: interfaces/kscript/scriptinterface.desktop
 ===================================================================
---- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/kscript/scriptinterface.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/kscript/scriptinterface.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -17,7 +17,7 @@
  Comment[eo]=Tio estas testprogram-maŝino por testi la programinterfaco.
  Comment[es]=Este es un motor de script genĂŠrico para probar el interfaz de script.
@@ -136,8 +212,8 @@
  Comment[zu]=Lena yinjini yesikripti sokuvivinya sawonke wonke yokuvivinya isikripti somxhumanisi.
 Index: interfaces/kimproxy/interface/dcopinstantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/kimproxy/interface/dcopinstantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -16,7 +16,7 @@
  Comment[eo]=Tujmesaĝilo kun DCOP-interfaco
  Comment[es]=Instant Messenger con un interfaz DCOP
@@ -171,8 +247,8 @@
  Comment[zh_CN]=希 DCOP ćŽĽĺŁçš„ĺłć—śé€ščŽŻç¨‹ĺş
 Index: interfaces/kimproxy/interface/kcm_instantmessenger.desktop
 ===================================================================
---- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/kimproxy/interface/kcm_instantmessenger.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -20,7 +20,6 @@
  Name[is]=Spjallforrit
  Name[it]=Messaggistica istantanea
@@ -216,8 +292,8 @@
  MimeTypeOfInterest=DCOP/InstantMessenger
 Index: interfaces/kspeech/kspeech.h
 ===================================================================
---- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/kspeech/kspeech.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/kspeech/kspeech.h	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -1170,6 +1170,12 @@
          * Re-start %KTTSD.
          */
@@ -233,8 +309,8 @@
      k_dcop_signals:
 Index: interfaces/kspeech/dcoptexttospeech.desktop
 ===================================================================
---- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/kspeech/dcoptexttospeech.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/kspeech/dcoptexttospeech.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -14,7 +14,7 @@
  Comment[el]=ÎĽĎ€ÎˇĎÎľĎƒÎŻÎą κξΚΟένοĎ
-ĎƒÎľ-οΟΚΝίι Οξ Î´ÎšÎąĎƒĎÎ˝Î´ÎľĎƒÎˇ DCOP
  Comment[es]=Texto a servicio de voz con un interfaz DCOP
@@ -266,8 +342,8 @@
  Comment[zh_CN]=希 DCOP ćŽĽĺŁçš„ć–‡ćœŹĺˆ°čŻ­éŸłćœĺŠĄ
 Index: interfaces/ktexteditor/ktexteditoreditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/ktexteditor/ktexteditoreditor.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/ktexteditor/ktexteditoreditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -19,7 +19,7 @@
  Comment[eo]=Interna redaktilo (sen apartigo de dokumento kaj rigardo)
  Comment[es]=Componente incrustable de editor de textos (sin separaciĂłn Doc/Vista)
@@ -295,8 +371,8 @@
  Comment[zu]=Ilunga Lomlungisi Wombhalo (ngaphandle Kokuhlukana kwe-Doc/Umbukiso)
 Index: interfaces/ktexteditor/kcm_ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/ktexteditor/kcm_ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,7 +15,7 @@
  Name[eo]=Interna tekstredaktilo
  Name[es]=Editor de texto empotrable
@@ -367,8 +443,8 @@
  Comment[zu]=Umsebenzi womlungisi wombhalo onikeza imiyaleli ngombukisi wombhalo kanye nomhleli.Abayaleli abanikeza izisebenzi zokulungisa umbhalo okumele zisebenzise lomsebenzi.
 Index: interfaces/ktexteditor/ktexteditor.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/ktexteditor/ktexteditor.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/ktexteditor/ktexteditor.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -19,7 +19,7 @@
  Comment[eo]=Interna redaktilo (kun apartigo de dokumento kaj rigardo)
  Comment[es]=Componente incrustable de editor de textos (con separaciĂłn Doc/Vista)
@@ -396,8 +472,8 @@
  Comment[zu]=IIunga Lomlungisi Wombhalo (Ngokuhlukana kwe-Doc/Umbukiso)
 Index: interfaces/ktexteditor/ktexteditorplugin.desktop
 ===================================================================
---- interfaces/ktexteditor/ktexteditorplugin.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ interfaces/ktexteditor/ktexteditorplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- interfaces/ktexteditor/ktexteditorplugin.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ interfaces/ktexteditor/ktexteditorplugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -21,7 +21,7 @@
  Comment[eo]=Tekstredaktilo kromaÄľo
  Comment[es]=Plugin de KTextEditor
@@ -425,8 +501,8 @@
  Comment[zu]= Ukungena ngaphakathi kwe-KTextEditor
 Index: kmdi/kmdimainfrm.cpp
 ===================================================================
---- kmdi/kmdimainfrm.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kmdi/kmdimainfrm.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kmdi/kmdimainfrm.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kmdi/kmdimainfrm.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -49,6 +49,7 @@
  #include <kdeversion.h>
  #include <qtabwidget.h>
@@ -451,8 +527,8 @@
  	// the MDI view taskbar
 Index: kate/plugins/kdatatool/ktexteditor_kdatatool.desktop
 ===================================================================
---- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/plugins/kdatatool/ktexteditor_kdatatool.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -16,7 +16,7 @@
  Name[eo]=KTextEditor KDataTool KromaÄľo
  Name[es]=Plugin KDataTool de KTextEditor
@@ -514,8 +590,8 @@
  Comment[zu]=Nika amandla amathuluzi edata  anjenge thesaurus kanye nokubheka ukubhalwa kwamagama (uma kufakiwe)
 Index: kate/plugins/insertfile/ktexteditor_insertfile.desktop
 ===================================================================
---- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/plugins/insertfile/ktexteditor_insertfile.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -16,7 +16,7 @@
  Name[eo]=KTextEditor Enmetu-Dosieron-kromaÄľo
  Name[es]=Plugin de inserciĂłn de archivos de KTextEditor
@@ -591,8 +667,8 @@
  ServiceTypes=KTextEditor/Plugin
 Index: kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop
 ===================================================================
---- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/plugins/autobookmarker/ktexteditor_autobookmarker.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -13,7 +13,7 @@
  Name[eo]=KTextEditor AĹ­tomata legosignigilo
  Name[es]=Automarcadores de KTextEditor
@@ -664,8 +740,8 @@
  ServiceTypes=KTextEditor/Plugin
 Index: kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop
 ===================================================================
---- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -12,7 +12,7 @@
  Name[eo]=KTextEditor Vortotutiga kromaÄľo
  Name[es]=Plugin de completado de palabras de KTextEditor
@@ -735,8 +811,8 @@
  ServiceTypes=KTextEditor/Plugin
 Index: kate/plugins/isearch/ktexteditor_isearch.desktop
 ===================================================================
---- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/plugins/isearch/ktexteditor_isearch.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/plugins/isearch/ktexteditor_isearch.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,7 +15,7 @@
  Name[eo]=KTextEditor Iom-post-Ioma-Serĉo-kromaľo
  Name[es]=Plugin de bĂşsqueda incremental de KTextEditor
@@ -798,9 +874,23 @@
  ServiceTypes=KTextEditor/Plugin
 Index: kate/part/kateview.cpp
 ===================================================================
---- kate/part/kateview.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/part/kateview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
-@@ -861,7 +861,7 @@
+--- kate/part/kateview.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/part/kateview.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
+@@ -596,9 +596,12 @@
+                 this, SLOT(keyDelete()),
+                 ac, "delete_next_character");
+ 
+-    new KAction(i18n("Backspace"), Key_Backspace,
++    KAction *a = new KAction(i18n("Backspace"), Key_Backspace,
+                 this, SLOT(backspace()),
+                 ac, "backspace");
++    KShortcut cut = a->shortcut();
++    cut.append( KKey( SHIFT + Key_Backspace ) );
++    a->setShortcut( cut );
+   }
+ 
+   connect( this, SIGNAL(gotFocus(Kate::View*)),
+@@ -861,7 +864,7 @@
    if( res.URLs.isEmpty() || !checkOverwrite( res.URLs.first() ) )
      return SAVE_CANCEL;
  
@@ -811,8 +901,8 @@
      return SAVE_OK;
 Index: kate/part/katedocument.cpp
 ===================================================================
---- kate/part/katedocument.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/part/katedocument.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/part/katedocument.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -2733,6 +2733,7 @@
      // Explicitly call the internal version because we don't want this to look like
      // an external request (and thus have the view not QWidget::scroll()ed.
@@ -831,8 +921,8 @@
    return ret;
 Index: kate/part/kateconfig.cpp
 ===================================================================
---- kate/part/kateconfig.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/part/kateconfig.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/part/kateconfig.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/part/kateconfig.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -161,7 +161,7 @@
  
    setWordWrap (config->readBoolEntry("Word Wrap", false));
@@ -853,8 +943,8 @@
  
 Index: kate/part/kateautoindent.cpp
 ===================================================================
---- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/part/kateautoindent.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/part/kateautoindent.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -344,8 +344,8 @@
  
  uint KateNormalIndent::measureIndent (KateDocCursor &cur) const
@@ -868,8 +958,8 @@
  }
 Index: kate/part/katedialogs.cpp
 ===================================================================
---- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/part/katedialogs.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/part/katedialogs.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -728,8 +728,8 @@
          "Each new bookmark will be added to the bottom, independently from "
          "where it is placed in the document."));
@@ -883,8 +973,8 @@
  
 Index: kate/scripts/jstest.desktop
 ===================================================================
---- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/scripts/jstest.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/scripts/jstest.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -8,6 +8,7 @@
  Name[el]=ÎˆÎťÎľÎłĎ‡ÎżĎ‚ JavaScript Ď„ÎżĎ
 Kate Part
  Name[es]=Prueba JavaScript de Kate Part
@@ -948,8 +1038,8 @@
  X-Kate-Help=<p>Usage: <code>jstest</code></p>
 Index: kate/data/abc.xml
 ===================================================================
---- kate/data/abc.xml	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/data/abc.xml	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/data/abc.xml	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/data/abc.xml	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -1,8 +1,8 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE language SYSTEM "language.dtd">
@@ -1000,8 +1090,8 @@
    <general>
 Index: kate/data/katepart.desktop
 ===================================================================
---- kate/data/katepart.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/data/katepart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/data/katepart.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/data/katepart.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -17,7 +17,7 @@
  Name[eo]=Interna tekstredaktilo
  Name[es]=Editor de texto avanzado empotrable
@@ -1029,8 +1119,8 @@
  Name[zu]=Umlungisi Wezinga Eliphezulu Oshuthekiwe
 Index: kate/data/apache.xml
 ===================================================================
---- kate/data/apache.xml	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/data/apache.xml	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/data/apache.xml	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/data/apache.xml	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -1,9 +1,22 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE language SYSTEM "language.dtd">
@@ -1591,8 +1681,8 @@
 +
 Index: kate/data/cpp.xml
 ===================================================================
---- kate/data/cpp.xml	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kate/data/cpp.xml	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kate/data/cpp.xml	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kate/data/cpp.xml	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -1,6 +1,6 @@
  <?xml version="1.0" encoding="UTF-8"?>
  <!DOCTYPE language SYSTEM "language.dtd">
@@ -1603,8 +1693,8 @@
        <item> asm </item>
 Index: kunittest/runner.cpp
 ===================================================================
---- kunittest/runner.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kunittest/runner.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kunittest/runner.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kunittest/runner.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -224,6 +224,10 @@
          int numXFail = 0;
          int numXPass = 0;
@@ -1684,8 +1774,8 @@
              }
 Index: kunittest/module.h
 ===================================================================
---- kunittest/module.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kunittest/module.h	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kunittest/module.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kunittest/module.h	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -115,6 +115,6 @@
              kunittest_registerModuleTester(fullName.local8Bit(), test);                       \
          }                                                                                     \
@@ -1696,8 +1786,8 @@
  #endif
 Index: kunittest/tester.h
 ===================================================================
---- kunittest/tester.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kunittest/tester.h	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kunittest/tester.h	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kunittest/tester.h	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -338,6 +338,12 @@
   */
  #define CHECK( x, y ) check( __FILE__, __LINE__, #x, x, y, false )
@@ -1713,8 +1803,8 @@
   *
 Index: kdefx/kimageeffect.cpp
 ===================================================================
---- kdefx/kimageeffect.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ kdefx/kimageeffect.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- kdefx/kimageeffect.cpp	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ kdefx/kimageeffect.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -89,12 +89,13 @@
                             0.1140000000000001*qBlue(color))));
  }
@@ -2010,8 +2100,8 @@
 
 Index: doc/common/fdl-notice.html
 ===================================================================
---- doc/common/fdl-notice.html	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ doc/common/fdl-notice.html	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- doc/common/fdl-notice.html	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ doc/common/fdl-notice.html	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -12,4 +12,4 @@
  of the license is included <a href="fdl-license.html">here</a>.</p>
  
@@ -2033,8 +2123,8 @@
 
 Index: doc/common/kde-web.css
 ===================================================================
---- doc/common/kde-web.css	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ doc/common/kde-web.css	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- doc/common/kde-web.css	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ doc/common/kde-web.css	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -175,4 +175,4 @@
                }
  
@@ -2045,7 +2135,7 @@
 Index: doc/kdelibs/man-kbuildsycoca.8.docbook
 ===================================================================
 --- doc/kdelibs/man-kbuildsycoca.8.docbook	(.../tags/KDE/3.5.0/kdelibs)	(revision 0)
-+++ doc/kdelibs/man-kbuildsycoca.8.docbook	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
++++ doc/kdelibs/man-kbuildsycoca.8.docbook	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -0,0 +1,221 @@
 +<?xml version="1.0" ?>
 +<!DOCTYPE refentry PUBLIC "-//KDE//DTD DocBook XML V4.1-Based Variant V1.0//EN" "dtd/kdex.dtd" [
@@ -2280,8 +2370,8 @@
 
 Index: arts/kde/mcop-dcop/kmcop.desktop
 ===================================================================
---- arts/kde/mcop-dcop/kmcop.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ arts/kde/mcop-dcop/kmcop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- arts/kde/mcop-dcop/kmcop.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ arts/kde/mcop-dcop/kmcop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -3,7 +3,6 @@
  Type=Service
  Name=KMCOP
@@ -2317,8 +2407,8 @@
  Comment[zu]=Ibhulogo le-KDE MCOP-DCOP
 Index: arts/knotify/knotify.desktop
 ===================================================================
---- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- arts/knotify/knotify.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ arts/knotify/knotify.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -9,7 +9,6 @@
  Name[eo]=Atentigilo
  Name[fo]=KÁminning
@@ -2362,8 +2452,8 @@
  Comment[zu]=Isaziso se-Daemon ye-KDE
 Index: mimetypes/uri/pnm.desktop
 ===================================================================
---- mimetypes/uri/pnm.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/uri/pnm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/uri/pnm.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/uri/pnm.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,9 +15,9 @@
  Comment[hu]=pnm: URI-k
  Comment[is]=pnm: slóðir
@@ -2383,8 +2473,8 @@
  Comment[zh_CN]=pnm: URI
 Index: mimetypes/uri/mms.desktop
 ===================================================================
---- mimetypes/uri/mms.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/uri/mms.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/uri/mms.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/uri/mms.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,9 +15,9 @@
  Comment[hu]=mms: URI-k
  Comment[is]=mms: slóðir
@@ -2404,8 +2494,8 @@
  Comment[zh_CN]=mms: URI
 Index: mimetypes/uri/rtspt.desktop
 ===================================================================
---- mimetypes/uri/rtspt.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/uri/rtspt.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/uri/rtspt.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/uri/rtspt.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,9 +15,9 @@
  Comment[hu]=rtspt: URI-k
  Comment[is]=rtspt: slóðir
@@ -2425,8 +2515,8 @@
  Comment[zh_CN]=rtspt: URI
 Index: mimetypes/uri/rtspu.desktop
 ===================================================================
---- mimetypes/uri/rtspu.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/uri/rtspu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/uri/rtspu.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/uri/rtspu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,9 +15,9 @@
  Comment[hu]=rtspu: URI-k
  Comment[is]=rtspu: slóðir
@@ -2446,8 +2536,8 @@
  Comment[zh_CN]=rtspu: URI
 Index: mimetypes/uri/mmst.desktop
 ===================================================================
---- mimetypes/uri/mmst.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/uri/mmst.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/uri/mmst.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/uri/mmst.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,9 +15,9 @@
  Comment[hu]=mmst: URI-k
  Comment[is]=mmst: slóðir
@@ -2467,8 +2557,8 @@
  Comment[zh_CN]=mmst: URI
 Index: mimetypes/uri/mmsu.desktop
 ===================================================================
---- mimetypes/uri/mmsu.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/uri/mmsu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/uri/mmsu.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/uri/mmsu.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -15,9 +15,9 @@
  Comment[hu]=mmsu: URI-k
  Comment[is]=mmsu: slóðir
@@ -2488,8 +2578,8 @@
  Comment[zh_CN]=mmsu: URI
 Index: mimetypes/all.desktop
 ===================================================================
---- mimetypes/all.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/all.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/all.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/all.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -34,7 +34,6 @@
  Comment[is]=Allar skrĂĄr og mĂśppur
  Comment[it]=Tutti i file e le cartelle
@@ -2516,8 +2606,8 @@
  Comment[zh_TW]=ć‰€ćœ‰çš„ćŞ”ćĄˆčˆ‡ç›ŽéŒ„ç›ŽéŒ„
 Index: mimetypes/model/vrml.desktop
 ===================================================================
---- mimetypes/model/vrml.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/model/vrml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/model/vrml.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/model/vrml.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -33,7 +33,6 @@
  Comment[is]=VRML eining
  Comment[it]=Modello VRML
@@ -2536,8 +2626,8 @@
  Patterns=*.wrl;*.wrl.gz
 Index: mimetypes/audio/x-oggflac.desktop
 ===================================================================
---- mimetypes/audio/x-oggflac.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/audio/x-oggflac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/audio/x-oggflac.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/audio/x-oggflac.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
 @@ -34,7 +34,6 @@
  Comment[is]=Ogg FLAC hljóðskrå
  Comment[it]=Audio Ogg FLAC
@@ -2555,8 +2645,8 @@
  Comment[zh_TW]=Ogg FLAC č˛éŸł
 Index: mimetypes/audio/vnd.rn-realaudio.desktop
 ===================================================================
---- mimetypes/audio/vnd.rn-realaudio.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 495786)
-+++ mimetypes/audio/vnd.rn-realaudio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 495786)
+--- mimetypes/audio/vnd.rn-realaudio.desktop	(.../tags/KDE/3.5.0/kdelibs)	(revision 497739)
++++ mimetypes/audio/vnd.rn-realaudio.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 497739)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/kdelibs-branch.diff?r1=1.20&r2=1.21&f=u
    http://cvs.pld-linux.org/SOURCES/kdegraphics-branch.diff?r1=1.10&r2=1.11&f=u



More information about the pld-cvs-commit mailing list