[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c
Gustavo Noronha Silva
kov at debian.org
Mon Dec 27 16:31:52 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 786665c970f0e26cb7868757ec09e9ce9aae0f55
Author: Gustavo Noronha Silva <kov at debian.org>
Date: Mon Dec 27 14:22:33 2010 -0200
Changes to make lintian happy, and fix library control files
diff --git a/debian/changelog b/debian/changelog
index 5ff4d4c..2aab650 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,10 +4,19 @@ webkit (1.3.9-1) experimental; urgency=low
- fixes build with newest GTK+
* debian/control:
- build-depend on GTK+ >= 2.91.7 for the GTK+3-based version
+ - build-depend on gir1.2-{gtk-2.0,soup-2.4}
- rename introspection packages to gir1.2-*
- updated Build-Depends on gobject-introspection
+ - tighten dependency of -dev packages on library packages
+ - add missing ${misc:Depends}
+ - update Standards-Version to 3.9.1
+ * debian/rules:
+ - add dh_girepository calls to actually do something to ${gir:Depends}
+ - run dh_makeshlibs targetting the appropriate packages (library ones,
+ not dev)
+ - remove rpath from the installed binaries
- -- Gustavo Noronha Silva <kov at debian.org> Thu, 23 Dec 2010 09:42:48 -0200
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 27 Dec 2010 14:06:08 -0200
webkit (1.3.8-1) experimental; urgency=low
diff --git a/debian/control b/debian/control
index fd1cad3..45ef62f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +3,9 @@ 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), libgtk3.0-dev (>= 2.91.7), gir1.2-gtk-3.0 (>= 2.91.7), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.32.2), 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, gobject-introspection (>= 0.9.12-4), libgirepository1.0-dev (>= 0.9.12-4)
+Build-Depends: chrpath, debhelper (>= 5.0), libgtk2.0-dev (>= 2.10), gir1.2-gtk-2.0, libgtk3.0-dev (>= 2.91.7), gir1.2-gtk-3.0 (>= 2.91.7), libpango1.0-dev (>= 1.16), libicu-dev, libxslt-dev, libsoup2.4-dev (>= 2.32.2), gir1.2-soup-2.4, 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, gobject-introspection (>= 0.9.12-4), libgirepository1.0-dev (>= 0.9.12-4)
Build-Conflicts: gir-repository-dev
-Standards-Version: 3.8.1.0
+Standards-Version: 3.9.1
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
@@ -13,7 +13,9 @@ Vcs-Git: git://git.debian.org/git/pkg-webkit/webkit.git
Package: libwebkitgtk-1.0-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libwebkitgtk-1.0-common (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends},
+ libwebkitgtk-1.0-common (>= ${source:Upstream-Version}),
+ ${misc:Depends}
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
@@ -28,7 +30,8 @@ Package: libwebkit-dev
Section: libdevel
Priority: extra
Architecture: all
-Depends: libwebkitgtk-dev (>= ${source:Upstream-Version})
+Depends: libwebkitgtk-dev (>= ${source:Upstream-Version}),
+ ${misc:Depends}
Description: Dummy package to ease upgrading to the new libwebkitgtk-dev package
This is just a dummy package to provide an upgrade path. It's safe to
uninstall it.
@@ -37,7 +40,10 @@ Package: libwebkitgtk-dev
Section: libdevel
Priority: extra
Architecture: any
-Depends: libwebkitgtk-1.0-0 (>= ${source:Upstream-Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.25.91)
+Depends: libwebkitgtk-1.0-0 (= ${binary:Version}),
+ libgtk2.0-dev,
+ libsoup2.4-dev (>= 2.25.91),
+ ${misc:Depends}
Conflicts: libwebkit-dev (<< 1.3.0)
Description: Web content engine library for Gtk+ - Development files
WebKit is a web content engine, derived from KHTML and KJS from KDE, and
@@ -53,6 +59,7 @@ Description: Web content engine library for Gtk+ - Development files
Package: libwebkitgtk-1.0-common
Section: libs
Priority: optional
+Depends: ${misc:Depends}
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
@@ -68,7 +75,8 @@ Package: libwebkitgtk-1.0-0-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libwebkitgtk-1.0-0 (= ${binary:Version})
+Depends: libwebkitgtk-1.0-0 (= ${binary:Version}),
+ ${misc:Depends}
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
@@ -96,7 +104,9 @@ Description: GObject introspection data for the WebKit library
Package: libwebkitgtk-3.0-0
Section: libs
Architecture: any
-Depends: ${shlibs:Depends}, libwebkitgtk-3.0-common (>= ${source:Upstream-Version})
+Depends: ${shlibs:Depends},
+ libwebkitgtk-3.0-common (>= ${source:Upstream-Version}),
+ ${misc:Depends}
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
@@ -111,7 +121,10 @@ 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)
+Depends: libwebkitgtk-3.0-0 (= ${binary:Version}),
+ libgtk3.0-dev,
+ libsoup2.4-dev (>= 2.25.91),
+ ${misc:Depends}
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
@@ -127,6 +140,7 @@ Package: libwebkitgtk-3.0-common
Section: libs
Priority: optional
Architecture: all
+Depends: ${misc:Depends}
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
@@ -141,7 +155,8 @@ Package: libwebkitgtk-3.0-0-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libwebkitgtk-3.0-0 (= ${binary:Version})
+Depends: libwebkitgtk-3.0-0 (= ${binary:Version}),
+ ${misc:Depends}
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
diff --git a/debian/rules b/debian/rules
index 96f5d7e..43bb6ef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,17 @@ clean:
-test -d build/WebKit/gtk/docs && \
cd build/WebKit/gtk/docs && \
make maintainer-clean
+
+ -rm -rf WebKit/gtk/docs/xml* WebKit/gtk/docs/html* WebKit/gtk/docs/sgml.stamp WebKit/gtk/docs/tmpl*
+ -rm WebKit/gtk/docs/webkitgtk.prerequisites webkit-1.3.9/WebKit/gtk/docs/tmpl.stamp \
+ WebKit/gtk/docs/webkitgtk-overrides.txt WebKit/gtk/docs/webkitgtk.args \
+ WebKit/gtk/docs/webkitgtk.interfaces WebKit/gtk/docs/webkitgtk.signals \
+ WebKit/gtk/docs/webkitgtk.hierarchy WebKit/gtk/docs/tmpl/webkitgtk-unused.sgml \
+ WebKit/gtk/docs/webkitgtk-decl-list.txt WebKit/gtk/docs/webkitgtk-decl.txt \
+ WebKit/gtk/docs/webkitgtk-undeclared.txt WebKit/gtk/docs/webkitgtk-undocumented.txt \
+ WebKit/gtk/docs/webkitgtk-unused.txt
rm -rf build-*
+ rm -rf debian/tmp-*
rm -f WebKit/gtk/docs/version.xml
for file in config.guess config.sub; do \
@@ -104,6 +114,7 @@ ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
[ ! -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
+ chrpath -d debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec/DumpRenderTree debian/tmp-2.0/usr/lib/webkitgtk-1.0-0/libexec/GtkLauncher
install -d -m 755 debian/tmp-2.0/usr/share/doc/libwebkitgtk-dev/html
install -m 644 WebKit/gtk/docs/html/* \
@@ -118,6 +129,7 @@ ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
[ ! -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
+ chrpath -d debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec/DumpRenderTree debian/tmp-3.0/usr/lib/webkitgtk-3.0-0/libexec/GtkLauncher
install -d -m 755 debian/tmp-3.0/usr/share/doc/libwebkitgtk-3.0-dev/html
install -m 644 WebKit/gtk/docs/html/* \
@@ -177,10 +189,12 @@ endif
dh_compress -a
dh_fixperms -a
ifeq (2.0,$(filter 2.0,$(GTK_VERSIONS)))
- dh_makeshlibs -plibwebkitgtk-dev -V 'libwebkitgtk-1.0-0 (>= 1.3.3)' -- -c4
+ dh_makeshlibs -plibwebkitgtk-1.0-0 -V 'libwebkitgtk-1.0-0 (>= 1.3.9)' -- -c4
+ dh_girepository --package=gir1.2-webkit-1.0
endif
ifeq (3.0,$(filter 3.0,$(GTK_VERSIONS)))
- dh_makeshlibs -plibwebkitgtk-3.0-dev -V 'libwebkitgtk-3.0-0' -- -c4
+ dh_makeshlibs -plibwebkitgtk-3.0-0 -V 'libwebkitgtk-3.0-0 (>= 1.3.9)' -- -c4
+ dh_girepository --package=gir1.2-webkit-3.0
endif
dh_installdeb -a
dh_shlibdeps -a
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list