[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
mitz at apple.com
mitz at apple.com
Thu Apr 8 00:53:40 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 0b4d7aaa47985980c364e7067c80afa0362fe9b2
Author: mitz at apple.com <mitz at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 4 18:55:26 2010 +0000
Updated copyright string
Reviewed by Ada Chan and Mark Rowe.
JavaScriptCore:
* Info.plist:
* JavaScriptCore.vcproj/JavaScriptCore.resources/Info.plist:
* JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc:
JavaScriptGlue:
* Info.plist:
WebCore:
* Info.plist:
* WebCore.vcproj/QTMovieWin.rc:
WebKit/mac:
* Info.plist:
WebKit/win:
* WebKit.vcproj/WebKit.rc:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52749 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 38fa72b..a991daf 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-01-04 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Ada Chan and Mark Rowe.
+
+ Updated copyright string
+
+ * Info.plist:
+ * JavaScriptCore.vcproj/JavaScriptCore.resources/Info.plist:
+ * JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc:
+
2010-01-04 Adam Roben <aroben at apple.com>
No review, rolling out r52741.
diff --git a/JavaScriptCore/Info.plist b/JavaScriptCore/Info.plist
index 17949b0..77c9eb8 100644
--- a/JavaScriptCore/Info.plist
+++ b/JavaScriptCore/Info.plist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2009 Apple Inc.; Copyright 1999-2001 Harri Porten <porten at kde.org>; Copyright 2001 Peter Kelly <pmk at post.com>; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2010 Apple Inc.; Copyright 1999-2001 Harri Porten <porten at kde.org>; Copyright 2001 Peter Kelly <pmk at post.com>; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.resources/Info.plist b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.resources/Info.plist
index bccf2b5..7de8638 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.resources/Info.plist
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore.resources/Info.plist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>JavaScriptCore</string>
<key>CFBundleGetInfoString</key>
- <string>530, Copyright 2003-2009 Apple Inc.</string>
+ <string>530, Copyright 2003-2010 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.JavaScriptCore</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
index ba59bb8..861fa3a 100644
--- a/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
+++ b/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.rc
@@ -34,7 +34,7 @@ BEGIN
VALUE "FileVersion", __VERSION_TEXT__
VALUE "CompanyName", "Apple Inc."
VALUE "InternalName", "JavaScriptCore"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2009"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2010"
VALUE "OriginalFilename", "JavaScriptCore.dll"
VALUE "ProductName", " JavaScriptCore"
VALUE "ProductVersion", __VERSION_TEXT__
diff --git a/JavaScriptGlue/ChangeLog b/JavaScriptGlue/ChangeLog
index 669cd5e..ab24d98 100644
--- a/JavaScriptGlue/ChangeLog
+++ b/JavaScriptGlue/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-04 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Ada Chan and Mark Rowe.
+
+ Updated copyright string
+
+ * Info.plist:
+
2009-12-21 Gavin Barraclough <barraclough at apple.com>
Reviewed by Darin Adler.
diff --git a/JavaScriptGlue/Info.plist b/JavaScriptGlue/Info.plist
index 0150e76..7232293 100644
--- a/JavaScriptGlue/Info.plist
+++ b/JavaScriptGlue/Info.plist
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>CFBundleDevelopmentRegion</key>
- <string>English</string>
- <key>CFBundleExecutable</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2009 Apple Inc.</string>
- <key>CFBundleIdentifier</key>
- <string>com.apple.${PRODUCT_NAME}</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>${PRODUCT_NAME}</string>
- <key>CFBundlePackageType</key>
- <string>FMWK</string>
- <key>CFBundleShortVersionString</key>
- <string>${SHORT_VERSION_STRING}</string>
- <key>CFBundleVersion</key>
- <string>${BUNDLE_VERSION}</string>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>English</string>
+ <key>CFBundleExecutable</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundleGetInfoString</key>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2010 Apple Inc.</string>
+ <key>CFBundleIdentifier</key>
+ <string>com.apple.${PRODUCT_NAME}</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>${PRODUCT_NAME}</string>
+ <key>CFBundlePackageType</key>
+ <string>FMWK</string>
+ <key>CFBundleShortVersionString</key>
+ <string>${SHORT_VERSION_STRING}</string>
+ <key>CFBundleVersion</key>
+ <string>${BUNDLE_VERSION}</string>
</dict>
</plist>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index a5ce6cf..5dd2cc4 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-04 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Ada Chan and Mark Rowe.
+
+ Updated copyright string
+
+ * Info.plist:
+ * WebCore.vcproj/QTMovieWin.rc:
+
2010-01-04 Chris Fleizach <cfleizach at apple.com>
Reviewed by Darin Adler.
diff --git a/WebCore/Info.plist b/WebCore/Info.plist
index 525a372..9c24f98 100644
--- a/WebCore/Info.plist
+++ b/WebCore/Info.plist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2009 Apple Inc.; Copyright 1997 Martin Jones <mjones at kde.org>; Copyright 1998, 1999 Torben Weis <weis at kde.org>; Copyright 1998, 1999, 2002 Waldo Bastian <bastian at kde.org>; Copyright 1998-2000 Lars Knoll <knoll at kde.org>; Copyright 1999, 2001 Antti Koivisto <koivisto at kde.org>; Copyright 1999-2001 Harri Porten <porten at kde.org>; Copyright 2000 Simon Hausmann <hausmann at kde.org>; Copyright 2000, 2001 Dirk Mueller <mueller at kde.org>; Copyright 2000, 2001 Peter Kelly <pmk at post.com>; Copyright 2000 Daniel Molkentin <molkentin at kde.org>; Copyright 2000 Stefan Schimanski <schimmi at kde.org>; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2010 Apple Inc.; Copyright 1997 Martin Jones <mjones at kde.org>; Copyright 1998, 1999 Torben Weis <weis at kde.org>; Copyright 1998, 1999, 2002 Waldo Bastian <bastian at kde.org>; Copyright 1998-2000 Lars Knoll <knoll at kde.org>; Copyright 1999, 2001 Antti Koivisto <koivisto at kde.org>; Copyright 1999-2001 Harri Porten <porten at kde.org>; Copyright 2000 Simon Hausmann <hausmann at kde.org>; Copyright 2000, 2001 Dirk Mueller <mueller at kde.org>; Copyright 2000, 2001 Peter Kelly <pmk at post.com>; Copyright 2000 Daniel Molkentin <molkentin at kde.org>; Copyright 2000 Stefan Schimanski <schimmi at kde.org>; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/WebCore/WebCore.vcproj/QTMovieWin.rc b/WebCore/WebCore.vcproj/QTMovieWin.rc
index cbc8918..459679b 100644
--- a/WebCore/WebCore.vcproj/QTMovieWin.rc
+++ b/WebCore/WebCore.vcproj/QTMovieWin.rc
@@ -34,7 +34,7 @@ BEGIN
VALUE "FileVersion", __VERSION_TEXT__
VALUE "CompanyName", "Apple Inc."
VALUE "InternalName", "WebKit"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2009"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2007-2010"
VALUE "OriginalFilename", "QTMovieWin.dll"
VALUE "ProductName", "WebKit"
VALUE "ProductVersion", __VERSION_TEXT__
diff --git a/WebKit/mac/ChangeLog b/WebKit/mac/ChangeLog
index ba250b6..d7ba342 100644
--- a/WebKit/mac/ChangeLog
+++ b/WebKit/mac/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-04 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Ada Chan and Mark Rowe.
+
+ Updated copyright string
+
+ * Info.plist:
+
2009-12-27 Maciej Stachowiak <mjs at apple.com>
Reviewed by Alexey Proskuryakov.
diff --git a/WebKit/mac/Info.plist b/WebKit/mac/Info.plist
index 849742c..7232293 100644
--- a/WebKit/mac/Info.plist
+++ b/WebKit/mac/Info.plist
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2009 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2010 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
diff --git a/WebKit/win/ChangeLog b/WebKit/win/ChangeLog
index 9837335..784208d 100644
--- a/WebKit/win/ChangeLog
+++ b/WebKit/win/ChangeLog
@@ -1,3 +1,11 @@
+2010-01-04 Dan Bernstein <mitz at apple.com>
+
+ Reviewed by Ada Chan and Mark Rowe.
+
+ Updated copyright string
+
+ * WebKit.vcproj/WebKit.rc:
+
2009-12-22 Darin Adler <darin at apple.com>
Another try at fixing Windows build.
diff --git a/WebKit/win/WebKit.vcproj/WebKit.rc b/WebKit/win/WebKit.vcproj/WebKit.rc
index c4b269e..fa57ca3 100644
--- a/WebKit/win/WebKit.vcproj/WebKit.rc
+++ b/WebKit/win/WebKit.vcproj/WebKit.rc
@@ -42,7 +42,7 @@ BEGIN
VALUE "FileVersion", __VERSION_TEXT__
VALUE "CompanyName", "Apple Inc."
VALUE "InternalName", "WebKit"
- VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2009"
+ VALUE "LegalCopyright", "Copyright Apple Inc. 2003-2010"
VALUE "OriginalFilename", "WebKit.dll"
VALUE "ProductName", "WebKit"
VALUE "ProductVersion", __BUILD_NUMBER_SHORT__
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list