rev 13746 - in branches/kde4.2/packages/kdebase-workspace/debian: . patches

[Armin Berres]

Author: trigger-guest
Date: 2009-02-07 17:37:43 +0000 (Sat, 07 Feb 2009)
New Revision: 13746

Added:
   branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff
Modified:
   branches/kde4.2/packages/kdebase-workspace/debian/changelog
   branches/kde4.2/packages/kdebase-workspace/debian/patches/series
Log:
* Disable the "Might wreak havoc." message at kdm startup. Everything is
  fine with our setup.

Modified: branches/kde4.2/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-07 09:40:10 UTC (rev 13745)
+++ branches/kde4.2/packages/kdebase-workspace/debian/changelog	2009-02-07 17:37:43 UTC (rev 13746)
@@ -15,12 +15,14 @@
     (Closes:  #513593).
   * Explicitly build-depend on libnm-util-dev >= 0.7, for building against
     network-manager 0.7 (Closes: #513674).
+  * Disable the "Might wreak havoc." message at kdm startup. Everything is
+    fine with our setup.
 
   +++ Changes by Xavier Vello:
 
-  * Add replaces: systemsettings (<< 4:4.1.80) (Closes: #507380)
+  * Add replaces: systemsettings (<< 4:4.1.80) (Closes: #507380).
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Feb 2009 20:29:36 +0200
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 07 Feb 2009 18:37:06 +0100
 
 kdebase-workspace (4:4.2.0-1) experimental; urgency=low
 

Added: branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	                        (rev 0)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/06_kdm_does_not_wreak_havoc.diff	2009-02-07 17:37:43 UTC (rev 13746)
@@ -0,0 +1,15 @@
+--- a/kdm/kfrontend/genkdmconf.c
++++ b/kdm/kfrontend/genkdmconf.c
+@@ -2998,9 +2998,9 @@ int main( int argc, char **argv )
+ 				memcmp( oldkde + olen - sizeof(SHR_CONF) + 1,
+ 						SHR_CONF, sizeof(SHR_CONF) ))
+ 			{
+-				fprintf( stderr,
+-				         "Warning: --old-kde does not end with " SHR_CONF ". "
+-				         "Might wreak havoc.\n" );
++				//fprintf( stderr,
++				//         "Warning: --old-kde does not end with " SHR_CONF ". "
++				//         "Might wreak havoc.\n" );
+ 				oldkdepfx = oldkde;
+ 			} else
+ 				ASPrintf( (char **)&oldkdepfx,

Modified: branches/kde4.2/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-07 09:40:10 UTC (rev 13745)
+++ branches/kde4.2/packages/kdebase-workspace/debian/patches/series	2009-02-07 17:37:43 UTC (rev 13746)
@@ -1,3 +1,4 @@
+06_kdm_does_not_wreak_havoc.diff
 07_kdmrc_defaults.diff
 08_genkdmconf.diff
 09_genkdm_make.diff