From kov at debian.org Mon Nov 2 19:09:50 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Mon, 02 Nov 2009 19:09:50 +0000 Subject: [SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-1-1-g4775f19 Message-ID: The following commit has been merged in the debian/unstable branch: commit 4775f19d7f9416a3e029959cb03966beced2922b Author: Gustavo Noronha Silva Date: Mon Nov 2 17:09:14 2009 -0200 Tighten dependency of the -dev on the library diff --git a/debian/changelog b/debian/changelog index 6aa2676..cb0b2cf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +webkit (1.1.16-2) unstable; urgency=low + + * debian/control: + - tighten libwebkit-dev dependency on the library + (Closes: #554014) + + -- Gustavo Noronha Silva Mon, 02 Nov 2009 17:07:03 -0200 + webkit (1.1.16-1) unstable; urgency=low * New upstream release diff --git a/debian/control b/debian/control index 691040d..30ed56f 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Package: libwebkit-dev Section: libdevel Priority: extra Architecture: any -Depends: libwebkit-1.0-2 (>= ${source:Upstream-Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.25.91) +Depends: libwebkit-1.0-2 (= ${source:Upstream-Version}), libgtk2.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 -- WebKit Debian packaging From kov at debian.org Mon Nov 9 18:49:53 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Mon, 09 Nov 2009 18:49:53 +0000 Subject: [SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-1-4-g213e409 Message-ID: The following commit has been merged in the debian/unstable branch: commit 4f4656d2ac716cd24bb0a3bb7c6b9a1bd97b3f8f Author: Gustavo Noronha Silva Date: Mon Nov 9 11:40:19 2009 -0200 Fix building on kfresbsd-amd64 diff --git a/JavaScriptCore/wtf/Platform.h b/JavaScriptCore/wtf/Platform.h index 580f4bc..e5298cc 100644 --- a/JavaScriptCore/wtf/Platform.h +++ b/JavaScriptCore/wtf/Platform.h @@ -730,7 +730,7 @@ #endif #if !defined(WTF_USE_JSVALUE64) && !defined(WTF_USE_JSVALUE32) && !defined(WTF_USE_JSVALUE32_64) -#if (PLATFORM(X86_64) && (PLATFORM(DARWIN) || PLATFORM(LINUX) || PLATFORM(FREEBSD))) || PLATFORM(IA64) || PLATFORM(ALPHA) +#if (PLATFORM(X86_64) && PLATFORM(UNIX)) || PLATFORM(IA64) || PLATFORM(ALPHA) #define WTF_USE_JSVALUE64 1 #elif PLATFORM(ARM) || PLATFORM(PPC64) #define WTF_USE_JSVALUE32 1 diff --git a/debian/changelog b/debian/changelog index cb0b2cf..f08601b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +webkit (1.1.16-3) unstable; urgency=low + + * Fix building on kfresbsd-amd64 (Closes: #554718) + - Patch by Petr Salinger + + -- Gustavo Noronha Silva Mon, 09 Nov 2009 11:39:42 -0200 + webkit (1.1.16-2) unstable; urgency=low * debian/control: -- WebKit Debian packaging From kov at debian.org Mon Nov 9 18:49:55 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Mon, 09 Nov 2009 18:49:55 +0000 Subject: [SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-1-4-g213e409 Message-ID: The following commit has been merged in the debian/unstable branch: commit ce1dece9f5a8c0dfb4213acf8ddc4388569388a2 Author: Gustavo Noronha Silva Date: Mon Nov 9 15:13:54 2009 -0200 Fix tightened dependency diff --git a/debian/changelog b/debian/changelog index f08601b..ab91d9d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ webkit (1.1.16-3) unstable; urgency=low * Fix building on kfresbsd-amd64 (Closes: #554718) - Patch by Petr Salinger + * Fix tightened dependency -- Gustavo Noronha Silva Mon, 09 Nov 2009 11:39:42 -0200 diff --git a/debian/control b/debian/control index 30ed56f..1543b55 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Package: libwebkit-dev Section: libdevel Priority: extra Architecture: any -Depends: libwebkit-1.0-2 (= ${source:Upstream-Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.25.91) +Depends: libwebkit-1.0-2 (= ${binary:Version}), libgtk2.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 -- WebKit Debian packaging From kov at debian.org Mon Nov 9 18:49:55 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Mon, 09 Nov 2009 18:49:55 +0000 Subject: [SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-1-4-g213e409 Message-ID: The following commit has been merged in the debian/unstable branch: commit 213e409631ef2031b852c680e950fa9db4958b34 Author: Gustavo Noronha Silva Date: Mon Nov 9 15:14:25 2009 -0200 Fix -dev dependency on libsoup2.4-dev diff --git a/debian/control b/debian/control index 1543b55..0c12699 100644 --- a/debian/control +++ b/debian/control @@ -27,7 +27,7 @@ Package: libwebkit-dev Section: libdevel Priority: extra Architecture: any -Depends: libwebkit-1.0-2 (= ${binary:Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.25.91) +Depends: libwebkit-1.0-2 (= ${binary:Version}), libgtk2.0-dev, libsoup2.4-dev (>= 2.27.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 -- WebKit Debian packaging From kov at debian.org Mon Nov 9 18:50:20 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Mon, 09 Nov 2009 18:50:20 +0000 Subject: [SCM] WebKit Debian packaging annotated tag, debian/1.1.16-3, created. debian/1.1.16-3 Message-ID: The annotated tag, debian/1.1.16-3 has been created at 7be085f407e1c78f35bfd566cfa44db14eecbbdc (tag) tagging 213e409631ef2031b852c680e950fa9db4958b34 (commit) replaces debian/1.1.16-1 tagged by Gustavo Noronha Silva on Mon Nov 9 16:49:12 2009 -0200 - Shortlog ------------------------------------------------------------ Tagging 1.1.16-3. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAABCAAGBQJK+GQuAAoJENIA6zCg+12mrIgIAJ06NrQVRDGxLrA3XUIwiGm9 CwE1Oyue1HYGL9ikSpndZ+Mqw4nsMQWF8bsQSMBpo5prYmH3KK4L/m3O0uTr1hGT 6U82C7xPNuuL/BtMZ2K1iVQquNhm5EdBiv0HQsyhbSlNcyENiSEzLCX3BcOOPdjT hfqmJ4YXSUMePMtvlu/hkzPaxW2kw6dm0okOSdeipnL50BAtLnobI8j7lEAAc/X0 53m8/a2m7qWqtfA0m168UonIV9iFI5bafbU6NBDCw2ElsNUNgn4ScLWD8wSO05HD GvGL2LrRrSj8c8IY3JjSWMFsgEigv6SfgAigN80xerTf+ZSNa3YopBLfGDT2uvY= =1AyM -----END PGP SIGNATURE----- Gustavo Noronha Silva (4): Tighten dependency of the -dev on the library Fix building on kfresbsd-amd64 Fix tightened dependency Fix -dev dependency on libsoup2.4-dev ----------------------------------------------------------------------- -- WebKit Debian packaging From kov at debian.org Thu Nov 12 00:33:49 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Thu, 12 Nov 2009 00:33:49 +0000 Subject: [SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.16-3-1-g402fc21 Message-ID: The following commit has been merged in the debian/unstable branch: commit 402fc21c429f91b161967ea145a4e05bd5993791 Author: Gustavo Noronha Silva Date: Wed Nov 11 21:21:51 2009 -0200 Make lintian happy by removing rpath from binaries diff --git a/debian/changelog b/debian/changelog index ab91d9d..94c42f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,8 +3,12 @@ webkit (1.1.16-3) unstable; urgency=low * Fix building on kfresbsd-amd64 (Closes: #554718) - Patch by Petr Salinger * Fix tightened dependency + * debian/rules: + - remove rpath from GtkLauncher and DumpRenderTree + * debian/control: + - depend on chrpath for change above - -- Gustavo Noronha Silva Mon, 09 Nov 2009 11:39:42 -0200 + -- Gustavo Noronha Silva Wed, 11 Nov 2009 21:21:12 -0200 webkit (1.1.16-2) unstable; urgency=low diff --git a/debian/control b/debian/control index 0c12699..ce6a963 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Section: web Maintainer: Debian WebKit Maintainers Uploaders: Mike Hommey , Gustavo Noronha Silva -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 +Build-Depends: debhelper (>= 5.0), chrpath, 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 Standards-Version: 3.8.1.0 Homepage: http://webkit.org/ Vcs-Browser: http://git.debian.org/?p=pkg-webkit/webkit.git diff --git a/debian/rules b/debian/rules index c68332d..9f3c1ff 100755 --- a/debian/rules +++ b/debian/rules @@ -82,7 +82,9 @@ install-stamp: build-stamp $(MAKE) -C build install DESTDIR="$(CURDIR)"/debian/tmp [ ! -d debian/tmp/usr/lib/webkit-1.0-2/libexec ] && install -d -m 755 debian/tmp/usr/lib/webkit-1.0-2/libexec || true build/libtool --mode=install install -m 755 build/Programs/DumpRenderTree "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/DumpRenderTree + chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/DumpRenderTree build/libtool --mode=install install -m 755 build/Programs/GtkLauncher "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/GtkLauncher + chrpath -d "$(CURDIR)"/debian/tmp/usr/lib/webkit-1.0-2/libexec/GtkLauncher install -d -m 755 debian/tmp/usr/share/doc/libwebkit-dev/html install -m 644 WebKit/gtk/docs/html/* \ -- WebKit Debian packaging From kov at debian.org Thu Nov 12 00:34:30 2009 From: kov at debian.org (Gustavo Noronha Silva) Date: Thu, 12 Nov 2009 00:34:30 +0000 Subject: [SCM] WebKit Debian packaging annotated tag, debian/1.1.16-3, updated. debian/1.1.16-3 Message-ID: The annotated tag, debian/1.1.16-3 has been updated to 73837660f5206a83d1c54da67e276f33ad08fdf9 (tag) from 7be085f407e1c78f35bfd566cfa44db14eecbbdc (which is now obsolete) tagging 402fc21c429f91b161967ea145a4e05bd5993791 (commit) replaces debian/1.1.16-1 tagged by Gustavo Noronha Silva on Wed Nov 11 22:33:01 2009 -0200 - Shortlog ------------------------------------------------------------ Tagging 1.1.16-3. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.10 (GNU/Linux) iQEcBAABCAAGBQJK+1fGAAoJENIA6zCg+12mlCUH/1DxUivPbAhYewjMoU1K8C4G 4UB368qFCYyjOR9IACV6YZ3uNUPsiKIE6pA14pIrWC4ilMTF3BZF/+LHMoNyb2YV tu3UzsrBZSeRBjhBHFEuCzGuWqyE1ONLiLggSb3Hx9RRuhKn7V1XEtnTRldu78QX d5TFpJ/ibjKt8EJ3F+ckNvYc1XzP89po8smxuow1PfAil+fb0if7M2EulfPZX+Ve q85IfcJy0sH46r8XZx4zcVcaB/POHkgpPwygj1U0vuhXQjPcj6zCa0bwu1zzNUk7 rHr2d1A+gpk+qqKSV4ty0GJl8aRxig43S2EK8oDOmr8rUtVQrrDIgVxV5Mh9ZkM= =nV3n -----END PGP SIGNATURE----- Gustavo Noronha Silva (5): Tighten dependency of the -dev on the library Fix building on kfresbsd-amd64 Fix tightened dependency Fix -dev dependency on libsoup2.4-dev Make lintian happy by removing rpath from binaries ----------------------------------------------------------------------- -- WebKit Debian packaging