[SCM] WebKit Debian packaging branch, debian, updated. 0+svn24735-1-290-g80520f9

[Mike Hommey]

The branch, debian has been updated
       via  80520f92a1ad0e2022197b420ededfec3eb222ab (commit)
       via  a500dd33b8dc78c2c8119ad9538a085d54b46887 (commit)
      from  dc2c66ed1a152d897103442bc7e84751bcda522b (commit)


- Log -----------------------------------------------------------------
commit 80520f92a1ad0e2022197b420ededfec3eb222ab
Author: Mike Hommey <glandium at debian.org>
Date:   Sun Aug 19 15:46:17 2007 +0200

    Use $(CURDIR) more safely
      * debian/rules: Use $(CURDIR) variable more safely to avoid problem with
        build directories with spaces.

commit a500dd33b8dc78c2c8119ad9538a085d54b46887
Author: Mike Hommey <glandium at debian.org>
Date:   Sun Aug 19 15:42:48 2007 +0200

    Set shlibs
      * debian/rules: Set binary packages' shlibs correctly.

-----------------------------------------------------------------------

Summary of changes:
 debian/changelog |    8 ++++++--
 debian/rules     |   15 ++++++++-------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c97720..e404ad2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,15 @@ webkit (0~svn25144-1) UNRELEASED; urgency=low
     anyways), and to fit the additions/removals of files upstream.
   * JavaScriptCore/wtf/TCSpinLock.h: Work around an FTBFS on PPC due to a
     probable regression in gcc (#438415).
-  * debian/rules: Change the place we install QtLauncher from, since it moved.
+  * debian/rules:
+    + Change the place we install QtLauncher from, since it moved.
+    + Set binary packages' shlibs correctly.
+    + Use $(CURDIR) variable more safely to avoid problem with build
+      directories with spaces.
   * WebKitQt/Plugins/Plugins.pro: Build plugins with hidden symbols, so that
     they don't expose unwanted symbols.
 
- -- Mike Hommey <glandium at debian.org>  Sun, 19 Aug 2007 14:49:28 +0200
+ -- Mike Hommey <glandium at debian.org>  Sun, 19 Aug 2007 15:44:46 +0200
 
 webkit (0~svn24735-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 2e9035a..43566e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -33,7 +33,7 @@ build-gdk-stamp:
 	[ ! -d build-gdk ] && mkdir build-gdk || true
 	cd build-gdk && \
 	qmake -r \
-		OUTPUT_DIR=$(CURDIR)/build-gdk \
+		OUTPUT_DIR="$(CURDIR)"/build-gdk \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \
 		QMAKE_CFLAGS="-g -O2 -Wall" \
@@ -43,7 +43,7 @@ build-gdk-stamp:
 		CONFIG-=qt CONFIG+=gdk-port \
 		WEBKIT_INC_DIR=/usr/include/WebKit \
 		WEBKIT_LIB_DIR=/usr/lib \
-		$(CURDIR)/WebKit.pro
+		"$(CURDIR)"/WebKit.pro
 
 	make -C build-gdk
 
@@ -57,7 +57,7 @@ build-qt-stamp:
 	[ ! -d build-qt ] && mkdir build-qt || true
 	cd build-qt && \
 	qmake -r \
-		OUTPUT_DIR=$(CURDIR)/build-qt \
+		OUTPUT_DIR="$(CURDIR)"/build-qt \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \
 		QMAKE_CFLAGS="-g -O2 -Wall" \
@@ -65,7 +65,7 @@ build-qt-stamp:
 		QMAKE_LFLAGS="-Wl,--as-needed" \
 		VERSION=$(SO_VERSION) \
 		CONFIG+=qt-port \
-		$(CURDIR)/WebKit.pro
+		"$(CURDIR)"/WebKit.pro
 
 	make -C build-qt
 
@@ -83,7 +83,7 @@ install-gdk-stamp: install-clean build-gdk-stamp debian/tmp
 	dh_testdir
 	dh_testroot
 
-	make -C build-gdk install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	make -C build-gdk install INSTALL_ROOT="$(CURDIR)"/debian/tmp
 	[ ! -d debian/tmp/usr/lib/WebKit ] && install -d -m 755 debian/tmp/usr/lib/WebKit || true
 	install -m 755 build-gdk/WebKitTools/GdkLauncher/GdkLauncher debian/tmp/usr/lib/WebKit
 	sed -i '/^Libs: / s/^\(Libs:  *[^ ][^ ]*  *[^ ][^ ]*  *\)/\1\nLibs.private: /' debian/tmp/usr/lib/pkgconfig/WebKitGdk.pc
@@ -96,7 +96,7 @@ install-qt-stamp: install-clean build-qt-stamp debian/tmp
 	dh_testdir
 	dh_testroot
 
-	make -C build-qt install INSTALL_ROOT=$(CURDIR)/debian/tmp
+	make -C build-qt install INSTALL_ROOT="$(CURDIR)"/debian/tmp
 	[ ! -d debian/tmp/usr/lib/WebKit ] && install -d -m 755 debian/tmp/usr/lib/WebKit || true
 	install -m 755 build-qt/bin/QtLauncher debian/tmp/usr/lib/WebKit
 	install -m 755 build-qt/WebKitTools/DumpRenderTree/DumpRenderTree.qtproj/DumpRenderTree debian/tmp/usr/lib/WebKit
@@ -133,7 +133,8 @@ binary-arch: build install
 	dh_strip -plibqtwebkit$(SO_VERSION) --dbg-package=libqtwebkit$(SO_VERSION)-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -a
+	dh_makeshlibs -plibqtwebkit$(SO_VERSION) -V 'libqtwebkit$(SO_VERSION) (>= 0~svn24986)'
+	dh_makeshlibs -plibwebkitgdk$(SO_VERSION) -V 'libwebkitgdk$(SO_VERSION) (>= 0~svn24911)'
 	dh_installdeb -a
 	dh_shlibdeps -a
 	dh_gencontrol -a

-- 
WebKit Debian packaging