[code-saturne] 09/09: Merge remote-tracking branch 'refs/remotes/origin/master'

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository code-saturne.

commit 1bf434141797c1918fc26e7276a8070e91022349
Merge: 983b3b2 ee7d210
Author: Gilles Filippini <pini at debian.org>
Date:   Sat Dec 16 13:21:39 2017 +0100

    Merge remote-tracking branch 'refs/remotes/origin/master'

 debian/changelog | 7 +++++++
 debian/control   | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 8ee4964,d9a9ff3..2a34c57
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,10 +1,23 @@@
 -code-saturne (4.3.3+repack-2) unstable; urgency=medium
++code-saturne (5.1.0+repack-1) UNRELEASED; urgency=medium
+ 
 -  [ Sylvestre Ledru
++  [ Sylvestre Ledru ]
+   * Remove myself from the uploaders
+ 
+  -- Sylvestre Ledru <sylvestre at debian.org>  Fri, 29 Sep 2017 14:30:26 +0200
+ 
 +code-saturne (5.1.0+repack-1) experimental; urgency=medium
 +
 +  * New upstream release
 +  * New patches:
 +    - format-not-a-string-literal-and-no-format-arguments.patch: fix FTBFS
 +    - doxygen-typo.patch: fix a typo in doxygen text
 +  * Use public domain icons from package tango-icon-theme instead of
 +    upstream's old copy of a DFSG incompatible Tango release covered by
 +    CC-BY-SA 2.5
 +  * debian/copyright: machine readable copyright format
 +
 + -- Gilles Filippini <pini at debian.org>  Sat, 16 Dec 2017 11:12:34 +0100
 +
  code-saturne (4.3.3+repack-1) unstable; urgency=medium
  
    * New upstream release

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