rev 8922 - branches/kde4/packages/kdebase-workspace/debian/patches

[Armin Berres]

Author: trigger-guest
Date: 2008-01-10 22:29:15 +0000 (Thu, 10 Jan 2008)
New Revision: 8922

Modified:
   branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
   branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
Log:
refresh patches

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2008-01-10 22:24:38 UTC (rev 8921)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/07_kdmrc_defaults.diff	2008-01-10 22:29:15 UTC (rev 8922)
@@ -1,5 +1,3 @@
-Index: b/kcontrol/kdm/kdm-dlg.cpp
-===================================================================
 --- a/kcontrol/kdm/kdm-dlg.cpp
 +++ b/kcontrol/kdm/kdm-dlg.cpp
 @@ -279,7 +279,7 @@
@@ -20,8 +18,6 @@
  	logoRadio->setChecked( true );
  	slotAreaRadioClicked( KdmLogo );
  	setLogo( "" );
-Index: b/kdm/config.def
-===================================================================
 --- a/kdm/config.def
 +++ b/kdm/config.def
 @@ -47,11 +47,11 @@
@@ -71,7 +67,7 @@
  User: core
  Instance: #*/!
  Comment:
-@@ -2096,9 +2096,9 @@
+@@ -2093,9 +2093,9 @@
  
  Key: GreetString
  Type: string
@@ -83,7 +79,7 @@
  Comment:
   The headline in the greeter. The following character pairs are replaced:
   - %d -> current display
-@@ -2533,7 +2533,6 @@
+@@ -2530,7 +2530,6 @@
  Default: 0
  User: greeter
  Instance: #*/
@@ -91,7 +87,7 @@
  Comment:
   Random seed for forging saved session types, etc. of unknown users.
   This value should be random but constant across the login domain.
-@@ -2630,7 +2629,7 @@
+@@ -2627,7 +2626,7 @@
  Type: bool
  Default: true
  User: greeter

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2008-01-10 22:24:38 UTC (rev 8921)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/10_kdm_no_custom.diff	2008-01-10 22:29:15 UTC (rev 8922)
@@ -1,6 +1,6 @@
 --- a/kdm/kfrontend/kgreeter.cpp
 +++ b/kdm/kfrontend/kgreeter.cpp
-@@ -388,7 +388,6 @@
+@@ -386,7 +386,6 @@
  KGreeter::putSession( const QString &type, const QString &name, bool hid, const char *exe )
  {
  	int prio = exe ? (!strcmp( exe, "default" ) ? 0 :
@@ -8,7 +8,7 @@
  	                  !strcmp( exe, "failsafe" ) ? 3 : 2) : 2;
  	for (int i = 0; i < sessionTypes.size(); i++)
  		if (sessionTypes[i].type == type) {
-@@ -417,7 +416,6 @@
+@@ -415,7 +414,6 @@
  				            dsk.readEntry( "Exec" ).toLatin1() );
  			}
  	putSession( "default", i18n("Default"), false, "default" );

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2008-01-10 22:24:38 UTC (rev 8921)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/12_be_better_at_honouring_user_kdm_theming.diff	2008-01-10 22:29:15 UTC (rev 8922)
@@ -1,6 +1,6 @@
 --- a/kdm/config.def
 +++ b/kdm/config.def
-@@ -2659,7 +2659,7 @@
+@@ -2656,7 +2656,7 @@
  Type: string
  Default: ""
  User: greeter