[libm4ri] 13/14: Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/libm4ri

[Cédric Boutillier]

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

boutil pushed a commit to branch master
in repository libm4ri.

commit 9f9a9c2227cd9f55b8e310033f59974b75673a2a
Merge: 29b3166 d28bb20
Author: Cédric Boutillier <boutil at debian.org>
Date:   Sat Oct 18 22:51:28 2014 +0200

    Merge branch 'master' of ssh://git.debian.org/git/debian-science/packages/libm4ri
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog         | 7 +++++++
 debian/upstream/metadata | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 6116ccb,aebf6e9..552ccb5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,23 -1,10 +1,30 @@@
 +libm4ri (20140914-1) unstable; urgency=medium
 +
 +  [ Martin Albrecht ]
 +  * Imported Upstream version 20140914
 +  * debian/watch: update URL
 +  * Update package name of libraries to new soname
 +  * Bump Standards-Version to 3.9.6 (no changes needed)
 +  * Remove paragraph in copyright file for file not shipped anymore
 +  * debian/patches:
 +    + drop dont_disable_sse2_for_opteron.patch, applied upstream
 +    + add fix_pkgconfig_file.patch, to not include bad directives in
 +      pkg-config file
 +  * Remove gbp configuration; now using released tarballs imported with uscan
 +    instead of bitbucket repository as upstream source
 +  * Move upstream data to debian/upstream/metadata
 +  * Automatically read upstream version in debian/rules and reuse it to guess
 +    the name of the -dbg package
 +
 + -- Cédric Boutillier <boutil at debian.org>  Wed, 15 Oct 2014 23:30:02 +0200
 +
+ libm4ri (20130416-6) unstable; urgency=low
+ 
+   * Build-Depend on autoconf instead of autoconf1.10 (Closes: #724406)
+   * Bump Standards-Version to 3.9.5 (no changes needed)
+ 
+  -- Cédric Boutillier <boutil at debian.org>  Thu, 21 Nov 2013 11:13:22 +0100
+ 
  libm4ri (20130416-5) unstable; urgency=low
  
    * Disable openMP on all architectures for now, as recommended by upstream.

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