[med-svn] [maffilter] 01/02: Merge tag 'debian/1.1.0-1+dfsg-2' into debian/jessie-backports

[Andreas Tille]

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

tille pushed a commit to branch debian/jessie-backports
in repository maffilter.

commit cf8a942d66fd80ba05b6420e1021fcc5e6c0a526
Merge: f1b6ec9 cf057a5
Author: Andreas Tille <tille at debian.org>
Date:   Tue May 24 09:20:37 2016 +0200

    Merge tag 'debian/1.1.0-1+dfsg-2' into debian/jessie-backports
    
    Conflicts:
    	debian/changelog

 debian/changelog          |  7 +++++++
 debian/install            |  2 ++
 debian/maffilter.manpages |  1 -
 debian/rules              | 17 +++++------------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --cc debian/changelog
index 0a89c59,55b0574..b753c1e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,10 +1,16 @@@
+ maffilter (1.1.0-1+dfsg-2) unstable; urgency=medium
+ 
+   * Fix permissions
+   * Properly install executable and info file
+ 
+  -- Andreas Tille <tille at debian.org>  Sun, 22 May 2016 21:58:51 +0200
+ 
 +maffilter (1.1.0-1+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Andreas Tille <tille at debian.org>  Fri, 20 May 2016 23:34:02 +0200
 +
  maffilter (1.1.0-1+dfsg-1) unstable; urgency=medium
  
    * Initial release (Closes: #822776)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/maffilter.git