[Pkg-kde-commits] rev 1150 - branches/kde-3.4.0/packages/kdebase/debian/patches
Christopher Martin
chrsmrtn-guest@costa.debian.org
Mon, 30 May 2005 01:54:56 +0000
Author: chrsmrtn-guest
Date: 2005-05-30 01:54:56 +0000 (Mon, 30 May 2005)
New Revision: 1150
Modified:
branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
Log:
Modify kdm config patches. Set defaults, rather than the only kdmrc's
initial values. Sometimes it's nice to do both, for consistency, or because
(as with font antialiasing) kcontrol's kdm module behaves strangely, and will
initally present users with the commented-out value from kdmrc rather than the
current (default) setting.
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2005-05-30 01:44:03 UTC (rev 1149)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/10_kdmrc_defaults.diff 2005-05-30 01:54:56 UTC (rev 1150)
@@ -1,23 +1,47 @@
+--- kde.orig/kcontrol/kdm/kdm-appear.cpp
++++ kde.patched/kcontrol/kdm/kdm-appear.cpp
+@@ -484,7 +484,7 @@
+ config->setGroup("X-*-Greeter");
+
+ // Read the greeting string
+- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %s at %n")));
++ greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Debian at %n")));
+
+ // Regular logo or clock
+ QString logoArea = config->readEntry("LogoArea", "Logo" );
+@@ -533,7 +533,7 @@
+
+ void KDMAppearanceWidget::defaults()
+ {
+- greetstr_lined->setText( i18n("Welcome to %s at %n") );
++ greetstr_lined->setText( i18n("Welcome to Debian at %n") );
+ logoRadio->setChecked( true );
+ slotAreaRadioClicked( KdmLogo );
+ setLogo( "" );
--- kde.orig/kdm/config.def
+++ kde.patched/kdm/config.def
-@@ -1877,7 +1877,7 @@
- Default: KDMDATA "/sessions"
+@@ -1874,10 +1874,10 @@
+
+ Key: SessionsDirs
+ Type: list
+-Default: KDMDATA "/sessions"
++Default: "/usr/share/xsessions,/usr/share/apps/kdm/sessions"
User: core
User: greeter-c
-Instance: #*/"/etc/X11/sessions,/usr/share/xsessions"
-+Instance: */"/usr/share/xsessions,/usr/share/apps/kdm/sessions"
++Instance: #*/"/usr/share/xsessions,/usr/share/apps/kdm/sessions"
Comment:
The directories containing session type definitions in .desktop format.
Description:
-@@ -1903,7 +1903,7 @@
+@@ -1901,7 +1901,7 @@
+
+ Key: UseSessReg
Type: bool
- Default: true
+-Default: true
++Default: false
User: core
--Instance: #*/!
-+Instance: */!
+ Instance: #*/!
Comment:
- Whether &kdm;'s built-in utmp/wtmp/lastlog registration should be used.
- Description:
@@ -1997,7 +1997,7 @@
Key: GreetString
@@ -27,23 +51,3 @@
User: greeter
Instance: #*/"K Desktop Environment (%n)"
Comment:
---- kde.orig/kcontrol/kdm/kdm-appear.cpp
-+++ kde.patched/kcontrol/kdm/kdm-appear.cpp
-@@ -484,7 +484,7 @@
- config->setGroup("X-*-Greeter");
-
- // Read the greeting string
-- greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to %s at %n")));
-+ greetstr_lined->setText(config->readEntry("GreetString", i18n("Welcome to Debian at %n")));
-
- // Regular logo or clock
- QString logoArea = config->readEntry("LogoArea", "Logo" );
-@@ -533,7 +533,7 @@
-
- void KDMAppearanceWidget::defaults()
- {
-- greetstr_lined->setText( i18n("Welcome to %s at %n") );
-+ greetstr_lined->setText( i18n("Welcome to Debian at %n") );
- logoRadio->setChecked( true );
- slotAreaRadioClicked( KdmLogo );
- setLogo( "" );
Modified: branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff
===================================================================
--- branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-05-30 01:44:03 UTC (rev 1149)
+++ branches/kde-3.4.0/packages/kdebase/debian/patches/18_default_fonts.diff 2005-05-30 01:54:56 UTC (rev 1150)
@@ -66,35 +66,6 @@
<StandardFont value="" object="FMSettings" />
</fonts>
</ktheme>
---- kde.orig/kdm/config.def
-+++ kde.patched/kdm/config.def
-@@ -2051,7 +2051,7 @@
- Default: "charter,24,5,0,50,0"
- CDefault: "charter,24,bold"
- User: greeter:font
--Instance: #*/"charter,20,5,0,50,0"
-+Instance: */"Sans Serif,22,5,0,50,0"
- Comment: &
- Description:
- The font for the greeter headline.
-@@ -2061,7 +2061,7 @@
- Default: "helvetica,12,5,0,50,0"
- CDefault: "helvetica,12"
- User: greeter(normalFont):font
--Instance: #*/"helvetica,10,5,0,50,0"
-+Instance: */"Sans Serif,10,5,0,50,0"
- Comment: &
- Description:
- The normal font used in the greeter.
-@@ -2080,7 +2080,7 @@
- Type: bool
- Default: false
- User: greeter-c
--Instance: #*/!
-+Instance: */!
- Comment: &
- Description:
- Whether the fonts used in the greeter should be antialiased.
--- kde.orig/kcontrol/kdm/kdm-font.cpp
+++ kde.patched/kcontrol/kdm/kdm-font.cpp
@@ -90,9 +90,9 @@
@@ -162,3 +133,42 @@
KGlobal::config()->setGroup("PanelIcons");
st_UserGamma.EffectPanel=KGlobal::config()->readEntry("ActiveEffect", "none");
+--- kde.orig/kdm/config.def
++++ kde.patched/kdm/config.def
+@@ -2048,20 +2048,20 @@
+
+ Key: GreetFont
+ Type: string
+-Default: "charter,24,5,0,50,0"
++Default: "Sans Serif,22,5,0,50,0"
+ CDefault: "charter,24,bold"
+ User: greeter:font
+-Instance: #*/"charter,20,5,0,50,0"
++Instance: #*/"Sans Serif,22,5,0,50,0"
+ Comment: &
+ Description:
+ The font for the greeter headline.
+
+ Key: StdFont
+ Type: string
+-Default: "helvetica,12,5,0,50,0"
++Default: "Sans Serif,10,5,0,50,0"
+ CDefault: "helvetica,12"
+ User: greeter(normalFont):font
+-Instance: #*/"helvetica,10,5,0,50,0"
++Instance: #*/"Sans Serif,10,5,0,50,0"
+ Comment: &
+ Description:
+ The normal font used in the greeter.
+@@ -2078,9 +2078,9 @@
+
+ Key: AntiAliasing
+ Type: bool
+-Default: false
++Default: true
+ User: greeter-c
+-Instance: #*/!
++Instance: */
+ Comment: &
+ Description:
+ Whether the fonts used in the greeter should be antialiased.