[med-svn] [picard-tools] 07/07: fix merge with Charles inputs

[Olivier Sallou]

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

osallou pushed a commit to branch master
in repository picard-tools.

commit f458746d298156f2352166cf02c6659e8be6f434
Merge: 4ea677d c8be686
Author: Olivier Sallou <olivier.sallou at debian.org>
Date:   Tue Dec 24 11:38:56 2013 +0100

    fix merge with Charles inputs

 debian/changelog | 1 +
 debian/copyright | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 7cb5232,2f8ac46..c0d4e79
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,9 @@@
 -picard-tools (1.101-1) UNRELEASED; urgency=low
 +picard-tools (1.105-1) unstable; urgency=low
  
 -  * Imported Upstream version 1.101
 +  * New upstream release 1.105 
+   * Conforms with Policy 3.9.5.
  
 - -- Charles Plessy <plessy at debian.org>  Mon, 28 Oct 2013 19:23:50 +0900
 + -- Olivier Sallou <osallou at debian.org>  Tue, 24 Dec 2013 11:16:18 +0100
  
  picard-tools (1.100-1) unstable; urgency=low
  
diff --cc debian/copyright
index f2566e3,188f8a6..223ed71
--- a/debian/copyright
+++ b/debian/copyright
@@@ -112,6 -112,6 +112,7 @@@ Comment: On Debian systems, the complet
  
  Files: debian/*
  Copyright: 2010 Shaun Jackman <sjackman at debian.org>
++           2013 Olivier Sallou <osallou at debian.org>
  License: ISC
   Permission to use, copy, modify, and/or distribute this software for any
   purpose with or without fee is hereby granted, provided that the above

-- 
Alioth's /git/debian-med/git-commit-notice on /srv/git.debian.org/git/debian-med/picard-tools.git