[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn31841-1-359-g1f5af57

[Mike Hommey]

The following commit has been merged in the debian/unstable branch:
commit 56191527b1d879e004ec6b674668a3395b833e97
Author: Luca Bruno <lethalman88 at gmail.com>
Date:   Thu Apr 17 20:45:44 2008 -0500

    Install GtkLauncher and DumpRenderTree in /usr/lib/webkit-1.0/libexec

diff --git a/debian/changelog b/debian/changelog
index 720fbba..167140a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,15 @@
 webkit (0~svn32442-1) UNRELEASED; urgency=low
 
+  [ Mike Hommey ]
   * New upstream snapshot
   * debian/copyright: Updated to fit additions/removals of files upstream.
   * debian/control: Add libpango1.0-dev to build dependencies and tighten
     libgtk2.0-dev build dependency. Closes: #477493.
 
+  [ Luca Bruno ]
+  * debian/libwebkit-1.0-1.install, debian/rules: Install GtkLauncher
+    and DumpRenderTree in /usr/lib/webkit-1.0/libexec. Closes: #476514.
+
  -- Mike Hommey <glandium at debian.org>  Wed, 23 Apr 2008 22:00:46 +0200
 
 webkit (0~svn31841-1) unstable; urgency=low
diff --git a/debian/libwebkit-1.0-1.install b/debian/libwebkit-1.0-1.install
index 47d6bb9..1ace64c 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-1.0/GtkLauncher
-usr/lib/webkit-1.0/DumpRenderTree
+usr/lib/webkit-1.0/libexec/GtkLauncher
+usr/lib/webkit-1.0/libexec/DumpRenderTree
diff --git a/debian/rules b/debian/rules
index 43f70a2..bd81eaa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,9 +49,9 @@ install-stamp: build-stamp
 	dh_clean -k
 
 	$(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp
-	[ ! -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
+	[ ! -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
 
 	touch $@
 

-- 
WebKit Debian packaging