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

[Armin Berres]

Author: trigger-guest
Date: 2007-12-24 16:41:35 +0000 (Mon, 24 Dec 2007)
New Revision: 8520

Added:
   branches/kde4/packages/kdebase-workspace/debian/patches/14_correct_kde4home_for_kstartupconfig4.diff
Modified:
   branches/kde4/packages/kdebase-workspace/debian/changelog
   branches/kde4/packages/kdebase-workspace/debian/patches/series
Log:
* Add patch to change the kde directory used by kstartupconfig4 to .kde4 (Closes: #457635).


Modified: branches/kde4/packages/kdebase-workspace/debian/changelog
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/changelog	2007-12-24 16:32:39 UTC (rev 8519)
+++ branches/kde4/packages/kdebase-workspace/debian/changelog	2007-12-24 16:41:35 UTC (rev 8520)
@@ -11,12 +11,14 @@
   * kdebase-workspace-bin and kdebase-workspace-data replace kdebase-bin and
     kmenuedit from KDE 3.
   * kdebase-workspace-data replaces kdebase-data from KDE 3.
+  * Add patch to change the kde directory used by kstartupconfig4 to .kde4
+    (Closes: #457635).
 
   +++ Changes by Modestas Vainius:
 
   * Add myself to uploaders.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 20 Dec 2007 15:26:10 +0100
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 24 Dec 2007 17:40:29 +0100
 
 kdebase-workspace (4:3.97.0-2) experimental; urgency=low
 

Added: branches/kde4/packages/kdebase-workspace/debian/patches/14_correct_kde4home_for_kstartupconfig4.diff
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/14_correct_kde4home_for_kstartupconfig4.diff	                        (rev 0)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/14_correct_kde4home_for_kstartupconfig4.diff	2007-12-24 16:41:35 UTC (rev 8520)
@@ -0,0 +1,13 @@
+kstartupconfig doesn't use any kdelibs, that's why it doesn't know about .kde4.
+No need to push upstream, should be removed before upload to unstable.
+--- a/kstartupconfig/kstartupconfig.cpp
++++ b/kstartupconfig/kstartupconfig.cpp
+@@ -81,7 +81,7 @@
+     else if( getenv( "HOME" ))
+         {
+         strlcpy( kdehome, getenv( "HOME" ), 1024 );
+-        strlcat( kdehome, "/.kde", 1024  );
++        strlcat( kdehome, "/.kde4", 1024  );
+         }
+     else
+         return 1;

Modified: branches/kde4/packages/kdebase-workspace/debian/patches/series
===================================================================
--- branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-12-24 16:32:39 UTC (rev 8519)
+++ branches/kde4/packages/kdebase-workspace/debian/patches/series	2007-12-24 16:41:35 UTC (rev 8520)
@@ -6,3 +6,4 @@
 11_kdm_X_path.diff
 12_be_better_at_honouring_user_kdm_theming.diff
 13_kdm_override_docs.diff
+14_correct_kde4home_for_kstartupconfig4.diff