rev 4231 - trunk/packages/kdelibs/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sat Jul 29 19:39:53 UTC 2006 

Author: chrsmrtn
Date: 2006-07-29 19:39:52 +0000 (Sat, 29 Jul 2006)
New Revision: 4231

Added:
   trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r567679.diff
Log:
While we're at it, do a mini branch pull.


Added: trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r567679.diff
===================================================================
--- trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r567679.diff	2006-07-29 19:39:22 UTC (rev 4230)
+++ trunk/packages/kdelibs/debian/patches/01_kdelibs_branch_r567679.diff	2006-07-29 19:39:52 UTC (rev 4231)
@@ -0,0 +1,366 @@
+#DPATCHLEVEL=0
+--- interfaces/kscript/sample/shellscript.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ interfaces/kscript/sample/shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -46,7 +46,7 @@
+ Name[ro]=Executor scripturi de interpretor
+ Name[ru]=Запуск скриптов bash
+ Name[rw]=Mutangiza Gaporogaramu Bash Shell
+-Name[se]=Skálžu skripta
++Name[se]=Skálžu-skriptavuodji
+ Name[sk]=Spustenie Bash shell skriptu
+ Name[sl]=Zaganjalnik lupinski skriptov
+ Name[sq]=Egzekutuesi i skriptave të Guacës Bash
+--- kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kate/plugins/wordcompletion/ktexteditor_docwordcompletion.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -43,7 +43,7 @@
+ Name[ro]=Modul completare cuvinte pentru KTextEditor
+ Name[ru]=Модуль автодополнения слов KTextEditor
+ Name[rw]=Icomeka ry'Iyuzuza Jambo rya KMuhinduziUmwandiko
+-Name[se]=KTextEditor:a sátneollašuhttin lassemoduvla
++Name[se]=KTextEditor:a sátneollašuhttinlassemoduvla
+ Name[sk]=Modul pre doplnenie slov pre KTextEditor
+ Name[sl]=Vstavek KTextEditor za dopolnjevanje besed
+ Name[sr]=KTextEditor прикључак за довршавање речи
+--- kate/part/kateviewinternal.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kate/part/kateviewinternal.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -2682,8 +2682,6 @@
+           selStartCached = m_view->selectStart;
+           selEndCached = m_view->selectEnd;
+ 
+-          cursor.setCol(0);
+-          updateCursor( cursor, true );
+           e->accept ();
+           return;
+         }
+@@ -2746,6 +2744,11 @@
+         selectAnchor = KateTextCursor (m_view->selEndLine(), m_view->selEndCol());
+         selStartCached = m_view->selectStart;
+         selEndCached = m_view->selectEnd;
++
++        // if we didn't actually select anything, restore the selection mode
++        // -- see bug #131369 (kling)
++        if (!m_view->hasSelection())
++          m_selectionMode = Default;
+       }
+ 
+       // Move cursor to end of selected word
+@@ -2755,9 +2758,6 @@
+         m_view->copy();
+         QApplication::clipboard()->setSelectionMode( false );
+ 
+-        cursor.setPos(m_view->selectEnd);
+-        updateCursor( cursor, true );
+-
+         selStartCached = m_view->selectStart;
+         selEndCached = m_view->selectEnd;
+       }
+--- kate/data/cpp.xml	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kate/data/cpp.xml	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+ <!DOCTYPE language SYSTEM "language.dtd">
+-<language name="C++" version="1.36" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
++<language name="C++" version="1.37" kateversion="2.4" section="Sources" extensions="*.c++;*.cxx;*.cpp;*.cc;*.C;*.h;*.H;*.h++;*.hxx;*.hpp;*.hcc;*.moc" mimetype="text/x-c++src;text/x-c++hdr;text/x-chdr" priority="9">
+   <highlighting>
+     <list name="keywords">
+       <item> asm </item>
+@@ -88,6 +88,7 @@
+       <item> Q_CLEANUP_RESOURCE </item>
+       <item> Q_GLOBAL_STATIC </item>
+       <item> Q_GLOBAL_STATIC_WITH_ARGS </item>
++      <item> Q_DECLARE_INTERFACE </item>
+       <item> Q_DECLARE_TYPEINFO </item>
+       <item> Q_DECLARE_SHARED </item>
+       <item> Q_DECLARE_FLAGS </item>
+--- kdefx/kcpuinfo.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kdefx/kcpuinfo.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -35,14 +35,6 @@
+ #  define HAVE_GNU_INLINE_ASM
+ #endif
+ 
+-
+-// Copied from kdecore/kdemacros.h
+-#if __GNUC__ - 0 > 3 || (__GNUC__ - 0 == 3 && __GNUC_MINOR__ - 0 > 4)
+-#  define KDE_NO_EXPORT __attribute__ ((visibility("hidden")))
+-#else
+-#  define KDE_NO_EXPORT
+-#endif
+-
+ typedef void (*kde_sighandler_t) (int);
+ 
+ #ifdef __i386__
+@@ -72,7 +64,7 @@
+ 
+ static int getCpuFeatures()
+ {
+-    int features = 0;
++    volatile int features = 0;
+ 
+ #if defined( HAVE_GNU_INLINE_ASM )
+ #if defined( __i386__ )
+--- mimetypes/image/x-raw.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/image/x-raw.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -27,12 +27,16 @@
+ Comment[lt]=RAW foto atvaizdas
+ Comment[mk]=RAW-слика од камера
+ Comment[ms]=Imej Kamera RAW
++Comment[nb]=RAW-kamerabilde
+ Comment[nds]=Kamerbild in RAW-Formaat
+ Comment[nl]=RAW-camera-afbeelding
++Comment[nn]=RAW-kamerabilete
+ Comment[pl]=Obrazek w formacie RAW
+ Comment[pt]=Imagem RAW da Máquina Fotográfica
+ Comment[pt_BR]=Imagem RAW da Máquina Fotográfica
+ Comment[ro]=Imagine foto brută
++Comment[ru]=Необработанное изображение фотоаппарата
++Comment[se]=RAW-govvenapparáhttagovva
+ Comment[sk]=RAW fotografický obrázok
+ Comment[sl]=Slika RAW s fotoaparata
+ Comment[sr]=Сирова слика са камере
+--- mimetypes/application/x-mplayer2.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/application/x-mplayer2.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -7,18 +7,26 @@
+ Icon=multimedia
+ X-KDE-AutoEmbed=true
+ Comment=Microsoft Media Format
++Comment[ca]=Format Microsoft Media
++Comment[cs]=Microsoft Media formát
+ Comment[da]=Microsoft medieformat
+ Comment[de]=Microsoft-Media-Format
+ Comment[es]=Formator de medios de Microsoft
+ Comment[et]=Microsoft Media
+ Comment[fr]=Format Microsoft Media
++Comment[hr]=Microsoft Media oblik
+ Comment[hu]=Microsoft Media-fájl
++Comment[it]=Formato Microsoft Media
+ Comment[ja]=Microsoft メディアフォーマット
+ Comment[nds]=Microsoft-Medienformaat
+ Comment[nl]=Microsoft mediaformaat
++Comment[nn]=Microsoft Media-format
++Comment[pl]=Format Microsoft Media
+ Comment[pt]=Formato Multimédia da Microsoft
+ Comment[pt_BR]=Formato Multimédia da Microsoft
++Comment[ro]=Format media Microsoft
+ Comment[sk]=Microsoft Media formát
++Comment[sl]=Microsoftov medijski format
+ Comment[sr]=Microsoft-ов медијски формат
+ Comment[sr at Latn]=Microsoft-ov medijski format
+ Comment[sv]=Microsoft media-format
+--- mimetypes/application/x-trash.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/application/x-trash.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -56,7 +56,7 @@
+ Comment[ro]=Fişier de rezervă
+ Comment[ru]=Файл запасной копии
+ Comment[rw]=Idosiye y'Ingoboka
+-Comment[se]=Liigekopiija
++Comment[se]=Liigemáŋgus
+ Comment[sk]=Záložný súbor
+ Comment[sl]=Rezervna datoteka
+ Comment[sq]=Skedë Rezervë
+--- mimetypes/application/x-java-applet.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/application/x-java-applet.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -38,6 +38,7 @@
+ Comment[mk]=Java-аплет
+ Comment[mn]=Java-Апплет
+ Comment[ms]=Aplet Java
++Comment[nb]=Java-miniprogram
+ Comment[nds]=Java-Programm
+ Comment[nn]=Java-miniprogram
+ Comment[pa]=ਜਾਵਾ(Java) ਐਪਲਿਟ
+--- mimetypes/application/x-desktop.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/application/x-desktop.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -40,7 +40,7 @@
+ Comment[mn]=Ажилын талбарын тохиргоо
+ Comment[ms]=Fail Config Ruang Kerja
+ Comment[mt]=Fajl konfigurazzjoni desktop
+-Comment[nb]=Konfigurasjonsfil til skrivebord
++Comment[nb]=Oppsettsfil til skrivebord
+ Comment[nds]=Instellen-Datei
+ Comment[nl]=Configuratiegegevens
+ Comment[nn]=Skrivebordsoppsett-fil
+--- mimetypes/application/x-shellscript.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/application/x-shellscript.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -53,7 +53,7 @@
+ Comment[ro]=Script de interpretor
+ Comment[ru]=Скрипт shell
+ Comment[rw]=Shell Iyandika
+-Comment[se]=Skál3/43/4u skripta
++Comment[se]=Skálžu-skripta
+ Comment[sk]=Shellovský skript
+ Comment[sl]=Lupinski skript
+ Comment[sq]=Skript Guacor
+--- mimetypes/application/mbox.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ mimetypes/application/mbox.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -31,11 +31,13 @@
+ Comment[nb]=Mbox e-postmappe
+ Comment[nds]=Mbox-Nettpostorner
+ Comment[nl]=MBOX-postvakmap
++Comment[nn]=MBOX-e-postmappe
+ Comment[pl]=Folder poczty w formacie MBOX
+ Comment[pt]=Pasta de Correio MBOX
+ Comment[pt_BR]=Pasta de Correio MBOX
+ Comment[ro]=Folder de mail MBOX
+ Comment[ru]=Почтовая папка MBOX
++Comment[se]=MBOX-boastamáhppa
+ Comment[sk]=MBOX poštový priečinok
+ Comment[sl]=Mapa za pošto MBOX
+ Comment[sr]=MBOX фасцикла поште
+--- kimgio/psd.kimgio	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kimgio/psd.kimgio	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -39,6 +39,7 @@
+ Name[pt_BR]=Imagem do Adobe Photoshop
+ Name[ro]=Imagine Adobe Photoshop
+ Name[ru]=Рисунок Adobe Photoshop
++Name[se]=Adobe Photoshop-govva
+ Name[sk]=Adobe Photoshop obrázok
+ Name[sl]=Slika Adobe Photoshop
+ Name[sr]=Слика Adobe-овог Photoshop-а
+--- kio/kio/kservicegroup.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kio/kio/kservicegroup.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -48,6 +48,7 @@
+ {
+   d = new KServiceGroup::Private;
+   m_bDeleted = false;
++  m_bDeep = false;
+ }
+ 
+ KServiceGroup::KServiceGroup( const QString &configFile, const QString & _relpath )
+@@ -55,6 +56,7 @@
+ {
+   d = new KServiceGroup::Private;
+   m_bDeleted = false;
++  m_bDeep = false;
+ 
+   QString cfg = configFile;
+   if (cfg.isEmpty())
+--- kio/misc/kpac/eventsrc	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kio/misc/kpac/eventsrc	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -389,6 +389,7 @@
+ Name[ro]=Eroare de analiză a scriptului
+ Name[ru]=Ошибка разбора скрипта
+ Name[rw]=Ikosa ry'isuzuma ry'inyandikoporogaramu
++Name[se]=Meattáhus dulkodettiin skripta
+ Name[sk]=Chyba kontroly skriptu
+ Name[sl]=Napaka pri ocenjevanju skripta
+ Name[sq]=Gabim i vlerësimit të skriptës
+--- kutils/kplugininfo.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kutils/kplugininfo.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -42,7 +42,7 @@
+ Name[mk]=KDE Информација за приклучок
+ Name[mn]=КДЭ плугин мэдээлэл
+ Name[ms]=Maklumat Plugmasuk KDE
+-Name[nb]=KDEs informasjon om tilleggsprogram
++Name[nb]=KDEs informasjon om programtillegg
+ Name[nds]=Plugin-Informatschoon
+ Name[nl]=KDE-plugininformatie
+ Name[nn]=Informasjon om KDE-programtillegg
+--- kdecore/eventsrc	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kdecore/eventsrc	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -138,7 +138,7 @@
+ Name[uz]=Чиқиндилар қутиси бўшатилди
+ Name[vi]=Rác: đã đổ
+ Name[zh_CN]=回收站：已清空
+-Name[zh_TW]=垃圾桶已清空
++Name[zh_TW]=資源回收桶已清空
+ Comment=The trash has been emptied
+ Comment[af]=Die gemors is leeggemaak
+ Comment[bg]=Съдържанието а кошчето е изтрито
+@@ -195,7 +195,7 @@
+ Comment[uz]=Чиқиндилар қутиси бўшатилди
+ Comment[vi]=Rác đã được đổ.
+ Comment[zh_CN]=回收站已被清空
+-Comment[zh_TW]=垃圾桶已清空。
++Comment[zh_TW]=資源回收桶已清空。
+ default_presentation=1
+ 
+ [Textcompletion: rotation]
+@@ -2132,6 +2132,7 @@
+ Name[ro]=Mesaj situaţie critică
+ Name[ru]=Критическая ошибка
+ Name[rw]=Ubutumwa bunenga
++Name[se]=Heahttediehtu
+ Name[sk]=Kritická správa
+ Name[sl]=Kritično sporočilo
+ Name[sq]=Porosi Kritik
+@@ -2201,6 +2202,7 @@
+ Comment[ro]=A fost afişat un mesaj de situaţie critică
+ Comment[ru]=Вывод критического сообщения
+ Comment[rw]=Ubutumwa bunenga bwerekanwe
++Comment[se]=Heahttediehtu čájehuvvo
+ Comment[sk]=Je zobrazená kritická správa
+ Comment[sl]=Prikazano je kritično sporočilo
+ Comment[sq]=Një porosi kritike është paraqitur
+--- kdecore/all_languages.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kdecore/all_languages.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -7566,11 +7566,13 @@
+ Name[nb]=Romani
+ Name[nds]=Roomsch
+ Name[nl]=Roma
++Name[nn]=Romani
+ Name[pl]=Romski
+ Name[pt]=Romeno
+ Name[pt_BR]=Romeno
+ Name[ro]=Ţigănească
+ Name[ru]=Цыганский
++Name[se]=Románigiella
+ Name[sk]=Románsky
+ Name[sl]=romsko
+ Name[sr]=Ромски
+@@ -8544,11 +8546,13 @@
+ Name[nb]=Serbisk (latinsk)
+ Name[nds]=Serbsch (latiensch Schrift)
+ Name[nl]=Servisch Latijn
++Name[nn]=Serbisk, latinsk
+ Name[pl]=Serbski łaciński
+ Name[pt]=Sérvio Latino
+ Name[pt_BR]=Sérvio Latino
+ Name[ro]=Sîrbă latină
+ Name[ru]=Сербский латинницей
++Name[se]=Serbialaš latiidnagiella
+ Name[sk]=Srbský Latinka
+ Name[sl]=srbsko latinsko
+ Name[sr]=Српски латинични
+@@ -10437,11 +10441,13 @@
+ Name[nb]=Kinesisk (Hong kong)
+ Name[nds]=Chineesch (Hong Kong)
+ Name[nl]=Chinees (Hong Kong)
++Name[nn]=Kinesisk (Hong Kong)
+ Name[pl]=Chiński (Hong Kong)
+ Name[pt]=Chinês (Hong Kong)
+ Name[pt_BR]=Chinês (Hong Kong)
+ Name[ro]=Chineză (Hong Kong)
+ Name[ru]=Китайский (Гонконг)
++Name[se]=Kiinnágiella (Hong Kong)
+ Name[sk]=Čínsky (Hong Kong)
+ Name[sl]=kitajsko (Hong Kong)
+ Name[sr]=Кинески (Хонгконг)
+--- kresources/kresources_plugin.desktop	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kresources/kresources_plugin.desktop	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -37,7 +37,7 @@
+ Comment[mk]=KResource рамковен приклучок
+ Comment[mn]=Нөөц Тодорхойлох-Файлын плугин (RDF)
+ Comment[ms]=Plug masuk Kerangka KResource
+-Comment[nb]=KRessursrammeverk tilleggsprogram
++Comment[nb]=KRessursrammeverk programtillegg
+ Comment[nds]=Plugin för dat KResource-Rahmenwark
+ Comment[nl]=KResource Framework-plugin
+ Comment[nn]=Programtillegg for KResource-rammeverket
+--- kdoctools/customization/pt/user.entities	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kdoctools/customization/pt/user.entities	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -40,3 +40,4 @@
+ <!ENTITY kinfocenter "<application>Centro de Informação do KDE</application>" >
+ <!ENTITY ksystemlog "<application>KSystemLog</application>" >
+ <!ENTITY kleopatra "<application>Kleopatra</application>" >
++<!ENTITY qt "<trademark>Qt</trademark>" >
+--- kdeui/kpopupmenu.cpp	(.../tags/KDE/3.5.4/kdelibs)	(revision 567679)
++++ kdeui/kpopupmenu.cpp	(.../branches/KDE/3.5/kdelibs)	(revision 567679)
+@@ -108,9 +108,6 @@
+                        AlignCenter | SingleLine, titleStr);
+         }
+     }
+-
+-    p.setPen(palette().active().highlight());
+-    p.drawLine(0, 0, r.right(), 0);
+ }
+ 
+ QSize KPopupTitle::sizeHint() const

More information about the pkg-kde-commits mailing list