[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.1-2-29-g5dbcb1c

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit 5dbcb1cc07481125b3401ea68879407015c8500e
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Mon Jun 28 23:26:44 2010 -0400

    correct a build failure in cve-2010-1421.patch
    drop 01-fix-bashism-in-build.diff (this is automatically corrected
    by the system libtool)

diff --git a/WebKitTools/DumpRenderTree/LayoutTestController.cpp b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
index 9d0f9d6..9287f45 100644
--- a/WebKitTools/DumpRenderTree/LayoutTestController.cpp
+++ b/WebKitTools/DumpRenderTree/LayoutTestController.cpp
@@ -1498,6 +1498,7 @@ JSStaticFunction* LayoutTestController::staticFunctions()
         { "setWillSendRequestReturnsNull", setWillSendRequestReturnsNullCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "setWillSendRequestReturnsNullOnRedirect", setWillSendRequestReturnsNullOnRedirectCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "setWindowIsKey", setWindowIsKeyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+        { "setJavaScriptCanAccessClipboard", setJavaScriptCanAccessClipboardCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "showWebInspector", showWebInspectorCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "testOnscreen", testOnscreenCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
         { "testRepaint", testRepaintCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
@@ -1576,4 +1577,3 @@ void LayoutTestController::setPOSIXLocale(JSStringRef locale)
 
 const unsigned LayoutTestController::maxViewWidth = 800;
 const unsigned LayoutTestController::maxViewHeight = 600;
-        { "setJavaScriptCanAccessClipboard", setJavaScriptCanAccessClipboardCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
diff --git a/debian/changelog b/debian/changelog
index bad9707..fb66d82 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 webkit (1.2.1-3) UNRELEASED; urgency=low
 
   * Use system libtool.
+  - Drop 01-fix-bashism-in-build.diff (handled automatically by system libtool).
   * Turn direct source changes into a patch.
   * Fix cve-2010-1368: geolocation information disclosure.
   * Fix cve-2010-1392: possible code execution in html button logic.
diff --git a/debian/patches/01-fix-bashism-in-build.diff b/debian/patches/01-fix-bashism-in-build.diff
deleted file mode 100644
index c1c5d33..0000000
--- a/debian/patches/01-fix-bashism-in-build.diff
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/GNUmakefile.in b/GNUmakefile.in
-index 68bcc1c..2a63213 100644
---- a/GNUmakefile.in
-+++ b/GNUmakefile.in
-@@ -9214,7 +9214,9 @@ libWebCoreJS_depfiles := $(patsubst \
- webinspectordir = ${datadir}/webkit-1.0/webinspector
- dist_webinspector_DATA = \
- 	$(WebCore)/English.lproj/localizedStrings.js \
--	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
-+	$(shell ls $(WebCore)/inspector/front-end/*.js) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.html) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.css)
- 
- webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
- dist_webinspectorimages_DATA = \
-diff --git a/WebCore/GNUmakefile.am b/WebCore/GNUmakefile.am
-index 416f00c..fb45261 100644
---- a/WebCore/GNUmakefile.am
-+++ b/WebCore/GNUmakefile.am
-@@ -3768,7 +3768,9 @@ webcore_dist += \
- webinspectordir = ${datadir}/webkit-1.0/webinspector
- dist_webinspector_DATA = \
- 	$(WebCore)/English.lproj/localizedStrings.js \
--	$(shell ls $(WebCore)/inspector/front-end/*.{js,html,css})
-+	$(shell ls $(WebCore)/inspector/front-end/*.js) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.html) \
-+	$(shell ls $(WebCore)/inspector/front-end/*.css)
- 
- webinspectorimagesdir = ${datadir}/webkit-1.0/webinspector/Images
- dist_webinspectorimages_DATA = \
diff --git a/debian/patches/cve-2010-1421.patch b/debian/patches/cve-2010-1421.patch
index 4c04ec0..12017a6 100644
--- a/debian/patches/cve-2010-1421.patch
+++ b/debian/patches/cve-2010-1421.patch
@@ -161,7 +161,7 @@ Index: webkit-1.2.1/WebCore/editing/EditorCommand.cpp
 Index: webkit-1.2.1/WebCore/page/Settings.h
 ===================================================================
 --- webkit-1.2.1.orig/WebCore/page/Settings.h	2010-05-13 16:31:30.000000000 -0400
-+++ webkit-1.2.1/WebCore/page/Settings.h	2010-06-28 21:36:35.000000000 -0400
++++ webkit-1.2.1/WebCore/page/Settings.h	2010-06-28 23:17:55.000000000 -0400
 @@ -122,6 +122,9 @@
          void setJavaScriptCanOpenWindowsAutomatically(bool);
          bool javaScriptCanOpenWindowsAutomatically() const { return m_javaScriptCanOpenWindowsAutomatically; }
@@ -183,7 +183,7 @@ Index: webkit-1.2.1/WebCore/page/Settings.h
 Index: webkit-1.2.1/WebCore/page/Settings.cpp
 ===================================================================
 --- webkit-1.2.1.orig/WebCore/page/Settings.cpp	2010-05-13 16:31:30.000000000 -0400
-+++ webkit-1.2.1/WebCore/page/Settings.cpp	2010-06-28 21:36:35.000000000 -0400
++++ webkit-1.2.1/WebCore/page/Settings.cpp	2010-06-28 23:17:55.000000000 -0400
 @@ -79,6 +79,7 @@
      , m_allowUniversalAccessFromFileURLs(true)
      , m_allowFileAccessFromFileURLs(true)
@@ -239,7 +239,7 @@ Index: webkit-1.2.1/WebKitTools/DumpRenderTree/gtk/LayoutTestControllerGtk.cpp
 Index: webkit-1.2.1/WebKitTools/DumpRenderTree/LayoutTestController.cpp
 ===================================================================
 --- webkit-1.2.1.orig/WebKitTools/DumpRenderTree/LayoutTestController.cpp	2010-05-13 16:31:30.000000000 -0400
-+++ webkit-1.2.1/WebKitTools/DumpRenderTree/LayoutTestController.cpp	2010-06-28 21:36:35.000000000 -0400
++++ webkit-1.2.1/WebKitTools/DumpRenderTree/LayoutTestController.cpp	2010-06-28 23:18:26.000000000 -0400
 @@ -902,6 +902,18 @@
      return JSValueMakeUndefined(context);
  }
@@ -259,11 +259,14 @@ Index: webkit-1.2.1/WebKitTools/DumpRenderTree/LayoutTestController.cpp
  static JSValueRef setXSSAuditorEnabledCallback(JSContextRef context, JSObjectRef function, JSObjectRef thisObject, size_t argumentCount, const JSValueRef arguments[], JSValueRef* exception)
  {
      // Has mac & windows implementation
-@@ -1564,3 +1576,4 @@
- 
- const unsigned LayoutTestController::maxViewWidth = 800;
- const unsigned LayoutTestController::maxViewHeight = 600;
+@@ -1486,6 +1498,7 @@
+         { "setWillSendRequestReturnsNull", setWillSendRequestReturnsNullCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+         { "setWillSendRequestReturnsNullOnRedirect", setWillSendRequestReturnsNullOnRedirectCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+         { "setWindowIsKey", setWindowIsKeyCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
 +        { "setJavaScriptCanAccessClipboard", setJavaScriptCanAccessClipboardCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+         { "showWebInspector", showWebInspectorCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+         { "testOnscreen", testOnscreenCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
+         { "testRepaint", testRepaintCallback, kJSPropertyAttributeReadOnly | kJSPropertyAttributeDontDelete },
 Index: webkit-1.2.1/WebKitTools/DumpRenderTree/LayoutTestController.h
 ===================================================================
 --- webkit-1.2.1.orig/WebKitTools/DumpRenderTree/LayoutTestController.h	2010-05-13 16:31:30.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
index 2bc3c13..716d91a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01-fix-bashism-in-build.diff
 02-pool-fixup-and-sparc-support.patch
 03-use-system-libtool.patch
 

-- 
WebKit Debian packaging