[SCM] WebKit Debian packaging branch, debian/unstable, updated. 0+svn29752-1-1645-gd3fe478

Mike Hommey glandium at debian.org
Sat Apr 12 19:56:54 UTC 2008 

The following commit has been merged in the debian/unstable branch:
commit fb1d25d08fb3d4fbbe5d71fe35cc0ec862f4a7ab
Author: Mike Hommey <glandium at debian.org>
Date:   Sun Apr 6 18:48:33 2008 +0200

    Don't build QtWebKit
      * debian/control, debian/rules: Don't build QtWebKit, it will be built from
        Qt sources.
      * debian/libqtwebkit*: Removed.

diff --git a/debian/changelog b/debian/changelog
index 933c68c..81a9339 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+webkit (0~svn29752-2) UNRELEASED; urgency=low
+
+  * debian/control, debian/rules: Don't build QtWebKit, it will be built from
+    Qt sources.
+  * debian/libqtwebkit*: Removed.
+
+ -- Mike Hommey <glandium at debian.org>  Sun, 06 Apr 2008 18:45:18 +0200
+
 webkit (0~svn27674-4) unstable; urgency=low
 
   * debian/rules: Revert change from 0~svn27674-3, which was obviously not
diff --git a/debian/control b/debian/control
index 4a8f6f1..7bb4ce0 100644
--- a/debian/control
+++ b/debian/control
@@ -9,51 +9,6 @@ Homepage: http://webkit.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
 Vcs-Git: git://git.debian.org/git/pkg-webkit/webkit.git
 
-Package: libqtwebkit1d
-Section: libs
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Web content engine library for Qt
- WebKit is a web content engine, derived from KHTML and KJS from KDE, and
- used primarily in Apple's Safari browser.  It is made to be embedded in
- other applications, such as mail readers, or web browsers.
- .
- It is able to display content such as HTML, SVG, XML, and others. It also
- supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
- .
- This is the library for embedding in Qt applications.
-
-Package: libqtwebkit-dev
-Section: libdevel
-Priority: extra
-Architecture: all
-Depends: libqtwebkit1d (>= ${source:Upstream-Version}), libqtwebkit1d (<< ${source:Version}.1~), libqt4-dev
-Description: Web content engine library for Qt - Development files
- WebKit is a web content engine, derived from KHTML and KJS from KDE, and
- used primarily in Apple's Safari browser.  It is made to be embedded in
- other applications, such as mail readers, or web browsers.
- .
- It is able to display content such as HTML, SVG, XML, and others. It also
- supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
- .
- This package provides development files required to create Qt applications
- embedding WebKit.
-
-Package: libqtwebkit1d-dbg
-Section: libdevel
-Priority: extra
-Architecture: any
-Depends: libqtwebkit1d (= ${binary:Version})
-Description: Web content engine library for Qt - Debugging symbols
- WebKit is a web content engine, derived from KHTML and KJS from KDE, and
- used primarily in Apple's Safari browser.  It is made to be embedded in
- other applications, such as mail readers, or web browsers.
- .
- It is able to display content such as HTML, SVG, XML, and others. It also
- supports DOM, XMLHttpRequest, XSLT, CSS, Javascript/ECMAscript and more.
- .
- This package provides the debugging symbols for the Webkit library for Qt.
-
 Package: libwebkitgtk1d
 Section: libs
 Architecture: any
diff --git a/debian/libqtwebkit-dev.install b/debian/libqtwebkit-dev.install
deleted file mode 100644
index bf1a693..0000000
--- a/debian/libqtwebkit-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/libQtWebKit.so
-usr/lib/libQtWebKit.prl
-usr/include/qt4
-usr/mkspecs/features/qtwebkit.prf usr/share/qt4/mkspecs/features
-usr/lib/pkgconfig/QtWebKit.pc
diff --git a/debian/libqtwebkit1d.install b/debian/libqtwebkit1d.install
deleted file mode 100644
index 40ecf35..0000000
--- a/debian/libqtwebkit1d.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/libQtWebKit.so.*
-usr/lib/WebKit/QtLauncher
-usr/lib/WebKit/QtDumpRenderTree
diff --git a/debian/libqtwebkit1d.postrm b/debian/libqtwebkit1d.postrm
deleted file mode 100644
index a93eb2c..0000000
--- a/debian/libqtwebkit1d.postrm
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$1" = "remove" ] || [ "$1" = "purge" ] && dpkg-divert --package libqtwebkit1d --remove --rename --divert /usr/lib/WebKit/QtLauncher.old /usr/lib/WebKit/QtLauncher
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/libqtwebkit1d.preinst b/debian/libqtwebkit1d.preinst
deleted file mode 100644
index bf2d7ab..0000000
--- a/debian/libqtwebkit1d.preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-[ "$1" = "install" ] && dpkg-divert --package libqtwebkit1d --add --rename --divert /usr/lib/WebKit/QtLauncher.old /usr/lib/WebKit/QtLauncher
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/rules b/debian/rules
index 1232189..b92fdc9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,35 +14,24 @@ else
         CFLAGS += -O0
 endif
 
-clean-gtk:
+clean:
 	dh_testdir
 	dh_testroot
 
-	rm -f build-gtk-stamp install-gtk-stamp
-	rm -rf build-gtk
-
-clean-qt:
-	dh_testdir
-	dh_testroot
-
-	rm -f build-qt-stamp install-qt-stamp
-	rm -rf build-qt
-
-clean: clean-gtk clean-qt
-	dh_testdir
-	dh_testroot
+	rm -f build-stamp install-stamp
+	rm -rf build
 
 	dh_clean
 
-build-gtk: build-gtk-stamp
+build: build-stamp
 
-build-gtk-stamp:
+build-stamp:
 	dh_testdir
 
-	[ ! -d build-gtk ] && mkdir build-gtk || true
-	cd build-gtk && \
+	[ ! -d build ] && mkdir build || true
+	cd build && \
 	$(QMAKE) -r \
-		OUTPUT_DIR="$(CURDIR)"/build-gtk \
+		OUTPUT_DIR="$(CURDIR)"/build \
 		QMAKE_STRIP=/bin/true \
 		QMAKE_RPATH= \
 		QMAKE_CFLAGS="$(CFLAGS)" \
@@ -54,68 +43,26 @@ build-gtk-stamp:
 		WEBKIT_LIB_DIR=/usr/lib \
 		"$(CURDIR)"/WebKit.pro
 
-	make -C build-gtk
+	make -C build
 
 	touch $@
 
-build-qt: build-qt-stamp
+install: install-stamp
 
-build-qt-stamp:
+install-stamp: build-stamp
 	dh_testdir
+	dh_testroot
 
-	[ ! -d build-qt ] && mkdir build-qt || true
-	cd build-qt && \
-	$(QMAKE) -r \
-		OUTPUT_DIR="$(CURDIR)"/build-qt \
-		QMAKE_STRIP=/bin/true \
-		QMAKE_RPATH= \
-		QMAKE_CFLAGS="$(CFLAGS)" \
-		QMAKE_CXXFLAGS="$(CFLAGS)" \
-		QMAKE_LFLAGS="-Wl,--as-needed" \
-		VERSION=$(SO_VERSION) \
-		CONFIG+=qt-port \
-		"$(CURDIR)"/WebKit.pro
-
-	make -C build-qt
-
-	touch $@
-
-build: build-gtk build-qt
-
-install-clean:
 	dh_clean -k
-	install -d -m 755 debian/tmp
-
-install-gtk: install-gtk-stamp
 
-install-gtk-stamp: install-clean build-gtk-stamp debian/tmp
-	dh_testdir
-	dh_testroot
-
-	make -C build-gtk install INSTALL_ROOT="$(CURDIR)"/debian/tmp
+	make -C build install INSTALL_ROOT="$(CURDIR)"/debian/tmp
 	[ ! -d debian/tmp/usr/lib/WebKit ] && install -d -m 755 debian/tmp/usr/lib/WebKit || true
-	mv build-gtk/WebKitTools/DumpRenderTree/gtk/DumpRenderTree build-gtk/WebKitTools/DumpRenderTree/gtk/GtkDumpRenderTree
-	install -m 755 build-gtk/WebKitTools/GtkLauncher/GtkLauncher build-gtk/WebKitTools/DumpRenderTree/gtk/GtkDumpRenderTree debian/tmp/usr/lib/WebKit
+	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
 
 	touch $@
 
-install-qt: install-qt-stamp
-
-install-qt-stamp: install-clean build-qt-stamp debian/tmp
-	dh_testdir
-	dh_testroot
-
-	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
-	mv build-qt/bin/DumpRenderTree build-qt/bin/QtDumpRenderTree
-	install -m 755 build-qt/bin/QtLauncher build-qt/bin/QtDumpRenderTree debian/tmp/usr/lib/WebKit
-	sed -i '/^Libs: / s/^\(Libs:  *[^ ][^ ]*  *[^ ][^ ]*  *\)/\1\nLibs.private: /' debian/tmp/usr/lib/pkgconfig/QtWebKit.pc
-
-	touch $@
-
-install: install-gtk install-qt
-
 # Build architecture-independent files here.
 binary-indep: build install
 	dh_testdir
@@ -140,10 +87,8 @@ binary-arch: build install
 	dh_install -a --sourcedir=debian/tmp
 	dh_link -a
 	dh_strip -plibwebkitgtk$(SO_VERSION) --dbg-package=libwebkitgtk$(SO_VERSION)-dbg
-	dh_strip -plibqtwebkit$(SO_VERSION) --dbg-package=libqtwebkit$(SO_VERSION)-dbg
 	dh_compress -a
 	dh_fixperms -a
-	dh_makeshlibs -plibqtwebkit$(SO_VERSION)
 	dh_makeshlibs -plibwebkitgtk$(SO_VERSION)
 	dh_installdeb -a
 	dh_shlibdeps -a
@@ -153,4 +98,4 @@ binary-arch: build install
 
 binary: binary-indep binary-arch
 
-.PHONY: build build-gtk build-qt clean clean-gtk clean-qt install install-gtk install-qt binary binary-indep binary-arch install-clean
+.PHONY: build clean install binary binary-indep binary-arch

-- 
WebKit Debian packaging

More information about the Pkg-webkit-commits mailing list