This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository pale-moon. commit 4a2a9215c79ff20d0f007af84dcf1e24c3f56f5d Author: Mihai Moldovan <ionic@ionic.de> Date: Sat Sep 22 00:57:14 2018 +0200 debian/control.in: add build conflicts. --- debian/changelog | 1 + debian/control.in | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/debian/changelog b/debian/changelog index 414dd4e..352eb78 100644 --- a/debian/changelog +++ b/debian/changelog @@ -56,6 +56,7 @@ palemoon (27.9.2~repack-1-0x2go1) UNRELEASED; urgency=medium - Add more X build dependencies. - Add fonts build dependencies. - Add (commented out) iso-codes build dependency. + - Add build conflicts. * 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 7a45045..26770e4 100644 --- a/debian/control.in +++ b/debian/control.in @@ -92,6 +92,10 @@ Build-Depends: autotools-dev, pkg-config, # Palemoon-specific dependencies. lsb-release, +Build-Conflicts: graphicsmagick-imagemagick-compat, + liboss4-salsa-dev, + libhildonmime-dev, + libosso-dev Standards-Version: 3.9.6 Homepage: http://www.palemoon.org/ -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/pale-moon.git