[med-svn] [praat] 02/02: Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/praat

[Andreas Tille]

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

tille pushed a commit to branch master
in repository praat.

commit 90b1d847117c66fb702f5928fb740bd0779c3e79
Merge: 7b5a4a0 5b3f7d9
Author: Andreas Tille <tille at debian.org>
Date:   Sun Oct 27 18:32:30 2013 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/debian-med/praat
    
    Conflicts:
    	debian/changelog

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

diff --cc debian/changelog
index 903388f,e5fa713..030e6be
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,13 @@@
  praat (5.3.56-2) UNRELEASED; urgency=low
  
++  [ Andreas Tille ]
 +  * Use enhanced uscan to remove *.dmg files
 +
-  -- Andreas Tille <tille at debian.org>  Sat, 26 Oct 2013 22:54:58 +0200
++  [ Rafael Laboissiere ]
+   * debian/rules: Do a proper cleaning of the package
+   * debian/control: Use canonical URIs in VCS-* fields
+ 
+  -- Rafael Laboissiere <rafael at laboissiere.net>  Sun, 27 Oct 2013 16:12:35 +0100
  
  praat (5.3.56-1) unstable; urgency=low
  

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