[libreoffice] 01/03: actually commit firebird-dev Build-Conflicts:...

[Rene Engelhard <rene@moszumanska.debian.org>]

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

rene pushed a commit to branch debian-experimental-5.1
in repository libreoffice.

commit e4609a0a350ac671db4995a774aab4656fdaedb6
Author: Rene Engelhard <rene@debian.org>
Date:   Wed Nov 11 00:13:18 2015 +0100

    actually commit firebird-dev Build-Conflicts:...
---
 control | 1 +
 1 file changed, 1 insertion(+)

diff --git a/control b/control
index 4891108..ea94cb8 100644
--- a/control
+++ b/control
@@ -164,6 +164,7 @@ Build-Conflicts: amd-libopencl1,
                  ant (= 1.8.0-1) [hppa ia64 s390 sparc],
                  ant (= 1.8.0-2) [hppa ia64 s390 sparc],
                  ant (= 1.8.0-3) [hppa ia64 s390 sparc],
+                 firebird-dev (>= 3.0),
                  flex (= 2.5.34-1) [amd64],
                  g++-4.6 (= 4.6.1-10),
                  g++-4.6 (= 4.6.1-11),

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git