Bug#476514: libwebkit-1.0-1: Install GtkLauncher and DumpRenderTree in libexec

[Luca Bruno]

Package: libwebkit-1.0-1
Version: 0~svn31841-1
Severity: minor

I've seen that GtkLauncher and DumpRenderTree are installed under
lib/libwebkit-1.0 instead of lib/libwebkit-1.0/libexec.
I think these are executables and should be put under the libexec directory.


-- System Information:
Debian Release: lenny/sid
  APT prefers testing
  APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-1-amd64 (SMP w/1 CPU core)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 4359d42..d5d8375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 webkit (0~svn31841-1) unstable; urgency=low
 
+  [ Mike Hommey ]
   * New upstream snapshot
     + Includes proper Requires in .pc file. Closes: #450949.
   * debian/copyright: Updated to fit additions/removals of files upstream.
@@ -29,7 +30,11 @@ webkit (0~svn31841-1) unstable; urgency=low
   * WebKitTools/GNUmakefile.am: Don't build GtkLauncher and DumpRenderTree
     with rpath.
 
- -- Mike Hommey <glandium at debian.org>  Sat, 12 Apr 2008 21:40:00 +0200
+  [ Luca Bruno ]
+  * debian/libwebkit-1.0-1.install, debian/rules: Install GtkLauncher and
+    DumpRenderTree in /usr/lib/webkit-1.0/libexec.
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Wed, 16 Apr 2008 22:24:44 -0500
 
 webkit (0~svn27674-4) 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..a806f5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,8 @@ install-stamp: build-stamp
 
 	$(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
+	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 $@
 
-------------- next part --------------
diff --git a/debian/changelog b/debian/changelog
index 4359d42..d5d8375 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 webkit (0~svn31841-1) unstable; urgency=low
 
+  [ Mike Hommey ]
   * New upstream snapshot
     + Includes proper Requires in .pc file. Closes: #450949.
   * debian/copyright: Updated to fit additions/removals of files upstream.
@@ -29,7 +30,11 @@ webkit (0~svn31841-1) unstable; urgency=low
   * WebKitTools/GNUmakefile.am: Don't build GtkLauncher and DumpRenderTree
     with rpath.
 
- -- Mike Hommey <glandium at debian.org>  Sat, 12 Apr 2008 21:40:00 +0200
+  [ Luca Bruno ]
+  * debian/libwebkit-1.0-1.install, debian/rules: Install GtkLauncher and
+    DumpRenderTree in /usr/lib/webkit-1.0/libexec.
+
+ -- Luca Bruno <lethalman88 at gmail.com>  Wed, 16 Apr 2008 22:24:44 -0500
 
 webkit (0~svn27674-4) 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..a806f5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -50,8 +50,8 @@ install-stamp: build-stamp
 
 	$(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
+	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 $@