[med-svn] [ugene] 04/10: d/control: Add qt4-qmake to build conflicts

[Gert Wollny]

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

gert-guest pushed a commit to branch master
in repository ugene.

commit 756aa9053494355af2a050f8d509fc18f2b179f4
Author: Gert Wollny <gw.fossdev at gmail.com>
Date:   Thu Dec 3 12:34:27 2015 +0100

    d/control: Add qt4-qmake to build conflicts
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index bc78980..0bc0cbe 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Build-Depends: qtbase5-dev,
                libsqlite3-dev,
                libprocps-dev,
                hardening-includes
-Build-Conflicts: libqt4-dev
+Build-Conflicts: libqt4-dev, qt4-qmake
 Standards-Version: 3.9.6
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/ugene.git
 Vcs-Git: git://anonscm.debian.org/debian-med/ugene.git

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ugene.git