[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:46:20 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit a0abef03925f8ac42c88fa263359bab0fbb5f327
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Jul 8 01:23:51 2003 +0000
JavaScriptCore:
Reviewed by John.
- fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
* WebCore.pbproj/project.pbxproj: Install in WebKit.framework/Versions/A/Frameworks.
WebCore:
Reviewed by John.
- fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
* WebCore.pbproj/project.pbxproj: Install in WebKit.framework/Versions/A/Frameworks.
WebKit:
Reviewed by John.
- fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
* WebKit.pbproj/project.pbxproj: Make a link from Frameworks to Versions/A/Frameworks.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4599 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index c9f0266..037674d 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-07 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
+
+ * WebCore.pbproj/project.pbxproj: Install in WebKit.framework/Versions/A/Frameworks.
+
=== Safari-88 ===
2003-07-02 Maciej Stachowiak <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index c9f0266..037674d 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-07-07 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
+
+ * WebCore.pbproj/project.pbxproj: Install in WebKit.framework/Versions/A/Frameworks.
+
=== Safari-88 ===
2003-07-02 Maciej Stachowiak <mjs at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 22f563b..4deb595 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -130,7 +130,7 @@
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = "";
- INSTALL_PATH = "${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Frameworks";
+ INSTALL_PATH = "${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Versions/A/Frameworks";
LIBRARY_SEARCH_PATHS = "";
LOCAL_SEG1_ADDR = 0x8000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
@@ -149,7 +149,7 @@
);
isa = PBXFrameworkTarget;
name = JavaScriptCore;
- productInstallPath = "${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Frameworks";
+ productInstallPath = "${SYSTEM_LIBRARY_DIR}/Frameworks/WebKit.framework/Versions/A/Frameworks";
productName = JavaScriptCore;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index ea6a458..2d99201 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2003-07-07 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
+
+ * WebCore.pbproj/project.pbxproj: Install in WebKit.framework/Versions/A/Frameworks.
+
=== Safari-88 ===
2003-07-03 John Sullivan <sullivan at apple.com>
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index ea6a458..2d99201 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,11 @@
+2003-07-07 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
+
+ * WebCore.pbproj/project.pbxproj: Install in WebKit.framework/Versions/A/Frameworks.
+
=== Safari-88 ===
2003-07-03 John Sullivan <sullivan at apple.com>
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index c6b112b..24d889f 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -145,7 +145,7 @@
FRAMEWORK_VERSION = A;
GCC_TREAT_WARNINGS_AS_ERRORS = YES;
HEADER_SEARCH_PATHS = ForwardingHeaders;
- INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Frameworks;
+ INSTALL_PATH = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
LIBRARY_SEARCH_PATHS = "";
LOCAL_SEG1_ADDR = 0x9000000;
MACOSX_DEPLOYMENT_TARGET = 10.2;
@@ -166,7 +166,7 @@
);
isa = PBXFrameworkTarget;
name = WebCore;
- productInstallPath = /System/Library/Frameworks/WebKit.framework/Frameworks;
+ productInstallPath = /System/Library/Frameworks/WebKit.framework/Versions/A/Frameworks;
productName = WebKit;
productReference = 034768E0FF38A50411DB9C8B;
productSettingsXML = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 35a7632..c625449 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,11 @@
+2003-07-07 Maciej Stachowiak <mjs at apple.com>
+
+ Reviewed by John.
+
+ - fixed 3295916 - b/c JavaScriptCore and WebCore are installing in wrong location, private headers are public
+
+ * WebKit.pbproj/project.pbxproj: Make a link from Frameworks to Versions/A/Frameworks.
+
=== Safari-88 ===
2003-07-07 Darin Adler <darin at apple.com>
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index e6bd456..4cbe170 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -140,6 +140,7 @@
0867D69FFE84028FC02AAC07,
0867D6A0FE84028FC02AAC07,
255AF6590250FC030ECA149E,
+ 65CBE7AA04B53388006ACFE6,
);
buildSettings = {
COPY_PHASE_STRIP = NO;
@@ -1763,6 +1764,19 @@
settings = {
};
};
+ 65CBE7AA04B53388006ACFE6 = {
+ buildActionMask = 2147483647;
+ files = (
+ );
+ generatedFileNames = (
+ );
+ isa = PBXShellScriptBuildPhase;
+ neededFileNames = (
+ );
+ runOnlyForDeploymentPostprocessing = 0;
+ shellPath = /bin/sh;
+ shellScript = "ln -sf Versions/A/Frameworks ${SYMROOT}/WebKit.framework/Frameworks";
+ };
//650
//651
//652
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list