[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478

[Mike Hommey]

The following commit has been merged in the debian/unstable branch:
commit c1e95e5e58e723370bd88cb7b0d07bd3da6306e9
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Feb 21 20:56:59 2008 +0100

    Work around FTBFS on s390 differently
      * debian/rules: Revert change from 0~svn27674-3, which was obviously not
        enough.
      * WebKit.pro: Don't build testkjs, that provokes the s390 FTBFSes ; we don't
        install it anyways. Closes: #466848.

diff --git a/WebKit.pro b/WebKit.pro
index c036e25..1673736 100644
--- a/WebKit.pro
+++ b/WebKit.pro
@@ -4,8 +4,7 @@ CONFIG += ordered
 qt-port:!win32-*:SUBDIRS += WebKit/qt/Plugins
 SUBDIRS += \
         JavaScriptCore/pcre/dftables.pro \
-        WebCore \
-        JavaScriptCore/kjs/testkjs.pro
+        WebCore
 
 qt-port {
     SUBDIRS += WebKit/qt/QtLauncher
diff --git a/debian/changelog b/debian/changelog
index 5e0bab5..6f8c765 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+webkit (0~svn27674-4) UNRELEASED; urgency=low
+
+  * debian/rules: Revert change from 0~svn27674-3, which was obviously not
+    enough.
+  * WebKit.pro: Don't build testkjs, that provokes the s390 FTBFSes ; we don't
+    install it anyways. Closes: #466848.
+
+ -- Mike Hommey <glandium at debian.org>  Thu, 21 Feb 2008 20:54:07 +0100
+
 webkit (0~svn27674-3) unstable; urgency=low
 
   * debian/rules: Work around #466613 (FTBFS on s390) by building a little bit
diff --git a/debian/rules b/debian/rules
index 3bd894f..4dd4936 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,13 +9,8 @@ SO_VERSION=0d
 CFLAGS = -g -Wall
 
 ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
-ifeq ($(DEB_BUILD_ARCH),s390)
-        CFLAGS += -O1
-else
         CFLAGS += -O2
-endif
 else
-
         CFLAGS += -O0
 endif
 

-- 
WebKit Debian packaging