[dune-common] 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-common.

commit fe3a7200f6e3953a50ce5abf62c7ce264c75860b
Merge: 4ddc191 d150e7b
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Feb 14 10:23:56 2014 +0100

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	debian/control

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

diff --cc debian/control
index 3ce4340,5b0b2bc..c9ca6f2
--- a/debian/control
+++ b/debian/control
@@@ -14,9 -14,9 +14,9 @@@ Build-Depends-Indep: doxygen, ghostscri
  Package: libdune-common-dev
  Section: libdevel
  Architecture: any
 -Depends: ${misc:Depends}, libdune-common-2.3svn (= ${binary:Version}),
 +Depends: ${misc:Depends}, libdune-common-2.3.0 (= ${binary:Version}),
-  python, python-pyparsing
- Recommends: automake, autoconf, libtool, pkg-config
+  pkg-config, python, python-pyparsing
+ Recommends: automake, autoconf, libtool
  Suggests: libdune-common-dbg (= ${binary:Version})
  Description: toolbox for solving PDEs -- basic classes (development files)
   DUNE, the Distributed and Unified Numerics Environment is a modular toolbox

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