[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-10851-g50815da

[Gustavo Noronha Silva]

The following commit has been merged in the debian/experimental branch:
commit 00f484b01252deddf900f6b32106fdeaa326b6eb
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Wed Dec 22 11:41:33 2010 -0200

    Fix rules file to operate just on relevant packages, and to use correct paths.

diff --git a/debian/rules b/debian/rules
index c6eb2d1..b283202 100755
--- a/debian/rules
+++ b/debian/rules
@@ -99,32 +99,32 @@ install-stamp: build-stamp
 
 	dh_clean -k
 
-ifeq (2.0,$(filter 2.0,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp-2.0
-	[ ! -d debian/tmp/usr/lib/webkitgtk-1.0-0/libexec ] && install -d -m 755 debian/tmp/usr/lib/webkitgtk-1.0-0/libexec || true
-	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkitgtk-1.0-0/libexec/DumpRenderTree
-	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkitgtk-1.0-0/libexec/GtkLauncher
+ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
+	$(MAKE) -C build-2.0 install DESTDIR="$(CURDIR)"/debian/tmp-2.0
+	[ ! -d debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec ] && install -d -m 755 debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec || true
+	build-2.0/libtool --mode=install install -m 755 build-2.0/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec/DumpRenderTree
+	build-2.0/libtool --mode=install install -m 755 build-2.0/Programs/GtkLauncher "$(CURDIR)"/debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec/GtkLauncher
 
-	install -d -m 755 debian/tmp/usr/share/doc/libwebkitgtk-dev/html
+	install -d -m 755 debian/tmp-2.0/usr/share/doc/libwebkitgtk-dev/html
 	install -m 644 WebKit/gtk/docs/html/* \
-		debian/tmp/usr/share/doc/libwebkitgtk-dev/html/
+		debian/tmp-2.0/usr/share/doc/libwebkitgtk-dev/html/
 
-	mv debian/tmp/usr/share/webkit-1.0 \
-		debian/tmp/usr/share/webkitgtk-1.0
+	mv debian/tmp-2.0/usr/share/webkit-1.0 \
+		debian/tmp-2.0/usr/share/webkitgtk-1.0
 endif
 
-ifeq (3.0,$(filter 3.0,$(DEB_BUILD_OPTIONS)))
-	$(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp-3.0
-	[ ! -d debian/tmp/usr/lib/webkitgtk-3.0-0/libexec ] && install -d -m 755 debian/tmp/usr/lib/webkitgtk-3.0-0/libexec || true
-	build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkitgtk-3.0-0/libexec/DumpRenderTree
-	build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkitgtk-3.0-0/libexec/GtkLauncher
+ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
+	$(MAKE) -C build-3.0 install DESTDIR="$(CURDIR)"/debian/tmp-3.0
+	[ ! -d debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec ] && install -d -m 755 debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec || true
+	build-3.0/libtool --mode=install install -m 755 build-3.0/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec/DumpRenderTree
+	build-3.0/libtool --mode=install install -m 755 build-3.0/Programs/GtkLauncher "$(CURDIR)"/debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec/GtkLauncher
 
-	install -d -m 755 debian/tmp/usr/share/doc/libwebkitgtk-3.0-dev/html
+	install -d -m 755 debian/tmp-3.0/usr/share/doc/libwebkitgtk-3.0-dev/html
 	install -m 644 WebKit/gtk/docs/html/* \
-		debian/tmp/usr/share/doc/libwebkitgtk-3.0-dev/html/
+		debian/tmp-3.0/usr/share/doc/libwebkitgtk-3.0-dev/html/
 
-	mv debian/tmp/usr/share/webkit-3.0 \
-		debian/tmp/usr/share/webkitgtk-3.0
+	mv debian/tmp-3.0/usr/share/webkit-3.0 \
+		debian/tmp-3.0/usr/share/webkitgtk-3.0
 endif
 
 	touch $@
@@ -135,9 +135,12 @@ binary-indep: build install
 	dh_testroot
 	dh_installdocs -i
 	dh_installchangelogs -i
-	for version in $(GTK_VERSIONS); do \
-		dh_install -i --sourcedir=debian/tmp-$${version}; \
-	done
+ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
+	dh_install -plibwebkitgtk-1.0-common --sourcedir=debian/tmp-2.0
+endif
+ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
+	dh_install -plibwebkitgtk-3.0-common --sourcedir=debian/tmp-3.0
+endif
 	dh_link -i
 	dh_compress -i
 	dh_fixperms -i
@@ -152,9 +155,18 @@ binary-arch: build install
 	dh_testroot
 	dh_installdocs -a
 	dh_installchangelogs -a
-	for version in $(GTK_VERSIONS); do \
-		dh_install -a --sourcedir=debian/tmp-$${version}; \
-	done
+ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
+	dh_install -plibwebkitgtk-1.0-0 --sourcedir=debian/tmp-2.0
+	dh_install -plibwebkitgtk-dev --sourcedir=debian/tmp-2.0
+	dh_install -plibwebkitgtk-1.0-0-dbg --sourcedir=debian/tmp-2.0
+	dh_install -pgir1.0-webkit-1.0 --sourcedir=debian/tmp-2.0
+endif
+ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
+	dh_install -plibwebkitgtk-3.0-0 --sourcedir=debian/tmp-3.0
+	dh_install -plibwebkitgtk-3.0-dev --sourcedir=debian/tmp-3.0
+	dh_install -plibwebkitgtk-3.0-0-dbg --sourcedir=debian/tmp-3.0
+	dh_install -pgir1.0-webkit-3.0 --sourcedir=debian/tmp-3.0
+endif
 	dh_link -a
 	dh_strip -plibwebkitgtk-1.0-0 -a --dbg-package=libwebkitgtk-1.0-0-dbg
 	dh_strip -plibwebkitgtk-3.0-0 -a --dbg-package=libwebkitgtk-3.0-0-dbg

-- 
WebKit Debian packaging