Commit 2991c188 authored by Adam Powell's avatar Adam Powell

Build-Conflict with gcc-multilib

parent 4d1c6291
...@@ -3,8 +3,9 @@ elmerfem (6.1.0.svn.5396.dfsg-1) unstable; urgency=low ...@@ -3,8 +3,9 @@ elmerfem (6.1.0.svn.5396.dfsg-1) unstable; urgency=low
* New upstream revision. * New upstream revision.
* Added DEB_PY_VERSIONS to ElmerGUI clean to make sure that works. * Added DEB_PY_VERSIONS to ElmerGUI clean to make sure that works.
* Patched ElmerClips to use libav/0.7.1 (closes: #640548). * Patched ElmerClips to use libav/0.7.1 (closes: #640548).
* Build-Conflict with gcc-multilib (closes: #640504).
-- "Adam C. Powell, IV" <hazelsct@debian.org> Sat, 01 Oct 2011 22:32:51 +0900 -- "Adam C. Powell, IV" <hazelsct@debian.org> Sat, 01 Oct 2011 22:37:15 +0900
elmerfem (6.1.0.svn.5272.dfsg-1) unstable; urgency=low elmerfem (6.1.0.svn.5272.dfsg-1) unstable; urgency=low
......
...@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 5), quilt, po-debconf, autoconf, automake, ...@@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 5), quilt, po-debconf, autoconf, automake,
libopencascade-modeling-dev, libqt4-dev, qt4-qmake, libqt4-opengl-dev, libopencascade-modeling-dev, libqt4-dev, qt4-qmake, libqt4-opengl-dev,
libqwt5-qt4-dev, libvtk5-qt4-dev (>= 5.6), python-qt4-dev, libscotchmetis-dev, libqwt5-qt4-dev, libvtk5-qt4-dev (>= 5.6), python-qt4-dev, libscotchmetis-dev,
r-base-core, libavcodec-dev, libavutil-dev, libswscale-dev r-base-core, libavcodec-dev, libavutil-dev, libswscale-dev
Build-Conflicts: libatlas3gf-base, libatlas-base-dev Build-Conflicts: libatlas3gf-base, libatlas-base-dev, gcc-multilib
Vcs-Git: git://git.debian.org/git/debian-science/packages/elmerfem.git Vcs-Git: git://git.debian.org/git/debian-science/packages/elmerfem.git
Vcs-Browser: http://git.debian.org/?p=debian-science/packages/elmerfem.git Vcs-Browser: http://git.debian.org/?p=debian-science/packages/elmerfem.git
Homepage: http://www.csc.fi/elmer/ Homepage: http://www.csc.fi/elmer/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment