rev 12821 - in trunk/packages/kdebase/debian: . patches
Modestas Vainius
modax-guest at alioth.debian.org
Wed Dec 3 11:31:32 UTC 2008
Author: modax-guest
Date: 2008-12-03 11:31:32 +0000 (Wed, 03 Dec 2008)
New Revision: 12821
Added:
trunk/packages/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff
trunk/packages/kdebase/debian/patches/series
Removed:
trunk/packages/kdebase/debian/patches/76_force_iocharset=iso-8859-1_when_mounting_fat_disks.diff
Modified:
trunk/packages/kdebase/debian/changelog
trunk/packages/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
Log:
Prevert kdm from messing with Grub/Lilo, not just disable config option. Also use iso8859-1 charset for vfat when utf8 is set. Fixes 2 RC bugs
Modified: trunk/packages/kdebase/debian/changelog
===================================================================
--- trunk/packages/kdebase/debian/changelog 2008-12-03 08:59:52 UTC (rev 12820)
+++ trunk/packages/kdebase/debian/changelog 2008-12-03 11:31:32 UTC (rev 12821)
@@ -1,9 +1,10 @@
-kdebase (4:3.5.9.dfsg.1-6~sune1) unstable; urgency=low
+kdebase (4:3.5.9.dfsg.1-6) unstable; urgency=high
* 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
+ * Add a series file to source for patch handling with quilt. Patch system
+ not switched though.
-- Sune Vuorela <debian at pusling.com> Sun, 23 Nov 2008 19:06:54 +0100
Modified: 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 2008-12-03 08:59:52 UTC (rev 12820)
+++ trunk/packages/kdebase/debian/patches/75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff 2008-12-03 11:31:32 UTC (rev 12821)
@@ -1,11 +1,103 @@
---- 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 @@
+--- a/kcontrol/kdm/kdm-shut.cpp
++++ b/kcontrol/kdm/kdm-shut.cpp
+@@ -86,7 +86,7 @@
+ QWhatsThis::add( restart_label, wtstr );
+ QWhatsThis::add( restart_lined, wtstr );
+-
++#if 0
+ QGroupBox *group4 = new QGroupBox( i18n("Miscellaneous"), this );
+
+ bm_combo = new KBackedComboBox( group4 );
+@@ -100,15 +100,16 @@
+ wtstr = i18n("Enable boot options in the \"Shutdown...\" dialog.");
+ QWhatsThis::add( bm_label, wtstr );
+ QWhatsThis::add( bm_combo, wtstr );
++#endif
+
+ QBoxLayout *main = new QVBoxLayout( this, 10 );
+ QGridLayout *lgroup0 = new QGridLayout( group0, 1, 1, 10);
+ QGridLayout *lgroup1 = new QGridLayout( group1, 1, 1, 10);
+- QGridLayout *lgroup4 = new QGridLayout( group4, 1, 1, 10);
++// QGridLayout *lgroup4 = new QGridLayout( group4, 1, 1, 10);
+
+ main->addWidget(group0);
+ main->addWidget(group1);
+- main->addWidget(group4);
++// main->addWidget(group4);
+ main->addStretch();
+
+ lgroup0->addRowSpacing(0, group0->fontMetrics().height()/2);
+@@ -129,10 +130,12 @@
+ lgroup1->addWidget(restart_label, 1, 3);
+ lgroup1->addWidget(restart_lined, 1, 4);
+
++#if 0
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->addWidget(bm_combo, 1, 1);
lgroup4->setColStretch(2, 1);
++#endif
main->activate();
+
+@@ -148,7 +151,7 @@
+ shutdown_lined->lineEdit()->setReadOnly(true);
+ shutdown_lined->button()->setEnabled(false);
+
+- bm_combo->setEnabled(false);
++ //bm_combo->setEnabled(false);
+ }
+
+ void KDMSessionsWidget::writeSD(QComboBox *combo)
+@@ -174,7 +177,7 @@
+ config->writeEntry("HaltCmd", shutdown_lined->url(), true);
+ config->writeEntry("RebootCmd", restart_lined->url(), true);
+
+- config->writeEntry("BootManager", bm_combo->currentId());
++// config->writeEntry("BootManager", bm_combo->currentId());
+ }
+
+ void KDMSessionsWidget::readSD(QComboBox *combo, QString def)
+@@ -202,7 +205,7 @@
+ restart_lined->setURL(config->readEntry("RebootCmd", "/sbin/reboot"));
+ shutdown_lined->setURL(config->readEntry("HaltCmd", "/sbin/halt"));
+
+- bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
++// bm_combo->setCurrentId(config->readEntry("BootManager", "None"));
+ }
+
+
+@@ -215,7 +218,7 @@
+ sdlcombo->setCurrentItem(SdAll);
+ sdrcombo->setCurrentItem(SdRoot);
+
+- bm_combo->setCurrentId("None");
++// bm_combo->setCurrentId("None");
+ }
+
+
+--- a/kcontrol/kdm/kdm-shut.h
++++ b/kcontrol/kdm/kdm-shut.h
+@@ -55,7 +55,7 @@
+ QComboBox *sdlcombo, *sdrcombo;
+ QLabel *sdllabel, *sdrlabel;
+ KURLRequester *restart_lined, *shutdown_lined;
+- KBackedComboBox *bm_combo;
++// KBackedComboBox *bm_combo;
+ };
+
+
+--- a/kdm/backend/bootman.c
++++ b/kdm/backend/bootman.c
+@@ -240,8 +240,8 @@
+ void (*commit)( void );
+ } bootOpts[] = {
+ { getNull, setNull, 0 },
+- { getGrub, setGrub, commitGrub },
+- { getLilo, setLilo, commitLilo },
++ { getNull, setNull, 0 },
++ { getNull, setNull, 0 },
+ };
+
+ int
Deleted: trunk/packages/kdebase/debian/patches/76_force_iocharset=iso-8859-1_when_mounting_fat_disks.diff
Added: trunk/packages/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff
===================================================================
--- trunk/packages/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff (rev 0)
+++ trunk/packages/kdebase/debian/patches/76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff 2008-12-03 11:31:32 UTC (rev 12821)
@@ -0,0 +1,27 @@
+--- a/kioslave/media/mediamanager/halbackend.cpp
++++ b/kioslave/media/mediamanager/halbackend.cpp
+@@ -863,6 +863,12 @@
+ value = config.readBoolEntry("utf8", true);
+ tmp = QString("utf8=%1").arg(value ? "true" : "false");
+ result << tmp;
++ if(value && fstype.endsWith("fat"))
++ {
++ tmp = QString("iocharset=iso8859-1");
++ result <<tmp;
++ }
++
+ }
+
+ if (valids.contains("shortname"))
+@@ -1182,6 +1188,11 @@
+ soptions << QString("shortname=%1").arg(valids["shortname"]);
+ }
+
++ if (valids.contains("iocharset"))
++ {
++ soptions << QString("iocharset=%1").arg(valids["iocharset"]);
++ }
++
+ if (valids.contains("journaling"))
+ {
+ QString option = valids["journaling"];
Added: trunk/packages/kdebase/debian/patches/series
===================================================================
--- trunk/packages/kdebase/debian/patches/series (rev 0)
+++ trunk/packages/kdebase/debian/patches/series 2008-12-03 11:31:32 UTC (rev 12821)
@@ -0,0 +1,41 @@
+common/03_libtool_update.diff
+common/04_am_maintainer_mode.diff
+common/05_pedantic-errors.diff
+common/06_disable_no_undefined.diff
+01_admin_cleanup.diff
+01_kdebase_branch_r829407.diff -p0
+10_kdmrc_defaults.diff
+11_genkdmconf.diff
+12_genkdm_make.diff
+13_kdm_sessions_fixes.diff
+14_kdm_no_custom.diff
+15_cups_docroot.diff
+16_kdm_X_path.diff
+17_logitechmouse.diff
+18_default_fonts.diff
+19_kcontrol_only_in_kde.diff
+20_applications_menu_move.diff
+23_startkde_kpersonalizer.diff
+25_khelp_htdig.diff
+26_face_load.diff
+27_kfreebsd_sysguard.diff
+28_kdebase_rubberband.diff
+34_japanese_konsole_fix.diff
+38_furry_frosted_animals_support.diff
+39_be_better_at_honouring_user_kdm_theming.diff
+40_kdm_override_docs.diff
+43_kdeprintfax_addquotes.diff
+45_klipper_backreferences.diff
+46_disable_debug_by_default.diff
+54_seli_xinerama.diff
+55_kwin_xinerama_xrandr1.2.diff
+61_khelpcenter_max_results.diff
+70_kdm_consolekit.diff
+71_kio_man_utf8.diff
+72_fix_bashism.diff
+73_doc_482268.diff
+74_kdeprint_only_in_kde.diff
+75_disable_gui_option_to_enable_bootloader_handling_in_kdm.diff
+76_force_iocharset=iso8859-1_when_mounting_fat_disks.diff
+97_automake_cleanup.diff
+98_buildprep.diff -p0
More information about the pkg-kde-commits
mailing list