[SCM] WebKit Debian packaging branch, debian, updated. 0+svn27674-1-3-gff7af1e

[Mike Hommey]

The branch, debian has been updated
       via  ff7af1e2b5d47fe6caf39df02761ccbc69992ea8 (commit)
       via  0b227e097e7eb29e380fb30c463148a8c05d83f2 (commit)
       via  94899e084358ca90a1fa013b276f3b4e2de407dd (commit)
      from  58f9916e820077beb0ce2148a281f2bf01187212 (commit)


- Shortlog ------------------------------------------------------------
ff7af1e Release 0~svn27674-2
0b227e0 Add dependencies on necessary development packages
94899e0 Fix FTBFS due to lack of -lpthread on the linker command line

Summary of changes:
 JavaScriptCore/JavaScriptCore.pri |    4 ++++
 debian/changelog                  |    9 +++++++++
 debian/control                    |    4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit ff7af1e2b5d47fe6caf39df02761ccbc69992ea8
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Dec 15 11:05:18 2007 +0100

    Release 0~svn27674-2

diff --git a/debian/changelog b/debian/changelog
index 59d227b..ae0deea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,11 @@
-webkit (0~svn27674-2) UNRELEASED; urgency=low
+webkit (0~svn27674-2) unstable; urgency=low
 
   * JavaScriptCore/JavaScriptCore.pri: cherry-picked change from revision
     28692 to fix FTBFS due to lack of -lpthread on the linker command line.
   * debian/control: Add dependencies on necessary development packages
     (essentially for header files) to our own development packages.
 
- -- Mike Hommey <glandium at debian.org>  Thu, 13 Dec 2007 21:45:56 +0100
+ -- Mike Hommey <glandium at debian.org>  Sat, 15 Dec 2007 11:04:47 +0100
 
 webkit (0~svn27674-1) unstable; urgency=low
 

commit 0b227e097e7eb29e380fb30c463148a8c05d83f2
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Dec 13 22:40:18 2007 +0100

    Add dependencies on necessary development packages
      * debian/control: Add dependencies on necessary development packages
        (essentially for header files) to our own development packages.

diff --git a/debian/changelog b/debian/changelog
index 0f2fd6a..59d227b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ webkit (0~svn27674-2) UNRELEASED; urgency=low
 
   * JavaScriptCore/JavaScriptCore.pri: cherry-picked change from revision
     28692 to fix FTBFS due to lack of -lpthread on the linker command line.
+  * debian/control: Add dependencies on necessary development packages
+    (essentially for header files) to our own development packages.
 
  -- Mike Hommey <glandium at debian.org>  Thu, 13 Dec 2007 21:45:56 +0100
 
diff --git a/debian/control b/debian/control
index 77e5f28..3c400c0 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Package: libqtwebkit-dev
 Section: libdevel
 Priority: extra
 Architecture: all
-Depends: libqtwebkit0d (>= ${source:Upstream-Version}), libqtwebkit0d (<< ${source:Version}.1~)
+Depends: libqtwebkit0d (>= ${source:Upstream-Version}), libqtwebkit0d (<< ${source:Version}.1~), libqt4-dev
 Description: Web content engine library for Qt - Development files
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and
  used primarily in Apple's Safari browser.  It is made to be embedded in
@@ -77,7 +77,7 @@ Package: libwebkitgtk-dev
 Section: libdevel
 Priority: extra
 Architecture: all
-Depends: libwebkitgtk0d (>= ${source:Upstream-Version}), libwebkitgtk0d (<< ${source:Version}.1~)
+Depends: libwebkitgtk0d (>= ${source:Upstream-Version}), libwebkitgtk0d (<< ${source:Version}.1~), libglib2.0-dev, libgtk2.0-dev
 Conflicts: libwebkitgdk-dev
 Description: Web content engine library for Gtk+ - Development files
  WebKit is a web content engine, derived from KHTML and KJS from KDE, and

commit 94899e084358ca90a1fa013b276f3b4e2de407dd
Author: Mike Hommey <glandium at debian.org>
Date:   Thu Dec 13 21:48:54 2007 +0100

    Fix FTBFS due to lack of -lpthread on the linker command line
      * JavaScriptCore/JavaScriptCore.pri: cherry-picked change from revision
        28692 to fix FTBFS due to lack of -lpthread on the linker command line.

diff --git a/JavaScriptCore/JavaScriptCore.pri b/JavaScriptCore/JavaScriptCore.pri
index 979cc21..11f5bf3 100644
--- a/JavaScriptCore/JavaScriptCore.pri
+++ b/JavaScriptCore/JavaScriptCore.pri
@@ -9,6 +9,10 @@ qt-port:INCLUDEPATH += $$PWD/bindings/qt
 qt-port:DEFINES += BUILDING_QT__
 gtk-port:DEFINES += BUILDING_GTK__
 
+# http://bugs.webkit.org/show_bug.cgi?id=16406
+# [Gtk] JavaScriptCore needs -lpthread
+gtk-port:!win32-*:LIBS += -lpthread
+
 win32-msvc*: INCLUDEPATH += $$PWD/os-win32
 
 include(pcre/pcre.pri)
diff --git a/debian/changelog b/debian/changelog
index 9f6d69a..0f2fd6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+webkit (0~svn27674-2) UNRELEASED; urgency=low
+
+  * JavaScriptCore/JavaScriptCore.pri: cherry-picked change from revision
+    28692 to fix FTBFS due to lack of -lpthread on the linker command line.
+
+ -- Mike Hommey <glandium at debian.org>  Thu, 13 Dec 2007 21:45:56 +0100
+
 webkit (0~svn27674-1) unstable; urgency=low
 
   * New upstream snapshot

-- 
WebKit Debian packaging