[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 aced7a57ed5424cd1cd7471fdb91dc4510c1d629
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Apr 12 19:49:15 2008 +0200

    Install GtkLauncher and DumpRenderTree in /usr/lib/webkit-1.0
    
    At the same time, don't rename DumpRenderTree, as Qt homonym lie
    elsewhere.  Also, don't divert anything, since we don't clash with
    older files anymore.

diff --git a/debian/changelog b/debian/changelog
index bca4bbb..67771c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,11 @@ webkit (0~svn31841-1) UNRELEASED; urgency=low
   * debian/control, debian/rules, debian/libwebkit*: Rename packages to fit
     new library SONAME.
   * debian/control: libwebkit-dev doesn't need to depend on libglib2.0-dev.
+  * debian/libwebkit-1.0-1.install, debian/rules: Install GtkLauncher and
+    DumpRenderTree in /usr/lib/webkit-1.0, and don't rename DumpRenderTree, as
+    Qt homonym lie elsewhere.
+  * debian/libwebkit-1.0-1.preinst, debian/libwebkit-1.0-1.postrm: Don't
+    divert anything, since we don't clash with older files anymore.
 
  -- Mike Hommey <glandium at debian.org>  Sat, 12 Apr 2008 11:47:32 +0200
 
diff --git a/debian/libwebkit-1.0-1.install b/debian/libwebkit-1.0-1.install
index a925f22..47d6bb9 100644
--- a/debian/libwebkit-1.0-1.install
+++ b/debian/libwebkit-1.0-1.install
@@ -1,3 +1,3 @@
 usr/lib/libwebkit-1.0.so.*
-usr/lib/WebKit/GtkLauncher
-usr/lib/WebKit/GtkDumpRenderTree
+usr/lib/webkit-1.0/GtkLauncher
+usr/lib/webkit-1.0/DumpRenderTree
diff --git a/debian/libwebkit-1.0-1.postrm b/debian/libwebkit-1.0-1.postrm
deleted file mode 100644
index a9f89a0..0000000
--- a/debian/libwebkit-1.0-1.postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$1" = "remove" ] || [ "$1" = "purge" ] && dpkg-divert --package libwebkit-1.0-1 --remove --rename --divert /usr/lib/WebKit/GtkLauncher.old /usr/lib/WebKit/GtkLauncher
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libwebkit-1.0-1.preinst b/debian/libwebkit-1.0-1.preinst
deleted file mode 100644
index 0732348..0000000
--- a/debian/libwebkit-1.0-1.preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$1" = "install" ] && dpkg-divert --package libwebkit-1.0-1 --add --rename --divert /usr/lib/WebKit/GtkLauncher.old /usr/lib/WebKit/GtkLauncher
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index f58038b..1c88ad3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,9 +47,9 @@ install-stamp: build-stamp
 	dh_clean -k
 
 	$(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp
-	[ ! -d debian/tmp/usr/lib/WebKit ] && install -d -m 755 debian/tmp/usr/lib/WebKit || true
-	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/WebKit/GtkDumpRenderTree
-	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/WebKit/GtkLauncher
+	[ ! -d debian/tmp/usr/lib/webkit-1.0 ] && install -d -m 755 debian/tmp/usr/lib/webkit-1.0 || true
+	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0/DumpRenderTree
+	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0/GtkLauncher
 
 	touch $@
 

-- 
WebKit Debian packaging