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

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit aba3daddceddc5b14ea284adcbc9fedbb687a5cc
Author: Gustavo Noronha Silva <kov at kov.eti.br>
Date:   Thu Mar 26 12:21:50 2009 -0300

    Revert the creationg of a new package; move the binaries to a different path instead.

diff --git a/debian/changelog b/debian/changelog
index f495fd6..5b30192 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
 webkit (1.1.3-2) experimental; urgency=low
 
   [ Gustavo Noronha Silva ]
-  * 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)
+  * debian/control, debian/libwebkit-1.0-2.install:
+  - move the GtkLauncher and DumpRenderTree binaries to a directory named
+    after the soname of the library, so that different binary incompatible
+    versions of the library are installable in parallel (Closes: #520981)
 
   [ Mike Hommey ]
   * JavaScriptCore/jit/JITStubs.h:
diff --git a/debian/control b/debian/control
index e13e66a..4ac4d3b 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Package: libwebkit-1.0-2
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}, libwebkit-1.0-common
-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
@@ -41,23 +40,6 @@ 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
@@ -77,7 +59,6 @@ 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 1f2e55a..4ff424e 100644
--- a/debian/libwebkit-1.0-2.install
+++ b/debian/libwebkit-1.0-2.install
@@ -1 +1,3 @@
 usr/lib/libwebkit-1.0.so.*
+usr/lib/webkit-1.0-2/libexec/DumpRenderTree
+usr/lib/webkit-1.0-2/libexec/GtkLauncher
diff --git a/debian/libwebkit-1.0-bin.install b/debian/libwebkit-1.0-bin.install
deleted file mode 100644
index 154760e..0000000
--- a/debian/libwebkit-1.0-bin.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/webkit-1.0/libexec/GtkLauncher
-usr/lib/webkit-1.0/libexec/DumpRenderTree
diff --git a/debian/rules b/debian/rules
index b56c54c..fae6b22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -63,9 +63,9 @@ install-stamp: build-stamp
 	dh_clean -k
 
 	$(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp
-	[ ! -d debian/tmp/usr/lib/webkit-1.0/libexec ] && install -d -m 755 debian/tmp/usr/lib/webkit-1.0/libexec || true
-	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0/libexec/DumpRenderTree
-	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0/libexec/GtkLauncher
+	[ ! -d debian/tmp/usr/lib/webkit-1.0-2/libexec ] && install -d -m 755 debian/tmp/usr/lib/webkit-1.0-2/libexec || true
+	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/DumpRenderTree
+	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/GtkLauncher
 
 	touch $@
 

-- 
WebKit Debian packaging