[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 f72dfc6b122f5abce47c3ed41e12c6998c7d0ac4
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Oct 5 04:28:48 2002 +0000

    WebFoundation:
    
            * Misc.subproj/WebLocalizableStrings.h: Implement the real version of
    	the UI_STRING macro. It uses the FRAMEWORK_NAME preprocessor define to
    	find the appropriate bundle global, and passes that along with the
    	key into the WebLocalizedString function.
            * Misc.subproj/WebLocalizableStrings.m: Add the definition for the
    	WebFoundationLocalizableStrings bundle global.
            (WebLocalizedString): Added. Locates the bundle, then creates a string
    	object, then calls localizedStringForKey to find the localized version
    	of the string in the bundle's localizable strings.
            * WebFoundation.exp: Export WebLocalizedString.
    
            * WebFoundation.pbproj/project.pbxproj: Add -DFRAMEWORK_NAME=WebFoundation.
    
    WebKit:
    
            * Misc.subproj/WebKitLocalizableStrings.m: Added.
    	Contains the definition of the WebKitLocalizableStringsBundle.
            * WebKit.pbproj/project.pbxproj: Add -DFRAMEWORK_NAME=WebKit.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2257 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ad3346d..5ffd990 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,9 @@
+2002-10-04  Darin Adler  <darin at apple.com>
+
+        * Misc.subproj/WebKitLocalizableStrings.m: Added.
+	Contains the definition of the WebKitLocalizableStringsBundle.
+        * WebKit.pbproj/project.pbxproj: Add -DFRAMEWORK_NAME=WebKit.
+
 2002-10-04  Richard Williamson   <rjw at apple.com>
 
         Stubs for DOM level 2 core API.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index ad3346d..5ffd990 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-10-04  Darin Adler  <darin at apple.com>
+
+        * Misc.subproj/WebKitLocalizableStrings.m: Added.
+	Contains the definition of the WebKitLocalizableStringsBundle.
+        * WebKit.pbproj/project.pbxproj: Add -DFRAMEWORK_NAME=WebKit.
+
 2002-10-04  Richard Williamson   <rjw at apple.com>
 
         Stubs for DOM level 2 core API.
diff --git a/WebKit/Misc.subproj/WebKitLocalizableStrings.m b/WebKit/Misc.subproj/WebKitLocalizableStrings.m
new file mode 100644
index 0000000..4f41cf2
--- /dev/null
+++ b/WebKit/Misc.subproj/WebKitLocalizableStrings.m
@@ -0,0 +1,11 @@
+//
+//  WebKitLocalizableStrings.m
+//  WebKit
+//
+//  Created by Darin Adler on Fri Oct 04 2002.
+//  Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
+//
+
+#import <WebFoundation/WebLocalizableStrings.h>
+
+WebLocalizableStringsBundle WebKitLocalizableStringsBundle = { "com.apple.WebKit", 0 };
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 94ef824..b667f51 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,6 +72,7 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
+			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
@@ -143,7 +144,7 @@
 				INSTALL_PATH = "$(SYSTEM_LIBRARY_DIR)/PrivateFrameworks";
 				LIBRARY_SEARCH_PATHS = "";
 				OPTIMIZATION_CFLAGS = "-Os";
-				OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H";
+				OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DAPPLE_CHANGES -DHAVE_CONFIG_H -DFRAMEWORK_NAME=WebKit";
 				OTHER_LDFLAGS = "-seg1addr 0x7000000 -no-c++filt";
 				PRECOMPILE_PREFIX_HEADER = YES;
 				PREFIX_HEADER = WebKitPrefix.h;
@@ -378,6 +379,7 @@
 				F57D1956034E734901A80180,
 				F57D1958034E734901A80180,
 				F57D195A034E734901A80180,
+				9367C637034E9F00008635C5,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -463,6 +465,7 @@
 				F560BEBD030DAF4401C1A526,
 				F59668C802AD2923018635CA,
 				F59668C902AD2923018635CA,
+				9367C636034E9F00008635C5,
 			);
 			isa = PBXGroup;
 			name = Misc;
@@ -1447,6 +1450,18 @@
 			settings = {
 			};
 		};
+		9367C636034E9F00008635C5 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			path = WebKitLocalizableStrings.m;
+			refType = 4;
+		};
+		9367C637034E9F00008635C5 = {
+			fileRef = 9367C636034E9F00008635C5;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		93AEB17D032C1735008635CE = {
 			fileEncoding = 4;
 			isa = PBXFileReference;
@@ -2132,48 +2147,56 @@
 			refType = 4;
 		};
 		F57D194B034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMDocument.h;
 			path = DOM.subproj/WebDOMDocument.h;
 			refType = 2;
 		};
 		F57D194C034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMDocument.m;
 			path = DOM.subproj/WebDOMDocument.m;
 			refType = 2;
 		};
 		F57D194D034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMElement.h;
 			path = DOM.subproj/WebDOMElement.h;
 			refType = 2;
 		};
 		F57D194E034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMElement.m;
 			path = DOM.subproj/WebDOMElement.m;
 			refType = 2;
 		};
 		F57D194F034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMNamedNodeMap.h;
 			path = DOM.subproj/WebDOMNamedNodeMap.h;
 			refType = 2;
 		};
 		F57D1950034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMNamedNodeMap.m;
 			path = DOM.subproj/WebDOMNamedNodeMap.m;
 			refType = 2;
 		};
 		F57D1951034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMNode.h;
 			path = DOM.subproj/WebDOMNode.h;
 			refType = 2;
 		};
 		F57D1952034E734901A80180 = {
+			fileEncoding = 4;
 			isa = PBXFileReference;
 			name = WebDOMNode.m;
 			path = DOM.subproj/WebDOMNode.m;

-- 
WebKit Debian packaging