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

commit 99f775e02a2c46813614e0ea35a31b13b0cdf0b4
Merge: c283800 7a240b4
Author: Ansgar Burchardt <ansgar at debian.org>
Date:   Fri Feb 14 12:00:26 2014 +0100

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

 debian/changelog | 10 ++++++++++
 debian/rules     |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 696195d,b840011..8817ccf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,13 +1,20 @@@
 +dune-typetree (2.3~20140129g62aabcd-1) experimental; urgency=medium
 +
 +  * New upstream snapshot.
 +  * Install CMake support files.
 +
 + -- Ansgar Burchardt <ansgar at debian.org>  Fri, 14 Feb 2014 11:47:05 +0100
 +
+ dune-typetree (2.3~20140114g9c2e89d-1) experimental; urgency=medium
+ 
+   * New upstream snapshot.
+   * libdune-typetree-dev.install: Install /usr/lib/*/cmake and
+     /usr/share/dune-typetree.
+   * Bump (Build-)Depends on libdune-common-dev to >= 2.3~20140117beta2.
+     am/cmake-pkg-config was introduced in that version.
+ 
+  -- Ansgar Burchardt <ansgar at debian.org>  Thu, 23 Jan 2014 11:31:09 +0100
+ 
  dune-typetree (2.3~20140110gbcc5483-1) experimental; urgency=medium
  
    * Initial release.

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