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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 4d81b06ff614cfbeb336c253507915a9cbd622cc
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Mar 27 04:05:41 2003 +0000

            File name change WebPluginError.[hm] -> WebPlugInError.[hm]
    
            * Misc.subproj/WebKit.h:
            * Plugins.subproj/WebNullPluginView.m:
            * Plugins.subproj/WebPlugInError.h:
            * Plugins.subproj/WebPluginError.h: Removed.
            * Plugins.subproj/WebPluginError.m: Removed.
            * Plugins.subproj/WebPluginErrorPrivate.h:
            * WebKit.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3933 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ed9736b..5abf2be 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,17 @@
 2003-03-26  Richard Williamson   <rjw at apple.com>
 
+        File name change WebPluginError.[hm] -> WebPlugInError.[hm]
+
+        * Misc.subproj/WebKit.h:
+        * Plugins.subproj/WebNullPluginView.m:
+        * Plugins.subproj/WebPlugInError.h:
+        * Plugins.subproj/WebPluginError.h: Removed.
+        * Plugins.subproj/WebPluginError.m: Removed.
+        * Plugins.subproj/WebPluginErrorPrivate.h:
+        * WebKit.pbproj/project.pbxproj:
+
+2003-03-26  Richard Williamson   <rjw at apple.com>
+
         WebPreferences API changes:
         
         JavaScriptCanOpenWindowsAutomatically -> javaScriptCanOpenWindowsAutomatically
diff --git a/WebKit/Misc.subproj/WebKit.h b/WebKit/Misc.subproj/WebKit.h
index 5a31520..d6b3bff 100644
--- a/WebKit/Misc.subproj/WebKit.h
+++ b/WebKit/Misc.subproj/WebKit.h
@@ -18,7 +18,7 @@
 #import <WebKit/WebKitErrors.h>
 #import <WebKit/WebLocationChangeDelegate.h>
 #import <WebKit/WebPreferences.h>
-#import <WebKit/WebPluginError.h>
+#import <WebKit/WebPlugInError.h>
 #import <WebKit/WebPolicyDelegate.h>
 #import <WebKit/WebResourceLoadDelegate.h>
 #import <WebKit/WebNSURLResponseExtras.h>
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 8a3446b..b61fd9d 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -6,7 +6,7 @@
 #import <WebKit/WebDataSource.h>
 #import <WebKit/WebFrame.h>
 #import <WebKit/WebFrameView.h>
-#import <WebKit/WebPluginError.h>
+#import <WebKit/WebPlugInError.h>
 #import <WebKit/WebNullPluginView.h>
 #import <WebKit/WebNSViewExtras.h>
 #import <WebKit/WebResourceLoadDelegate.h>
diff --git a/WebKit/Plugins.subproj/WebPlugInError.h b/WebKit/Plugins.subproj/WebPlugInError.h
index c75bbc0..87d6e07 100644
--- a/WebKit/Plugins.subproj/WebPlugInError.h
+++ b/WebKit/Plugins.subproj/WebPlugInError.h
@@ -1,10 +1,9 @@
-//
-//  WebPluginError.h
-//  WebKit
-//
-//  Created by Chris Blumenberg on Fri Nov 01 2002.
-//  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+    WebPlugInError.h
+    Copyright 2002, Apple, Inc. All rights reserved.
+
+    Public header file.
+ */
 
 #import <Foundation/Foundation.h>
 
diff --git a/WebKit/Plugins.subproj/WebPluginErrorPrivate.h b/WebKit/Plugins.subproj/WebPluginErrorPrivate.h
index 32866aa..48afe94 100644
--- a/WebKit/Plugins.subproj/WebPluginErrorPrivate.h
+++ b/WebKit/Plugins.subproj/WebPluginErrorPrivate.h
@@ -7,7 +7,7 @@
  *
  */
 
-#import <WebKit/WebPluginError.h>
+#import <WebKit/WebPlugInError.h>
 
 @interface WebPlugInError (WebPrivate)
 
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 04a1e0c..336b8e6 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -239,7 +239,6 @@
 				65490EC503666E0C000CED4B,
 				8467275E0367158500CA2ACA,
 				F5F717260288493C018635CA,
-				830A567403731461000C720C,
 				65490EC603666E0C000CED4B,
 				65490EC703666E0D000CED4B,
 				F5F717280288493C018635CA,
@@ -306,6 +305,7 @@
 				51A8B57F0428353A00CA2D3A,
 				51443F9D0429392B00CA2D3A,
 				51443F9F0429392B00CA2D3A,
+				5110F7530432AC0800CA2D3A,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -370,7 +370,6 @@
 				F5883BE3025E5E9D01000102,
 				8467275F0367158500CA2ACA,
 				F5F717270288493C018635CA,
-				830A567503731461000C720C,
 				83E4AF4E036659440000E506,
 				F5F717290288493C018635CA,
 				F5AFB46102B94DC8018635CA,
@@ -424,6 +423,7 @@
 				51A8B57C042834F700CA2D3A,
 				51A8B5800428353A00CA2D3A,
 				51443F9E0429392B00CA2D3A,
+				5110F7540432AC0800CA2D3A,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1060,6 +1060,33 @@
 //512
 //513
 //514
+		5110F7510432AC0800CA2D3A = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebPlugInError.h;
+			refType = 4;
+		};
+		5110F7520432AC0800CA2D3A = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebPlugInError.m;
+			refType = 4;
+		};
+		5110F7530432AC0800CA2D3A = {
+			fileRef = 5110F7510432AC0800CA2D3A;
+			isa = PBXBuildFile;
+			settings = {
+				ATTRIBUTES = (
+					Public,
+				);
+			};
+		};
+		5110F7540432AC0800CA2D3A = {
+			fileRef = 5110F7520432AC0800CA2D3A;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		511D5553033FD51000CA2ACD = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -1699,33 +1726,6 @@
 //832
 //833
 //834
-		830A567203731461000C720C = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			path = WebPluginError.h;
-			refType = 4;
-		};
-		830A567303731461000C720C = {
-			fileEncoding = 4;
-			isa = PBXFileReference;
-			path = WebPluginError.m;
-			refType = 4;
-		};
-		830A567403731461000C720C = {
-			fileRef = 830A567203731461000C720C;
-			isa = PBXBuildFile;
-			settings = {
-				ATTRIBUTES = (
-					Public,
-				);
-			};
-		};
-		830A567503731461000C720C = {
-			fileRef = 830A567303731461000C720C;
-			isa = PBXBuildFile;
-			settings = {
-			};
-		};
 		8324709903F32305003026AC = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -3493,9 +3493,9 @@
 				F5883BE1025E5E9D01000102,
 				F5F717200288493C018635CA,
 				F5F717210288493C018635CA,
-				830A567203731461000C720C,
 				8466AEDD03F1F82100CA2ACA,
-				830A567303731461000C720C,
+				5110F7510432AC0800CA2D3A,
+				5110F7520432AC0800CA2D3A,
 			);
 			isa = PBXGroup;
 			name = Plugins;

-- 
WebKit Debian packaging