[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.1.3-1-1-gff11cf6

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit ff11cf61bede6c229a832fdccdad307e9c345ce9
Author: Gustavo Noronha Silva <kov at kov.eti.br>
Date:   Wed Mar 25 11:21:21 2009 -0300

    Add new libwebkit-1.0-bin package

diff --git a/debian/changelog b/debian/changelog
index 799347a..252fd80 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+webkit (1.1.3-2) experimental; urgency=low
+
+  * debian/control, debian/libwebkit-1.0-{2,bin}.install:
+  - add a new libwebkit-1.0-bin package to distribute the GtkLauncher and
+    DumpRenderTree binaries in, so that different soversions of the
+    library are installable in parallel (Closes: #520981)
+
+ -- Gustavo Noronha Silva <kov at debian.org>  Wed, 25 Mar 2009 11:16:00 -0300
+
 webkit (1.1.3-1) experimental; urgency=low
 
   [ Gustavo Noronha Silva ]
diff --git a/debian/control b/debian/control
index a357ca7..e13e66a 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,7 @@ Package: libwebkit-1.0-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libwebkit-1.0-common
-Conflicts: libwebkit-1.0-1
-Replaces: libwebkit-1.0-1
+Recommends: libwebkit-1.0-bin
 Description: Web content engine library for Gtk+
  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
@@ -42,6 +41,23 @@ Description: Web content engine library for Gtk+ - Development files
  This package provides development files required to create Gtk+ applications
  embedding WebKit.
 
+Package: libwebkit-1.0-bin
+Section: misc
+Priority: extra
+Architecture: any
+Depends: ${shlibs:Depends}
+Replaces: libwebkit-1.0-1, libwebkit-1.0-2 (<< 1.1.3-2)
+Description: Web content engine library for Gtk+ - support applications
+ 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
+ other applications, such as mail readers, or web browsers.
+ .
+ It is able to display content such as HTML, SVG, XML, and others. It also
+ supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
+ .
+ This package provides binary files that are distributed with the
+ library for testing purposes.
+
 Package: libwebkit-1.0-common
 Section: misc
 Priority: extra
@@ -61,6 +77,7 @@ Section: libdevel
 Priority: extra
 Architecture: any
 Depends: libwebkit-1.0-2 (= ${binary:Version})
+Recommends: libwebkit-1.0-bin
 Conflicts: libwebkit-1.0-1-dbg
 Replaces: libwebkit-1.0-1-dbg
 Description: Web content engine library for Gtk+ - Debugging symbols
diff --git a/debian/libwebkit-1.0-2.install b/debian/libwebkit-1.0-2.install
index 1ace64c..1f2e55a 100644
--- a/debian/libwebkit-1.0-2.install
+++ b/debian/libwebkit-1.0-2.install
@@ -1,3 +1 @@
 usr/lib/libwebkit-1.0.so.*
-usr/lib/webkit-1.0/libexec/GtkLauncher
-usr/lib/webkit-1.0/libexec/DumpRenderTree
diff --git a/debian/libwebkit-1.0-2.install b/debian/libwebkit-1.0-bin.install
similarity index 75%
copy from debian/libwebkit-1.0-2.install
copy to debian/libwebkit-1.0-bin.install
index 1ace64c..154760e 100644
--- a/debian/libwebkit-1.0-2.install
+++ b/debian/libwebkit-1.0-bin.install
@@ -1,3 +1,2 @@
-usr/lib/libwebkit-1.0.so.*
 usr/lib/webkit-1.0/libexec/GtkLauncher
 usr/lib/webkit-1.0/libexec/DumpRenderTree

-- 
WebKit Debian packaging