This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 8b23616ba23a553c2082edee6518c4531fdce72d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Sep 22 01:21:25 2018 +0200 debian/control.in: add conflicts from Debian's Firefox package, merged-in with the already existing ones. --- debian/changelog | 2 ++ debian/control.in | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b5bf825..1c3df66 100644 --- a/debian/changelog +++ b/debian/changelog @@ -69,6 +69,8 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium non-system-SQLite mode, but on the other hand also allows users to open the databases directly if they want to. - Add suggestions copied from Debian's Firefox package. + - Add conflicts from Debian's Firefox package, merged-in with the already + existing ones. * debian/rules: - Tabbify. - Add dh_testdir protection. Debian's firefox(-esr) package uses it. diff --git a/debian/control.in b/debian/control.in index 275c96b..813b1d0 100644 --- a/debian/control.in +++ b/debian/control.in @@ -112,8 +112,11 @@ Suggests: fonts-stix | otf-stix, mozplugger, libgssapi-krb5-2 | libkrb53, libcanberra0 +Conflicts: j2re1.4, + pango-graphite (<< 0.9.3), +# Palemoon-specific conflicts. + palemoon-nonsse2, Provides: x-www-browser -Conflicts: palemoon-nonsse2 Replaces: palemoon-nonsse2 Description: Firefox-based, efficient and easy to use web browser Pale Moon offers selected features and optimizations to maximize -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git