[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 478644434d9e4b3f9f2ace3566a23bae0171609d
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 26 20:28:02 2002 +0000

    	* Misc.subproj/IFError.m: (+[IFError initialize]): Fix a typo where
            we said "unvailable".
    
    	* WebView.subproj/IFPreferences.mm: (+[IFPreferences load]): Change
            the default sans-serif font to "Lucida Grande" to match the OS X
            system font, and also make that the defalt standard font.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@854 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 72b014f..c9c84eb 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-26  Darin Adler  <darin at apple.com>
+
+	* Misc.subproj/IFError.m: (+[IFError initialize]): Fix a typo where
+        we said "unvailable".
+        
+	* WebView.subproj/IFPreferences.mm: (+[IFPreferences load]): Change
+        the default sans-serif font to "Lucida Grande" to match the OS X
+        system font, and also make that the defalt standard font.
+
 2002-03-26  John Sullivan  <sullivan at apple.com>
 
 	* WebKit.pbproj/project.pbxproj:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 72b014f..c9c84eb 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,12 @@
+2002-03-26  Darin Adler  <darin at apple.com>
+
+	* Misc.subproj/IFError.m: (+[IFError initialize]): Fix a typo where
+        we said "unvailable".
+        
+	* WebView.subproj/IFPreferences.mm: (+[IFPreferences load]): Change
+        the default sans-serif font to "Lucida Grande" to match the OS X
+        system font, and also make that the defalt standard font.
+
 2002-03-26  John Sullivan  <sullivan at apple.com>
 
 	* WebKit.pbproj/project.pbxproj:
diff --git a/WebKit/Misc.subproj/IFError.m b/WebKit/Misc.subproj/IFError.m
index 4986983..a8f92dd 100644
--- a/WebKit/Misc.subproj/IFError.m
+++ b/WebKit/Misc.subproj/IFError.m
@@ -54,7 +54,7 @@ static id IFErrorMake(int code)
         [NSNumber numberWithInt: IFURLHandleResultDNSLookupError],
         NSLocalizedStringFromTable (@"HTTP redirection loop error", @"IFError", @"IFURLHandleResultHTTPRedirectionLoopError description"),
         [NSNumber numberWithInt: IFURLHandleResultHTTPRedirectionLoopError],
-        NSLocalizedStringFromTable (@"resource unvailable", @"IFError", @"IFURLHandleResultResourceUnavailableError description"),
+        NSLocalizedStringFromTable (@"resource unavailable", @"IFError", @"IFURLHandleResultResourceUnavailableError description"),
         [NSNumber numberWithInt: IFURLHandleResultResourceUnavailableError],
         NSLocalizedStringFromTable (@"can't load from network", @"IFError", @"IFURLHandleResultCantLoadFromNetworkError description"),
         [NSNumber numberWithInt: IFURLHandleResultCantLoadFromNetworkError],
diff --git a/WebKit/WebView.subproj/IFPreferences.mm b/WebKit/WebView.subproj/IFPreferences.mm
index f393ede..b3dd43a 100644
--- a/WebKit/WebView.subproj/IFPreferences.mm
+++ b/WebKit/WebView.subproj/IFPreferences.mm
@@ -45,10 +45,10 @@ static IFPreferences *_standardPreferences = nil;
 
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         @"0x0", 		WebKitLogLevelPreferenceKey,
-        @"Georgia", 		WebKitStandardFontPreferenceKey,
+        @"Lucida Grande",       WebKitStandardFontPreferenceKey,
         @"Monaco",	  	WebKitFixedFontPreferenceKey,
         @"Georgia", 		WebKitSerifFontPreferenceKey,
-        @"Arial", 		WebKitSansSerifFontPreferenceKey,
+        @"Lucida Grande", 	WebKitSansSerifFontPreferenceKey,
         @"Apple Chancery", 	WebKitCursiveFontPreferenceKey,
         @"Papyrus", 		WebKitFantasyFontPreferenceKey,
         @"6", 			WebKitMinimumFontSizePreferenceKey,
diff --git a/WebKit/WebView.subproj/WebPreferences.m b/WebKit/WebView.subproj/WebPreferences.m
index f393ede..b3dd43a 100644
--- a/WebKit/WebView.subproj/WebPreferences.m
+++ b/WebKit/WebView.subproj/WebPreferences.m
@@ -45,10 +45,10 @@ static IFPreferences *_standardPreferences = nil;
 
     NSDictionary *dict = [NSDictionary dictionaryWithObjectsAndKeys:
         @"0x0", 		WebKitLogLevelPreferenceKey,
-        @"Georgia", 		WebKitStandardFontPreferenceKey,
+        @"Lucida Grande",       WebKitStandardFontPreferenceKey,
         @"Monaco",	  	WebKitFixedFontPreferenceKey,
         @"Georgia", 		WebKitSerifFontPreferenceKey,
-        @"Arial", 		WebKitSansSerifFontPreferenceKey,
+        @"Lucida Grande", 	WebKitSansSerifFontPreferenceKey,
         @"Apple Chancery", 	WebKitCursiveFontPreferenceKey,
         @"Papyrus", 		WebKitFantasyFontPreferenceKey,
         @"6", 			WebKitMinimumFontSizePreferenceKey,

-- 
WebKit Debian packaging