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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 70c0d4749c8eaa0a4aec3e8d9e46fb02d9f4115c
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jul 14 20:10:36 2003 +0000

    	Rolled in fix from Safari-89-branch
    
        2003-07-12  Maciej Stachowiak  <mjs at apple.com>
    
    	Try to fix OS build by making the Frameworks link in both SYMROOT
    	and DSTROOT, and at both build time and install time.
    
            * WebKit.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4649 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 44617db..dbad8cd 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-14  Maciej Stachowiak  <mjs at apple.com>
+
+	Rolled in fix from Safari-89-branch
+	
+    2003-07-12  Maciej Stachowiak  <mjs at apple.com>
+
+	Try to fix OS build by making the Frameworks link in both SYMROOT
+	and DSTROOT, and at both build time and install time.
+
+        * WebKit.pbproj/project.pbxproj:
+
 2003-07-14  Dave Hyatt  <hyatt at apple.com>
 
 	Roll this change out.  It was a bad change that I only made
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index d2a4449..5fd2e32 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -1679,7 +1679,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 1;
 			shellPath = /bin/sh;
-			shellScript = "ln -sf Versions/Current/Frameworks ${SYMROOT}/WebKit.framework/Frameworks; ln -sf Versions/Current/Frameworks ${DSTROOT}/System/Library/WebKit.framework/Frameworks; echo -n \"\"";
+			shellScript = "ln -sf Versions/Current/Frameworks ${SYMROOT}/WebKit.framework/Frameworks; ln -sf Versions/Current/Frameworks ${DSTROOT}/System/Library/Frameworks/WebKit.framework/Frameworks; echo -n \"\"";
 		};
 		6578F5DE045F817400000128 = {
 			expectedFileType = sourcecode.c.h;
@@ -1789,7 +1789,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "ln -sf Versions/Current/Frameworks ${SYMROOT}/WebKit.framework/Frameworks; ln -sf Versions/Current/Frameworks ${DSTROOT}/System/Library/WebKit.framework/Frameworks; echo -n \"\"";
+			shellScript = "ln -sf Versions/Current/Frameworks ${SYMROOT}/WebKit.framework/Frameworks; ln -sf Versions/Current/Frameworks ${DSTROOT}/System/Library/Frameworks/WebKit.framework/Frameworks; echo -n \"\"";
 		};
 //650
 //651

-- 
WebKit Debian packaging