[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 a1b11253f1c006a6fb20af94c89adf08fd0b77ff
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 27 23:22:41 2003 +0000

    	Rolled in fix from Safari-80~1-branch
    
        2003-05-27  Maciej Stachowiak  <mjs at apple.com>
    
    	Reviewed by Darin.
    
            * WebKit.pbproj/project.pbxproj: Removed no longer needed and harmful flag.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4436 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 09aff84..53c26ce 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-05-27  Maciej Stachowiak  <mjs at apple.com>
+
+	Rolled in fix from Safari-80~1-branch
+	
+    2003-05-27  Maciej Stachowiak  <mjs at apple.com>
+        
+	Reviewed by Darin.
+
+        * WebKit.pbproj/project.pbxproj: Removed no longer needed and harmful flag.
+
 2003-05-27  Richard Williamson   <rjw at apple.com>
 
 	Fix for IB.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index fb00f3d..428fa98 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -144,7 +144,7 @@
 				MACOSX_DEPLOYMENT_TARGET = 10.2;
 				OPTIMIZATION_CFLAGS = "-Os";
 				OTHER_CFLAGS = "$(DEBUG_CFLAGS) -DFRAMEWORK_NAME=WebKit";
-				OTHER_LDFLAGS = "-no-c++filt -seg_addr_table_filename \"${SYSTEM_LIBRARY_DIR}/PrivateFrameworks/${PRODUCT_NAME}.framework/Versions/${FRAMEWORK_VERSION}/${PRODUCT_NAME}\" -sub_umbrella WebCore -sub_umbrella JavaScriptCore";
+				OTHER_LDFLAGS = "-no-c++filt -sub_umbrella WebCore -sub_umbrella JavaScriptCore";
 				PRECOMPILE_PREFIX_HEADER = YES;
 				PREFIX_HEADER = WebKitPrefix.h;
 				PRODUCT_NAME = WebKit;
@@ -183,6 +183,7 @@
 </dict>
 </plist>
 ";
+			shouldUseHeadermap = 0;
 		};
 		0867D69DFE84028FC02AAC07 = {
 			buildActionMask = 2147483647;

-- 
WebKit Debian packaging