[magics] 03/05: Merge back changes to home branch

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository magics.

commit 0df2ea329aab380f6e8431c64f6270767afaecd1
Merge: 5734437 8af2106
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Aug 19 22:32:23 2015 +0100

    Merge  back changes to home branch

 debian/changelog | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index f3071d0,7dd016d..13defb8
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,8 +1,16 @@@
- magics++ (2.24.7-4) unstable; urgency=medium
 -magics++ (2.24.7-4) UNRELEASED; urgency=medium
++magics++ (2.24.7-5) unstable; urgency=medium
  
 +  * Rebuild against libterralib3 for terralib, g++5 transitions.
 +  * Undo the netcdf transition for the moment
    * Move Qt4 -> Qt5 
  
-- -- Alastair McKinstry <mckinstry at debian.org>  Wed, 29 Jul 2015 10:36:42 +0100
++ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 07 Aug 2015 13:28:04 +0100
++
++magics++ (2.24.7-4) experimental; urgency=medium
++
++  * Build against new netcdf (4.4.0). Closes: #793882.
++
++ -- Alastair McKinstry <mckinstry at debian.org>  Tue, 28 Jul 2015 13:32:09 +0100
  
  magics++ (2.24.7-3) experimental; urgency=medium
  

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