[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 06:29:24 UTC 2009 

The following commit has been merged in the debian/unstable branch:
commit 78135715f6debe6dc08ec44a44d6b88c63cc3c00
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 6 04:35:02 2002 +0000

    JavaScriptCore:
    
    	- fixed 3007072 - need to be able to build fat
    
            * JavaScriptCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
    
    WebFoundation:
    
    	- fixed 3007072 - need to be able to build fat
    
            * WebFoundation.pbproj/project.pbxproj: Fixed DeploymentFat build.
    
    WebCore:
    
    	- fixed 3007072 - need to be able to build fat
    
            * WebCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
    
    WebKit:
    
    	- fixed 3007072 - need to be able to build fat
    
            * WebKit.pbproj/project.pbxproj: Fixed DeploymentFat build.
            * Makefile.am: Build WebCore-combined.exp for Development and
    	Mixed build.
            * WebKit-tests.exp: Added.
            * WebKit.exp: Remove test-only function.
    
    WebBrowser:
    
    	- fixed 3007072 - need to be able to build fat
    
            * WebBrowser.pbproj/project.pbxproj: Fixed DeploymetFat build.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1743 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 074781d..ef54027 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,9 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * JavaScriptCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
+
 === Alexander-15 ===
 
 2002-07-25  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 074781d..ef54027 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * JavaScriptCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
+
 === Alexander-15 ===
 
 2002-07-25  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 074781d..ef54027 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * JavaScriptCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
+
 === Alexander-15 ===
 
 2002-07-25  Darin Adler  <darin at apple.com>
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index 261ca4c..cb0250e 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -427,7 +427,7 @@
 			);
 			buildSettings = {
 				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_CFLAGS = "\U0001-arch ppc -arch i386";
+				i386 = YES;
 				SKIP_INSTALL = YES;
 			};
 			isa = PBXBuildStyle;
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index eeb9928..621faae 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,3 +1,9 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * WebCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
+
 2002-08-05  Darin Adler  <darin at apple.com>
 
 	- fixed 3016374 -- Change font default from small back to medium
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index eeb9928..621faae 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,9 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * WebCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
+
 2002-08-05  Darin Adler  <darin at apple.com>
 
 	- fixed 3016374 -- Change font default from small back to medium
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index eeb9928..621faae 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,9 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * WebCore.pbproj/project.pbxproj: Fixed DeploymentFat build.
+
 2002-08-05  Darin Adler  <darin at apple.com>
 
 	- fixed 3016374 -- Change font default from small back to medium
diff --git a/WebCore/WebCore.pbproj/project.pbxproj b/WebCore/WebCore.pbproj/project.pbxproj
index 5ce6dea..e1e39a5 100644
--- a/WebCore/WebCore.pbproj/project.pbxproj
+++ b/WebCore/WebCore.pbproj/project.pbxproj
@@ -3639,7 +3639,7 @@
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
 				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_CFLAGS = "\U0001-arch ppc -arch i386";
+				i386 = YES;
 				SKIP_INSTALL = YES;
 			};
 			isa = PBXBuildStyle;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 838aa0c..07e227d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * WebKit.pbproj/project.pbxproj: Fixed DeploymentFat build.
+        * Makefile.am: Build WebCore-combined.exp for Development and
+	Mixed build.
+        * WebKit-tests.exp: Added.
+        * WebKit.exp: Remove test-only function.
+
 2002-08-05  Darin Adler  <darin at apple.com>
 
 	Do the wiring for the "text size multiplier" feature. The rest of the work will probably be done
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 838aa0c..07e227d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,13 @@
+2002-08-05  Maciej Stachowiak  <mjs at apple.com>
+
+	- fixed 3007072 - need to be able to build fat
+	
+        * WebKit.pbproj/project.pbxproj: Fixed DeploymentFat build.
+        * Makefile.am: Build WebCore-combined.exp for Development and
+	Mixed build.
+        * WebKit-tests.exp: Added.
+        * WebKit.exp: Remove test-only function.
+
 2002-08-05  Darin Adler  <darin at apple.com>
 
 	Do the wiring for the "text size multiplier" feature. The rest of the work will probably be done
diff --git a/WebKit/Makefile.am b/WebKit/Makefile.am
index 5a9ff6c..37d54a2 100644
--- a/WebKit/Makefile.am
+++ b/WebKit/Makefile.am
@@ -6,6 +6,13 @@ clean-am:
 	rm -rf $(SYMROOTS)/WebKit.framework
 	rm -rf $(SYMROOTS)/Alexander.app/Frameworks/WebKit.framework
 
+WebKit-combined.exp: WebKit.exp WebKit-tests.exp
+	cat $^ > $@
+
+noinst_DATA = WebKit-combined.exp
+BUILT_SOURCES = $(noinst_DATA)
+CLEANFILES = $(BUILT_SOURCES)
+
 all: previous-clean-timestamp
 previous-clean-timestamp: force-clean-timestamp
 	make clean && touch $@
diff --git a/WebKit/WebKit-tests.exp b/WebKit/WebKit-tests.exp
new file mode 100644
index 0000000..150057a
--- /dev/null
+++ b/WebKit/WebKit-tests.exp
@@ -0,0 +1 @@
+_WebKitLog
diff --git a/WebKit/WebKit.exp b/WebKit/WebKit.exp
index f64fc61..338cb02 100644
--- a/WebKit/WebKit.exp
+++ b/WebKit/WebKit.exp
@@ -22,4 +22,3 @@
 .objc_class_name_WebStringTruncator
 .objc_class_name_WebURLsWithTitles
 .objc_class_name_WebView
-_WebKitLog
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index ef34860..b69191e 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -12,6 +12,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DEBUG_CFLAGS = "";
+                                EXPORTED_SYMBOLS_FILES = "WebKit-combined.exp";
 				FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OPTIMIZATION_CFLAGS = "-O0";
@@ -1512,7 +1513,7 @@
 			buildSettings = {
 				FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
 				INSTALL_PATH = "@executable_path/../Frameworks";
-				OTHER_CFLAGS = "\U0001-arch ppc -arch i386";
+				i386 = YES;
 				SKIP_INSTALL = YES;
 			};
 			isa = PBXBuildStyle;
@@ -1659,6 +1660,7 @@
 				COPY_PHASE_STRIP = NO;
 				DEBUGGING_SYMBOLS = YES;
 				DEBUG_CFLAGS = "";
+                                EXPORTED_SYMBOLS_FILES = "WebKit-combined.exp";
 				FRAMEWORK_SEARCH_PATHS = "\U0001 at executable_path/../Frameworks";
 				INSTALL_PATH = "@executable_path/../Frameworks";
 				OPTIMIZATION_CFLAGS = "-O";

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list