rev 12710 - in trunk/packages/kdebase/debian: . patches

[Sune Vuorela]

Author: pusling-guest
Date: 2008-11-23 20:21:05 +0000 (Sun, 23 Nov 2008)
New Revision: 12710

Added:
   trunk/packages/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
   trunk/packages/kdebase/debian/patches/76_force_iocharset=iso-8859-1_when_mounting_fat_disks.diff
Modified:
   trunk/packages/kdebase/debian/changelog
Log:
* Force iocharset to iso-8859-1 when mouting fat devices. (Closes: #500540)
* Don't make it possible to enable bootloader handling in the kdm kcm.
  (Closes: #505316)
TODO: revert these two patches and come up with a real solution

Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog	2008-11-23 18:03:29 UTC (rev 12709)
+++ trunk/packages/kdebase/debian/changelog	2008-11-23 20:21:05 UTC (rev 12710)
@@ -1,3 +1,12 @@
+kdebase (4:3.5.9.dfsg.1-6~sune1) unstable; urgency=low
+
+  * Force iocharset to iso-8859-1 when mouting fat devices. (Closes: #500540)
+  * Don't make it possible to enable bootloader handling in the kdm kcm.
+    (Closes: #505316)
+  TODO: revert these two patches and come up with a real solution
+
+ -- Sune Vuorela <debian at pusling.com>  Sun, 23 Nov 2008 19:06:54 +0100
+
 kdebase (4:3.5.9.dfsg.1-5) unstable; urgency=high
 
   * Add a Depends on x11-utils to ksmserver. (Closes: #491967) 

Added: trunk/packages/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff	                        (rev 0)
+++ trunk/packages/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff	2008-11-23 20:21:05 UTC (rev 12710)
@@ -0,0 +1,11 @@
+--- kdebase-3.5.9.dfsg.1.orig/kcontrol/kdm/kdm-shut.cpp
++++ kdebase-3.5.9.dfsg.1/kcontrol/kdm/kdm-shut.cpp
+@@ -131,7 +131,7 @@
+ 
+       lgroup4->addRowSpacing(0, group4->fontMetrics().height()/2);
+       lgroup4->addWidget(bm_label, 1, 0);
+-      lgroup4->addWidget(bm_combo, 1, 1);
++//      lgroup4->addWidget(bm_combo, 1, 1);
+       lgroup4->setColStretch(2, 1);
+ 
+       main->activate();

Added: trunk/packages/kdebase/debian/patches/76_force_iocharset=iso-8859-1_when_mounting_fat_disks.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/76_force_iocharset=iso-8859-1_when_mounting_fat_disks.diff	                        (rev 0)
+++ trunk/packages/kdebase/debian/patches/76_force_iocharset=iso-8859-1_when_mounting_fat_disks.diff	2008-11-23 20:21:05 UTC (rev 12710)
@@ -0,0 +1,15 @@
+--- kdebase-3.5.9.dfsg.1.orig/kioslave/media/mediamanager/halbackend.cpp
++++ kdebase-3.5.9.dfsg.1/kioslave/media/mediamanager/halbackend.cpp
+@@ -854,6 +854,12 @@
+         value = config.readBoolEntry("utf8", true);
+         tmp = QString("utf8=%1").arg(value ? "true" : "false");
+         result << tmp;
++        if(fstype.endsWith("fat"))
++        {
++            tmp = QString("iocharset=iso-8859-1");
++            result <<tmp;
++        }
++	
+     }
+ 
+     if (valids.contains("shortname"))