[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
Gustavo Noronha Silva
kov at debian.org
Wed Dec 22 16:39:17 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 02cdae34d3f19a91ac6fcc228faf361fd0aaf9e6
Author: Gustavo Noronha Silva <kov at debian.org>
Date: Mon Nov 29 23:12:05 2010 -0200
asd
diff --git a/debian/control b/debian/control
index 798d693..97f969d 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>, Gustavo Noronha Silva <kov at debian.org>
-Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.27.91), libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev, libgstreamer-plugins-base0.10-dev, libenchant-dev, gtk-doc-tools, libgail-dev, libgeoclue-dev
+Build-Depends: debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), libgtk3.0-dev, libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.27.91), libsqlite3-dev, gperf, bison, flex, libjpeg62-dev, libpng12-dev, libxt-dev, autotools-dev, libgstreamer-plugins-base0.10-dev, libenchant-dev, gtk-doc-tools, libgail-dev, libgail3.0-dev, libgeoclue-dev
Standards-Version: 3.8.1.0
Homepage: http://webkit.org/
Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git
@@ -91,3 +91,76 @@ Description: GObject introspection data for the WebKit library
.
It can be used by packages using the GIRepository format to generate
dynamic bindings.
+
+Package: libwebkitgtk-3.0-0
+Section: libs
+Architecture: any
+Depends: ${shlibs:Depends}, libwebkitgtk-3.0-common (>= ${source:Upstream-Version})
+Description: Web content engine library for Gtk+
+ 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 Gtk+ applications.
+
+Package: libwebkitgtk-3.0-dev
+Section: libdevel
+Priority: extra
+Architecture: any
+Depends: libwebkitgtk-3.0-0 (>= ${source:Upstream-Version}), libgtk3.0-dev, libsoup2.4-dev (>= 2.25.91)
+Description: Web content engine library for Gtk+ - 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 Gtk+ applications
+ embedding WebKit.
+
+Package: libwebkitgtk-3.0-common
+Section: libs
+Priority: optional
+Architecture: all
+Description: Web content engine library for Gtk+ - data 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 the data files needed by the library.
+
+Package: libwebkitgtk-3.0-0-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libwebkitgtk-3.0-0 (= ${binary:Version})
+Description: Web content engine library for Gtk+ - 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 Gtk+.
+
+Package: gir1.0-webkit-3.0
+Section: libs
+Architecture: any
+Depends: ${gir:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Conflicts: gobject-introspection-repository
+Description: GObject introspection data for the WebKit library
+ This package contains introspection data for WebKit, a web content
+ engine for GTK+.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings.
diff --git a/debian/gir1.0-webkit-3.0.install b/debian/gir1.0-webkit-3.0.install
new file mode 100644
index 0000000..d6088fb
--- /dev/null
+++ b/debian/gir1.0-webkit-3.0.install
@@ -0,0 +1,2 @@
+usr/lib/girepository-1.0/JSCore-3.0.typelib
+usr/lib/girepository-1.0/WebKit-3.0.typelib
diff --git a/debian/libwebkitgtk-3.0-0.install b/debian/libwebkitgtk-3.0-0.install
new file mode 100644
index 0000000..a58c380
--- /dev/null
+++ b/debian/libwebkitgtk-3.0-0.install
@@ -0,0 +1,3 @@
+usr/lib/libwebkitgtk-3.0.so.*
+usr/lib/webkitgtk-3.0-0/libexec/DumpRenderTree
+usr/lib/webkitgtk-3.0-0/libexec/GtkLauncher
diff --git a/debian/libwebkitgtk-1.0-0.symbols b/debian/libwebkitgtk-3.0-0.symbols
similarity index 99%
copy from debian/libwebkitgtk-1.0-0.symbols
copy to debian/libwebkitgtk-3.0-0.symbols
index cbc4922..a5a0ae6 100644
--- a/debian/libwebkitgtk-1.0-0.symbols
+++ b/debian/libwebkitgtk-3.0-0.symbols
@@ -1,4 +1,4 @@
-libwebkitgtk-1.0.so.0 libwebkitgtk-1.0-0 #MINVER#
+libwebkitgtk-3.0.so.0 libwebkitgtk-3.0-0 #MINVER#
JSCheckScriptSyntax at Base 1.3.3
JSClassCreate at Base 1.3.3
JSClassRelease at Base 1.3.3
diff --git a/debian/libwebkitgtk-3.0-dev.install b/debian/libwebkitgtk-3.0-dev.install
new file mode 100644
index 0000000..b664cc3
--- /dev/null
+++ b/debian/libwebkitgtk-3.0-dev.install
@@ -0,0 +1,5 @@
+usr/lib/libwebkitgtk-3.0.so
+usr/include/webkitgtk-3.0
+usr/lib/pkgconfig/webkitgtk-3.0.pc
+usr/share/doc/libwebkitgtk-3.0-dev
+usr/share/gir-1.0/*.gir
diff --git a/debian/libwebkitgtk-3.0-dev.links b/debian/libwebkitgtk-3.0-dev.links
new file mode 100644
index 0000000..82e6552
--- /dev/null
+++ b/debian/libwebkitgtk-3.0-dev.links
@@ -0,0 +1 @@
+usr/share/doc/libwebkitgtk-3.0-dev/html usr/share/gtk-doc/html/webkitgtk-3.0
diff --git a/debian/rules b/debian/rules
index 70ec9df..38c6525 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+GTK_VERSIONS = 2.0 3.0
+
CFLAGS = -g -Wall
ifeq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
@@ -35,7 +37,7 @@ clean:
-test -d build/WebKit/gtk/docs && \
cd build/WebKit/gtk/docs && \
make maintainer-clean
- rm -rf build
+ rm -rf build-*
rm -f WebKit/gtk/docs/version.xml
for file in config.guess config.sub; do \
@@ -53,29 +55,40 @@ build-stamp:
sed -i '2!b;/^#/ i\exec "/usr/share/misc/'$$file'" "$$@"' autotools/$$file ; \
done
- [ ! -d build ] && mkdir build || true
- cd build && \
- CFLAGS="$(CFLAGS)" \
- CXXFLAGS="$(CFLAGS)" \
- CC="gcc -Wl,--as-needed" \
- CXX="g++ -Wl,--as-needed" \
- ../configure --prefix=/usr \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --enable-gtk-doc \
- --enable-introspection \
- --enable-geolocation \
- --enable-websockets
-
- $(MAKE) $(MAKEARGUMENTS) -C build
+ for version in $(GTK_VERSIONS); do \
+ if [ ! -d build-$${version} ]; then \
+ mkdir build-$${version}; \
+ fi; \
+ cd build-$${version}; \
+ env CFLAGS="$(CFLAGS)" \
+ CXXFLAGS="$(CFLAGS)" \
+ CC="gcc -Wl,--as-needed" \
+ CXX="g++ -Wl,--as-needed" \
+ ../configure --prefix=/usr \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --with-gtk=$${version} \
+ --enable-gtk-doc \
+ --enable-introspection \
+ --enable-geolocation \
+ --enable-websockets; \
+ cd ..; \
+ done
+
+ for version in $(GTK_VERSIONS); do \
+ $(MAKE) $(MAKEARGUMENTS) -C build-$${version}; \
+ done
# Awesome hack to get the docs built! For some reason, the
# first call to make docs fails mid-work, but the second
# succeeds.
- ln -fs ../../../build/WebKit/gtk/docs/version.xml \
- WebKit/gtk/docs/
- cd build/WebKit/gtk/docs && \
- make docs || make docs
+ for version in $(GTK_VERSIONS); do \
+ ln -fs ../../../build-$${version}/WebKit/gtk/docs/version.xml \
+ WebKit/gtk/docs/; \
+ cd build-$${version}/WebKit/gtk/docs; \
+ make docs || make docs; \
+ cd ..; \
+ done
touch $@
@@ -87,7 +100,8 @@ install-stamp: build-stamp
dh_clean -k
- $(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp
+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
@@ -98,6 +112,21 @@ install-stamp: build-stamp
mv debian/tmp/usr/share/webkit-1.0 \
debian/tmp/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
+
+ install -d -m 755 debian/tmp/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/
+
+ mv debian/tmp/usr/share/webkit-3.0 \
+ debian/tmp/usr/share/webkitgtk-3.0
+endif
touch $@
@@ -107,7 +136,9 @@ binary-indep: build install
dh_testroot
dh_installdocs -i
dh_installchangelogs -i
- dh_install -i --sourcedir=debian/tmp
+ for version in $(GTK_VERSIONS); do \
+ dh_install -i --sourcedir=debian/tmp-$${version}; \
+ done
dh_link -i
dh_compress -i
dh_fixperms -i
@@ -122,12 +153,16 @@ binary-arch: build install
dh_testroot
dh_installdocs -a
dh_installchangelogs -a
- dh_install -a --sourcedir=debian/tmp
+ for version in $(GTK_VERSIONS); do \
+ dh_install -a --sourcedir=debian/tmp-$${version}; \
+ done
dh_link -a
- dh_strip -a --dbg-package=libwebkitgtk-1.0-0-dbg
+ 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
dh_compress -a
dh_fixperms -a
- dh_makeshlibs -a -V 'libwebkitgtk-1.0-0 (>= 1.3.3)' -- -c4
+ dh_makeshlibs -plibwebkitgtk-dev -a -V 'libwebkitgtk-1.0-0 (>= 1.3.3)' -- -c4
+ dh_makeshlibs -plibwebkitgtk-3.0-dev -a -V 'libwebkitgtk-3.0-0' -- -c4
dh_installdeb -a
dh_shlibdeps -a
dh_gencontrol -a
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list