[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 b397bd1039bfcd1b9a7a8120c011c43d3edeb978
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Apr 2 23:01:22 2002 +0000

    	* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
    	the project builds with gcc3.
    
    	* kjs/nodes.cpp: Avoid including an obsolete header to avoid
    	warning with gcc3.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@941 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 0543822..07fb888 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,11 @@
+2002-04-02  Maciej Stachowiak  <mjs at apple.com>
+
+	* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
+	the project builds with gcc3.
+	
+	* kjs/nodes.cpp: Avoid including an obsolete header to avoid
+	warning with gcc3.
+
 2002-04-02  Darin Adler  <darin at apple.com>
 
 	* kjs/property_map.cpp: (PropertyMap::~PropertyMap): Deallocate the
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index 0543822..07fb888 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,3 +1,11 @@
+2002-04-02  Maciej Stachowiak  <mjs at apple.com>
+
+	* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
+	the project builds with gcc3.
+	
+	* kjs/nodes.cpp: Avoid including an obsolete header to avoid
+	warning with gcc3.
+
 2002-04-02  Darin Adler  <darin at apple.com>
 
 	* kjs/property_map.cpp: (PropertyMap::~PropertyMap): Deallocate the
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index 0543822..07fb888 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,3 +1,11 @@
+2002-04-02  Maciej Stachowiak  <mjs at apple.com>
+
+	* JavaScriptCore.pbproj/project.pbxproj: Pass -Wno-format-y2k so
+	the project builds with gcc3.
+	
+	* kjs/nodes.cpp: Avoid including an obsolete header to avoid
+	warning with gcc3.
+
 2002-04-02  Darin Adler  <darin at apple.com>
 
 	* kjs/property_map.cpp: (PropertyMap::~PropertyMap): Deallocate the
diff --git a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
index f06d259..6c367d2 100644
--- a/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
+++ b/JavaScriptCore/JavaScriptCore.pbproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 38;
+	objectVersion = 36;
 	objects = {
 		014CEA440018CDF011CA2923 = {
 			buildRules = (
@@ -118,7 +118,7 @@
 				HEADER_SEARCH_PATHS = "";
 				INSTALL_PATH = /System/Library/PrivateFrameworks;
 				LIBRARY_SEARCH_PATHS = "";
-				OTHER_CFLAGS = "-Wall -Werror -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -DAPPLE_CHANGES -DHAVE_CONFIG_H";
+				OTHER_CFLAGS = "-Wall -Werror -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wcast-align -Wsign-compare -Wno-format-y2k -DAPPLE_CHANGES -DHAVE_CONFIG_H";
 				PRODUCT_NAME = JavaScriptCore;
 				SECTORDER_FLAGS = "";
 				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 183b4c8..4bca71e 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -24,7 +24,11 @@
 #include "nodes.h"
 
 #include <assert.h>
+#ifdef APPLE_CHANGES
+#include <iostream>
+#else
 #include <iostream.h>
+#endif
 #include <math.h>
 #include <stdio.h>
 #ifdef KJS_DEBUG_MEM

-- 
WebKit Debian packaging