[Pkg-kde-commits] rev 515 - branches/kde-3.4.0/packages/kdelibs/debian/patches

[Adeodato Simó]

Author: dato-guest
Date: 2005-02-26 19:35:28 +0100 (Sat, 26 Feb 2005)
New Revision: 515

Removed:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-01-14.diff.uu
   branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-02-12.diff.uu
   branches/kde-3.4.0/packages/kdelibs/debian/patches/15_strip_directory.diff
   branches/kde-3.4.0/packages/kdelibs/debian/patches/16_CAN-2005-0365_dcopidlng.diff
   branches/kde-3.4.0/packages/kdelibs/debian/patches/17_XMLHttpRequest_POST_fix.diff
Modified:
   branches/kde-3.4.0/packages/kdelibs/debian/patches/10_kstandarddirs.diff
   branches/kde-3.4.0/packages/kdelibs/debian/patches/14_kaccel.diff
Log:
kdelibs/debian/patches:
  - removed patches that are already applied
  - rediffed 14_kaccel
  - update 10_kstandarddirs from Daniel


Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-01-14.diff.uu

Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/01_kdelibs_branch_2005-02-12.diff.uu

Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/10_kstandarddirs.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/10_kstandarddirs.diff	2005-02-26 09:35:42 UTC (rev 514)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/10_kstandarddirs.diff	2005-02-26 18:35:28 UTC (rev 515)
@@ -1,17 +1,18 @@
---- kdelibs-orig/kdecore/kstandarddirs.cpp
-+++ kdelibs-patched/kdecore/kstandarddirs.cpp
-@@ -747,6 +747,10 @@
+diff -urN kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp kdelibs-3.3.91/kdecore/kstandarddirs.cpp
+--- kdelibs-3.3.91.orig/kdecore/kstandarddirs.cpp	2005-01-14 21:46:57.964666000 -0800
++++ kdelibs-3.3.91/kdecore/kstandarddirs.cpp	2005-01-14 21:49:53.043136983 -0800
+@@ -833,6 +833,10 @@
                      if ((local || testdir.exists()) && !candidates->contains(path))
                          candidates->append(path);
                  }
-+                // UGLY HACK - Chris Cheney
-+                if (local && (!strcmp("config", type)))
-+                   candidates->append("/etc/kde3/");
-+                //
++		// UGLY HACK - Chris CHeney
++		if (local && (!strcmp("config", type)))
++		  candidates->append("/etc/kde3/");
++		//
                  local = false;
              }
          }
-@@ -922,7 +926,7 @@
+@@ -1020,7 +1024,7 @@
      if (!strcmp(type, "data"))
  	return "share/apps/";
      if (!strcmp(type, "html"))
@@ -20,7 +21,7 @@
      if (!strcmp(type, "icon"))
  	return "share/icons/";
      if (!strcmp(type, "config"))
-@@ -942,7 +946,7 @@
+@@ -1040,7 +1044,7 @@
      if (!strcmp(type, "mime"))
  	return "share/mimelnk/";
      if (!strcmp(type, "cgi"))
@@ -29,13 +30,13 @@
      if (!strcmp(type, "wallpaper"))
  	return "share/wallpapers/";
      if (!strcmp(type, "templates"))
-@@ -1139,6 +1143,9 @@
- 	   kdedirList.append(kdedir);
+@@ -1285,6 +1289,9 @@
          }
      }
+ #ifndef Q_OS_WIN //no default KDEDIR on win32 defined
 +    // UGLY HACK - Chris Cheney
 +    kdedirList.append("/usr/local");
 +    //
      kdedirList.append(KDEDIR);
+ #endif
  
- #ifdef __KDE_EXECPREFIX

Modified: branches/kde-3.4.0/packages/kdelibs/debian/patches/14_kaccel.diff
===================================================================
--- branches/kde-3.4.0/packages/kdelibs/debian/patches/14_kaccel.diff	2005-02-26 09:35:42 UTC (rev 514)
+++ branches/kde-3.4.0/packages/kdelibs/debian/patches/14_kaccel.diff	2005-02-26 18:35:28 UTC (rev 515)
@@ -1,6 +1,6 @@
 --- kdelibs-orig/kdecore/kaccel.cpp
 +++ kdelibs-patched/kdecore/kaccel.cpp
-@@ -95,7 +95,10 @@
+@@ -125,7 +125,10 @@
  	        return false;
  
  	if( pEvent->type == XKeyPress ) {

Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/15_strip_directory.diff

Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/16_CAN-2005-0365_dcopidlng.diff

Deleted: branches/kde-3.4.0/packages/kdelibs/debian/patches/17_XMLHttpRequest_POST_fix.diff