[gmt-dcw] 01/02: Merge tag 'debian/1.1.2-1' into jessie-backports

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch jessie-backports
in repository gmt-dcw.

commit f7bd21eea7dd7d3d270b2db23003932be6272fe1
Merge: 6a6f487 9b86934
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 11 10:27:31 2015 +0200

    Merge tag 'debian/1.1.2-1' into jessie-backports
    
    Conflicts:
    	debian/changelog

 ChangeLog        |   5 ++++-
 README.TXT       |   6 +++---
 dcw-gmt.nc       | Bin 24189092 -> 24163575 bytes
 debian/changelog |   6 ++++++
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index e12d138,41b6f46..1dcf51e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,9 +1,16 @@@
+ gmt-dcw (1.1.2-1) unstable; urgency=medium
+ 
+   * New upstream release.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sun, 06 Sep 2015 02:20:40 +0200
+ 
 +gmt-dcw (1.1.1-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Mon, 27 Jul 2015 13:11:07 +0200
 +
  gmt-dcw (1.1.1-3) unstable; urgency=medium
  
    * Fix typo in README.Debian.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt-dcw.git