[Pkg-kde-commits] rev 2149 - in
branches/kde-3.4.0/packages/kdelibs/debian: . patches
Christopher Martin
chrsmrtn at costa.debian.org
Fri Nov 4 23:53:55 UTC 2005
Author: chrsmrtn
Date: 2005-11-04 23:53:54 +0000 (Fri, 04 Nov 2005)
New Revision: 2149
Added:
branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r477652.diff
Modified:
branches/kde-3.4.0/packages/kdelibs/debian/changelog
Log:
Branch update for kdelibs; contains a build fix for kopete.
Modified: branches/kde-3.4.0/packages/kdelibs/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-11-04 23:23:38 UTC (rev 2148)
+++ branches/kde-3.4.0/packages/kdelibs/debian/changelog 2005-11-04 23:53:54 UTC (rev 2149)
@@ -1,3 +1,14 @@
+kdelibs (4:3.4.3-2) UNRELEASED; urgency=low
+
+ * KDE_3_4_BRANCH update (up to r477652).
+
+ +++ Changes by Christopher Martin:
+
+ * In the branch update is included a fix for kopete's compilation issues.
+ (Closes: #337423)
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Date
+
kdelibs (4:3.4.3-1) experimental; urgency=low
* New upstream release.
Added: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r477652.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r477652.diff 2005-11-04 23:23:38 UTC (rev 2148)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_r477652.diff 2005-11-04 23:53:54 UTC (rev 2149)
@@ -0,0 +1,107 @@
+#DPATCHLEVEL=0
+--- kimgio/psd.kimgio (revision 469958)
++++ kimgio/psd.kimgio (revision 477652)
+@@ -25,6 +25,7 @@
+ Name[hu]=PhotoShop-dokumentum
+ Name[is]=PhotoShop skjal
+ Name[it]=Documento PhotoShop
++Name[ja]=Photoshopドキュメント
+ Name[lt]=PhotoShop dokumentas
+ Name[nb]=PhotoShop dokument
+ Name[nl]=PhotoShop-document
+--- kio/misc/kpac/eventsrc (revision 469958)
++++ kio/misc/kpac/eventsrc (revision 477652)
+@@ -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
+@@ -199,7 +199,7 @@
+ Name[cy]=Gwall wrth lawrlwytho'r sgript
+ Name[da]=Script download-fejl
+ Name[de]=Skript-Fehler beim Herunterladen
+-Name[el]=Σφάλμα κατεβάσματος σεναρίου
++Name[el]=Σφάλμα λήψης σεναρίου
+ Name[eo]=Skripta ŝarĝeraro
+ Name[es]=Error de descarga del procedimiento
+ Name[et]=Viga skripti allalaadimisel
+@@ -260,7 +260,7 @@
+ Comment[cy]=Y sgript ffurfweddu'r dirprwy
+ Comment[da]=Proxy-indstillingsscriptet kunne ikke downloades
+ Comment[de]=Das Proxy-Einrichtungsskript lässt sich nicht herunterladen
+-Comment[el]=Το σενάριο ρύθμισης διαμεσολαβητή ήταν αδύνατο να ανακτηθεί
++Comment[el]=Το σενάριο ρύθμισης διαμεσολαβητή ήταν αδύνατο να ληφθεί
+ Comment[eo]=Ne eblas ŝarĝi la prokuragordoskripton
+ Comment[es]=El procedimiento de configuración del proxy no se pudo descargar
+ Comment[et]=Proxy seadistuse skripti ei õnnestu alla laadida
+--- kdecore/kconfigbase.cpp (revision 469958)
++++ kdecore/kconfigbase.cpp (revision 477652)
+@@ -1065,7 +1065,7 @@
+
+ unsigned int len = homeDir.length();
+ // replace by "$HOME" if possible
+- if (path.length() == len || path[len] == '/') {
++ if (len && (path.length() == len || path[len] == '/')) {
+ path.replace(0, len, QString::fromLatin1("$HOME"));
+ return true;
+ } else
+--- kdecore/klocale.cpp (revision 469958)
++++ kdecore/klocale.cpp (revision 477652)
+@@ -874,14 +874,7 @@
+ return put_n_in( forms[0], n);
+ else
+ return put_n_in( forms[1], n);
+- case 8: // Czech
+- EXPECT_LENGTH( 3 );
+- if ( n%100 == 1 )
+- return put_n_in( forms[0], n);
+- else if (( n%100 >= 2 ) && ( n%100 <= 4 ))
+- return put_n_in( forms[1], n);
+- else
+- return put_n_in( forms[2], n);
++ case 8: // Czech - use modern form which is equivalent to Slovak
+ case 9: // Slovak
+ EXPECT_LENGTH( 3 );
+ if ( n == 1 )
+--- kresources/manager.h (revision 469958)
++++ kresources/manager.h (revision 477652)
+@@ -335,7 +335,7 @@
+ ++it ) {
+ QString desc = mFactory->typeName( *it );
+ if ( !mFactory->typeDescription( *it ).isEmpty() )
+- desc += " (" + mFactory->typeDescription( *it ) + ")";
++ desc += QString::fromLatin1(" (") + mFactory->typeDescription( *it ) + QString::fromLatin1(")");
+
+ typeDescs.append( desc );
+ }
+--- pics/hicolor/index.theme (revision 469958)
++++ pics/hicolor/index.theme (revision 477652)
+@@ -103,7 +103,6 @@
+ SmallSizes=16
+ PanelDefault=32
+ PanelSizes=16,22,32,48
+-Hidden=true
+ Directories=192x192/apps,128x128/actions,128x128/apps,128x128/devices,128x128/filesystems,128x128/mimetypes,96x96/actions,96x96/apps,96x96/devices,96x96/filesystems,96x96/mimetypes,72x72/apps,64x64/actions,64x64/apps,64x64/devices,64x64/filesystems,64x64/mimetypes,48x48/actions,48x48/apps,48x48/devices,48x48/filesystems,48x48/mimetypes,36x36/apps,32x32/actions,32x32/apps,32x32/devices,32x32/filesystems,32x32/mimetypes,24x24/apps,22x22/actions,22x22/apps,22x22/devices,22x22/filesystems,22x22/mimetypes,16x16/actions,16x16/apps,16x16/devices,16x16/filesystems,16x16/mimetypes,scalable/actions,scalable/apps,scalable/devices,scalable/filesystems,scalable/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,32x32/stock/chart,32x32/stock/code,32x32/stock/data,32x32/stock/document,32x32/stock/form,32x32/stock/generic,32x32/stock/image,32x32/stock/io,32x32/stock/media,32x32/stock/navigation,32x32/stock/net,32x32/stock/object,32x32/stock/table,32x32/stock/text,36x36/stock/chart,36x36/stock/code,36x36/stock/data,36x36/stock/document,36x36/stock/form,36x36/stock/generic,36x36/stock/image,36x36/stock/io,36x36/stock/media,36x36/stock/navigation,36x36/stock/net,36x36/stock/object,36x36/stock/table,36x36/stock/text,48x48/stock/chart,48x48/stock/code,48x48/stock/data,48x48/stock/document,48x48/stock/form,48x48/stock/generic,48x48/stock/image,48x48/stock/io,48x48/stock/media,48x48/stock/navigation,48x48/stock/net,48x48/stock/object,48x48/stock/table,48x48/stock/text
+
+ [16x16/actions]
+--- kdeui/kstdaction_p.h (revision 469958)
++++ kdeui/kstdaction_p.h (revision 477652)
+@@ -46,10 +46,10 @@
+ { FindPrev, KStdAccel::FindPrev, "edit_find_last", I18N_NOOP("Find Pre&vious"), 0, "previous" },
+ { Replace, KStdAccel::Replace, "edit_replace", I18N_NOOP("&Replace..."), 0, 0 },
+
+- { ActualSize, KStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, 0 },
+- { FitToPage, KStdAccel::AccelNone, "view_fit_to_page", I18N_NOOP("&Fit to Page"), 0, 0 },
+- { FitToWidth, KStdAccel::AccelNone, "view_fit_to_width", I18N_NOOP("Fit to Page &Width"), 0, 0 },
+- { FitToHeight, KStdAccel::AccelNone, "view_fit_to_height", I18N_NOOP("Fit to Page &Height"), 0, 0 },
++ { ActualSize, KStdAccel::AccelNone, "view_actual_size", I18N_NOOP("&Actual Size"), 0, "viewmag1" },
++ { FitToPage, KStdAccel::AccelNone, "view_fit_to_page", I18N_NOOP("&Fit to Page"), 0, "view_fit_window" },
++ { FitToWidth, KStdAccel::AccelNone, "view_fit_to_width", I18N_NOOP("Fit to Page &Width"), 0, "view_fit_width" },
++ { FitToHeight, KStdAccel::AccelNone, "view_fit_to_height", I18N_NOOP("Fit to Page &Height"), 0, "view_fit_height" },
+ { ZoomIn, KStdAccel::ZoomIn, "view_zoom_in", I18N_NOOP("Zoom &In"), 0, "viewmag+" },
+ { ZoomOut, KStdAccel::ZoomOut, "view_zoom_out", I18N_NOOP("Zoom &Out"), 0, "viewmag-" },
+ { Zoom, KStdAccel::AccelNone, "view_zoom", I18N_NOOP("&Zoom..."), 0, "viewmag" },
More information about the pkg-kde-commits
mailing list