[dune-localfunctions] 01/01: Merge remote-tracking branch 'origin/master'

[Ansgar Burchardt]

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

ansgar pushed a commit to branch master
in repository dune-localfunctions.

commit d39160d6f626494e3d78760c484ef28d926b3862
Merge: 25d7619 99112af
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Tue Jun 10 21:17:09 2014 +0200

    Merge remote-tracking branch 'origin/master'

 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --cc debian/control
index 0d2ab74,e3867ff..2f2ac87
--- a/debian/control
+++ b/debian/control
@@@ -15,9 -15,10 +15,10 @@@ Build-Depends-Indep: doxygen, ghostscri
  Package: libdune-localfunctions-dev
  Section: libdevel
  Architecture: all
+ Multi-Arch: foreign
  Depends: ${misc:Depends},
 - libdune-common-dev (>= 2.3.0),
 - libdune-geometry-dev (>= 2.3.0)
 + libdune-common-dev (>= 2.3.1~rc1),
 + libdune-geometry-dev (>= 2.3.1~rc1)
  Description: toolbox for solving PDEs -- local basis (development files)
   DUNE, the Distributed and Unified Numerics Environment is a modular toolbox
   for solving partial differential equations (PDEs) with grid-based methods.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/dune-localfunctions.git