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

mjs mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:16:24 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit cc196b5cba86a6d70e84bc5f16109e1a5d746907
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 19 01:58:23 2002 +0000

    Tools:
    
    	Reviewed by John.
    
    	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
    
            * Scripts/set-alex-version: New the script takes 3 different
    	versions, source version, marketing version and internal version.
    
    JavaScriptCore:
    
    	Reviewed by John.
    
    	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
    
            * English.lproj/InfoPlist.strings:
            * JavaScriptCore.pbproj/project.pbxproj:
    
    WebFoundation:
    
    	Reviewed by John.
    
    	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
    
            * English.lproj/InfoPlist.strings:
            * WebFoundation.pbproj/project.pbxproj:
    
    WebCore:
    
    	Reviewed by John.
    
    	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
    
            * English.lproj/InfoPlist.strings:
    
    WebKit:
    
    	Reviewed by John.
    
    	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
    
            * English.lproj/InfoPlist.strings:
    
    WebBrowser:
    
    	Reviewed by John.
    
    	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
    
            * English.lproj/InfoPlist.strings:
            * WebBrowser.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3126 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index d6b8b25..11ea91c 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-18  Maciej Stachowiak  <mjs at apple.com>
+
+	Reviewed by John.
+
+	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
+	
+        * English.lproj/InfoPlist.strings:
+        * JavaScriptCore.pbproj/project.pbxproj:
+
 2002-12-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index d6b8b25..11ea91c 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2002-12-18  Maciej Stachowiak  <mjs at apple.com>
+
+	Reviewed by John.
+
+	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
+	
+        * English.lproj/InfoPlist.strings:
+        * JavaScriptCore.pbproj/project.pbxproj:
+
 2002-12-17  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/JavaScriptCore/English.lproj/InfoPlist.strings b/JavaScriptCore/English.lproj/InfoPlist.strings
index 2fab567..1589001 100644
Binary files a/JavaScriptCore/English.lproj/InfoPlist.strings and b/JavaScriptCore/English.lproj/InfoPlist.strings differ
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 8caaa69..fa7611e 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -65,7 +65,6 @@
 				F58C8A1D025BD408018635CA,
 				F531DDEB02F0C2DD018635CA,
 			);
-			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			mainGroup = 0867D691FE84028FC02AAC07;
 			productRefGroup = 034768DFFF38A50411DB9C8B;
@@ -151,7 +150,7 @@
 	<key>CFBundleExecutable</key>
 	<string>JavaScriptCore</string>
 	<key>CFBundleGetInfoString</key>
-	<string>0.8</string>
+	<string>1.0 Beta, Copyright 2001-2002 Apple Compupter, Inc</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
@@ -159,7 +158,7 @@
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleLongVersionString</key>
-	<string>JavaScriptCore 0.1, Copyright (c) 2001-2002 Apple Compupter</string>
+	<string>JavaScriptCore 0.1, Copyright 2001-2002 Apple Compupter</string>
 	<key>CFBundleName</key>
 	<string>JavaScriptCore</string>
 	<key>CFBundlePackageType</key>
@@ -175,6 +174,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 80a2363..aa22992 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-12-18  Maciej Stachowiak  <mjs at apple.com>
 
+	Reviewed by John.
+
+	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
+	
+        * English.lproj/InfoPlist.strings:
+
+2002-12-18  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Trey and Darin.
 
 	- fixed 3124933 - abcnews.com leads to empty window with sheet complaining about javascript: URL
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 80a2363..aa22992 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-12-18  Maciej Stachowiak  <mjs at apple.com>
 
+	Reviewed by John.
+
+	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
+	
+        * English.lproj/InfoPlist.strings:
+
+2002-12-18  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by Trey and Darin.
 
 	- fixed 3124933 - abcnews.com leads to empty window with sheet complaining about javascript: URL
diff --git a/WebCore/English.lproj/InfoPlist.strings b/WebCore/English.lproj/InfoPlist.strings
index 6cb3267..cc6b9af 100644
Binary files a/WebCore/English.lproj/InfoPlist.strings and b/WebCore/English.lproj/InfoPlist.strings differ
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 54d9b1f..fbf8303 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -66,7 +66,6 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDEC02F0C34D018635CA,
 			);
-			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
@@ -160,6 +159,8 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>WebCore</string>
+	<key>CFBundleGetInfoString</key>
+	<string>1.0 Beta, Copyright 2001-2002 Apple Computer, Inc.</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
@@ -168,8 +169,12 @@
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.8</string>
 	<key>CFBundleVersion</key>
 	<string>39</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2001-2002 Apple Computer, Inc.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 	<key>SKIP_INSTALL</key>
@@ -177,6 +182,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 07f4e0a..d61830d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2002-12-18  Maciej Stachowiak  <mjs at apple.com>
+
+	Reviewed by John.
+
+	- fixed 3131171 - Change Alex versions to satisfy both marketing and B&I requirements
+	
+        * English.lproj/InfoPlist.strings:
+
 2002-12-18  Richard Williamson   <rjw at apple.com>
 
         Fixed 3129951.  Don't allow pages that are stopping to enter the page cache.
diff --git a/WebKit/English.lproj/InfoPlist.strings b/WebKit/English.lproj/InfoPlist.strings
index b121859..93d8d32 100644
Binary files a/WebKit/English.lproj/InfoPlist.strings and b/WebKit/English.lproj/InfoPlist.strings differ
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index cc1212a..8e6a463 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -65,7 +65,6 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
-			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
@@ -167,6 +166,8 @@
 	<string>English</string>
 	<key>CFBundleExecutable</key>
 	<string>WebKit</string>
+	<key>CFBundleGetInfoString</key>
+	<string>1.0 Beta, Copyright Apple Computer, Inc. 2001-2002</string>
 	<key>CFBundleIconFile</key>
 	<string></string>
 	<key>CFBundleIdentifier</key>
@@ -175,8 +176,12 @@
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>0.8</string>
 	<key>CFBundleVersion</key>
 	<string>39</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright 2001-2002 Apple Computer, Inc.</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 	<key>SKIP_INSTALL</key>
@@ -184,6 +189,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list