[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 9cbe74492c0638b8f429c21ea48e3392531774f4
Author: Mike Hommey <glandium at debian.org>
Date:   Sat Apr 12 17:06:16 2008 +0200

    Use autotools instead of qmake.
    
    The Gtk Port switched away from qmake and now uses autotools.

diff --git a/debian/changelog b/debian/changelog
index d06bea0..84dfcab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ webkit (0~svn31841-1) UNRELEASED; urgency=low
     Qt sources.
   * debian/libqtwebkit*: Removed.
   * debian/rules: Replaced make calls with $(MAKE).
+  * debian/control, debian/rules: Don't use qmake anymore, but use autotools
+    instead.
+  * debian/libwebkitgtk-dev.install: Remove the .prl file that was generated
+    by qmake.
 
  -- Mike Hommey <glandium at debian.org>  Sat, 12 Apr 2008 11:47:32 +0200
 
diff --git a/debian/control b/debian/control
index 7bb4ce0..fe1b333 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Priority: optional
 Section: web
 Maintainer: Debian WebKit Maintainers <pkg-webkit-maintainers at lists.alioth.debian.org>
 Uploaders: Mike Hommey <glandium at debian.org>
-Build-Depends: debhelper (>= 5.0), libgtk2.0-dev, libqt4-dev (>= 4.3), libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex
+Build-Depends: debhelper (>= 5.0), libgtk2.0-dev, libicu-dev, libxslt-dev, libcurl4-dev, libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, autoconf, automake, libtool
 Standards-Version: 3.7.3.0
 Homepage: http://webkit.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
diff --git a/debian/libwebkitgtk-dev.install b/debian/libwebkitgtk-dev.install
index e1f5171..74991da 100644
--- a/debian/libwebkitgtk-dev.install
+++ b/debian/libwebkitgtk-dev.install
@@ -1,4 +1,3 @@
 usr/lib/libWebKitGtk.so
-usr/lib/libWebKitGtk.prl
 usr/include/WebKit
 usr/lib/pkgconfig/WebKitGtk.pc
diff --git a/debian/rules b/debian/rules
index 181d1fb..d5068e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-QMAKE=qmake-qt4
 SO_VERSION=1d
 
 CFLAGS = -g -Wall
@@ -30,18 +29,9 @@ build-stamp:
 
 	[ ! -d build ] && mkdir build || true
 	cd build && \
-	$(QMAKE) -r \
-		OUTPUT_DIR="$(CURDIR)"/build \
-		QMAKE_STRIP=/bin/true \
-		QMAKE_RPATH= \
-		QMAKE_CFLAGS="$(CFLAGS)" \
-		QMAKE_CXXFLAGS="$(CFLAGS)" \
-		QMAKE_LFLAGS="-Wl,--as-needed" \
-		VERSION=$(SO_VERSION) \
-		CONFIG-=qt CONFIG+=gtk-port \
-		WEBKIT_INC_DIR=/usr/include/WebKit \
-		WEBKIT_LIB_DIR=/usr/lib \
-		"$(CURDIR)"/WebKit.pro
+	CFLAGS="$(CFLAGS)" \
+	CXXFLAGS="$(CFLAGS)" \
+	../autogen.sh --prefix=/usr --enable-svg-experimental
 
 	$(MAKE) -C build
 
@@ -55,11 +45,10 @@ install-stamp: build-stamp
 
 	dh_clean -k
 
-	$(MAKE) -C build install INSTALL_ROOT="$(CURDIR)"/debian/tmp
+	$(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp
 	[ ! -d debian/tmp/usr/lib/WebKit ] && install -d -m 755 debian/tmp/usr/lib/WebKit || true
-	mv build/WebKitTools/DumpRenderTree/gtk/DumpRenderTree build/WebKitTools/DumpRenderTree/gtk/GtkDumpRenderTree
-	install -m 755 build/WebKitTools/GtkLauncher/GtkLauncher build/WebKitTools/DumpRenderTree/gtk/GtkDumpRenderTree debian/tmp/usr/lib/WebKit
-	sed -i '/^Libs: / s/^\(Libs:  *[^ ][^ ]*  *[^ ][^ ]*  *\)/\1\nLibs.private: /' debian/tmp/usr/lib/pkgconfig/WebKitGtk.pc
+	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
 
 	touch $@
 

-- 
WebKit Debian packaging