[Pkg-sugar-commit] [sugar-toolkit-gtk3] 02/05: Update package relations: Relax to recommend (not depend on) webkit/webkit2. Favor webkit2 over webkit (and recommend also by itself to further impose that).

Jonas Smedegaard dr at jones.dk
Mon Dec 12 18:22:46 UTC 2016


This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master-0.110
in repository sugar-toolkit-gtk3.

commit 44d33f329a0cbc2a57145a35fb368e875a24a84d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Dec 12 18:38:25 2016 +0100

    Update package relations: Relax to recommend (not depend on) webkit/webkit2. Favor webkit2 over webkit (and recommend also by itself to further impose that).
---
 debian/rules | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 2ce83e1..443e634 100755
--- a/debian/rules
+++ b/debian/rules
@@ -74,7 +74,6 @@ bdeps +=, linux-libc-dev [linux-any], hurd-dev [hurd-any]
 #  * unzip used in sugar3.bundle.bundle
 #  * git used in sugar3.activity.bundlebuilder
 # TODO: relax dependencies for our own GIR when its API is stable
-# TODO: recommend Webkit2 and favor over Webkit when used by Browse and Jarabe
 gir-deps = glib-2.0 gtk-3.0 gconf-2.0 gdkpixbuf-2.0 pango-1.0 rsvg-2.0
 gir-deps += gconf-2.0 atspi-2.0
 python-deps = gi gi-cairo dbus cairo telepathy dateutil decorator
@@ -82,11 +81,12 @@ depends = $(patsubst %,$(comma) python-%,$(python-deps))
 depends +=, $(patsubst %,$(comma) gir1.2-%,$(gir-deps))
 depends +=, gir1.2-sugarext-1.0 (>= $(DEB_VERSION))
 depends +=, gir1.2-sugarext-1.0 (<< $(DEB_VERSION).1~)
-depends +=, gir1.2-webkit-3.0 | gir1.2-webkit2-4.0
 depends-dev = $(pkg-gir) (= $(DEB_VERSION))
 depends-gir = $(pkg-lib) (= $(DEB_VERSION))
 recommends = unzip, telepathy-mission-control-5, alsa-utils
 recommends +=, telepathy-salut, shared-mime-info
+recommends +=, gir1.2-webkit2-4.0
+recommends +=, gir1.2-webkit2-4.0 | gir1.2-webkit-3.0
 suggests = git, ipython
 suggests +=, python-jarabe, python-carquinyol
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-sugar/sugar-toolkit-gtk3.git



More information about the pkg-sugar-commit mailing list