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

[Luk Claes]

Author: luk
Date: 2005-09-24 20:36:43 +0000 (Sat, 24 Sep 2005)
New Revision: 1864

Added:
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff
   branches/kde-3.4.0/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff
Modified:
   branches/kde-3.4.0/packages/kdenetwork/debian/changelog
Log:
Applied patch about broken menu and fixed color of Buddy folder
Upload to unstable to fix RC bug


Modified: branches/kde-3.4.0/packages/kdenetwork/debian/changelog
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-24 18:14:45 UTC (rev 1863)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/changelog	2005-09-24 20:36:43 UTC (rev 1864)
@@ -1,4 +1,4 @@
-kdenetwork (4:3.4.2-3) UNRELEASED; urgency=low
+kdenetwork (4:3.4.2-3) unstable; urgency=low
 
   +++ Changes by Christopher Martin:
 
@@ -14,10 +14,14 @@
     having dropped _GLOBAL_OFFSET_TABLE_; kwifimanager applet no longer
     crashes, thus this upload closes: #327843, #329708.
 
-    XXX The person uploading should check this, or ask me to do so.
+  +++ Changes by Luk Claes:
+  
+  * Add patch to add missing entry for Hungarian to fix menu (Closes: #291009)
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun,  4 Sep 2005 13:59:19 -0400
+  * Add patch to use user's color for budy groups icon (Closes: #293035).
 
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Sep 2005 17:45:23 +0200
+
 kdenetwork (4:3.4.2-2) unstable; urgency=low
 
   +++ Changes by Luk Claes:

Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff	2005-09-24 18:14:45 UTC (rev 1863)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/15_krdc_hungarian_in_menu.diff	2005-09-24 20:36:43 UTC (rev 1864)
@@ -0,0 +1,16 @@
+--- krdc/rdp/rdpprefs.ui	2005-09-24 18:38:57.000000000 +0200
++++ krdc/rdp/rdpprefs.ui.new	2005-09-24 18:42:07.000000000 +0200
+@@ -191,7 +191,12 @@
+                     </item>
+                     <item>
+                         <property name="text">
+-                            <string>Croation (hr)</string>
++                            <string>Croatian (hr)</string>
++                        </property>
++                    </item>
++                    <item>
++                        <property name="text">
++                            <string>Hungarian (hu)</string>
+                         </property>
+                     </item>
+                     <item>

Added: branches/kde-3.4.0/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff
===================================================================
--- branches/kde-3.4.0/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff	2005-09-24 18:14:45 UTC (rev 1863)
+++ branches/kde-3.4.0/packages/kdenetwork/debian/patches/16_kopete_green_folder.diff	2005-09-24 20:36:43 UTC (rev 1864)
@@ -0,0 +1,25 @@
+--- kdenetwork-orig/kopete/kopete/kopetewindow.cpp
++++ kdenetwork-patched/kopete/kopete/kopetewindow.cpp
+@@ -182,7 +182,7 @@
+ 
+ 	actionShowOffliners = new KToggleAction( i18n( "Show Offline &Users" ), "viewmag", CTRL + Key_U,
+ 			this, SLOT( slotToggleShowOffliners() ), actionCollection(), "settings_show_offliners" );
+-	actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder_green", CTRL + Key_G,
++	actionShowEmptyGroups = new KToggleAction( i18n( "Show Empty &Groups" ), "folder", CTRL + Key_G,
+ 			this, SLOT( slotToggleShowEmptyGroups() ), actionCollection(), "settings_show_empty_groups" );
+ 
+ # if KDE_IS_VERSION(3,2,90)
+--- kdenetwork-orig/kopete/kopete/contactlist/kopetegroupviewitem.h
++++ kdenetwork-patched/kopete/kopete/contactlist/kopetegroupviewitem.h
+@@ -21,8 +21,8 @@
+ #include "kopetelistviewitem.h"
+ #include <qpixmap.h>
+
+-#define KOPETE_GROUP_DEFAULT_OPEN_ICON "folder_green_open"
+-#define KOPETE_GROUP_DEFAULT_CLOSED_ICON "folder_green"
++#define KOPETE_GROUP_DEFAULT_OPEN_ICON "folder_open"
++#define KOPETE_GROUP_DEFAULT_CLOSED_ICON "folder"
+
+ /**
+  * @author Olivier Goffart
+