[SCM] libbluray/master: Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libbluray

[sramacher at users.alioth.debian.org]

Add a patch to fix spelling error
Refresh d/p/04_kfreebsd-include.patch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c5b5b183d0c1331a1c1a8ac638e8e94c83703456
X-Git-Newrev: 5b62dbf375f8a45c8a53fea63ea6664c4d99a436

The following commit has been merged in the master branch:
commit 5b62dbf375f8a45c8a53fea63ea6664c4d99a436
Merge: e5e86665607969e5a346939fa832244c9cfb4e0f c5b5b183d0c1331a1c1a8ac638e8e94c83703456
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Thu Nov 10 20:53:39 2016 +0100

    Merge branch 'master' of git+ssh://git.debian.org/git/pkg-multimedia/libbluray

diff --combined debian/changelog
index cb25cb0,55d9f73..a004abb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,9 +1,13 @@@
  libbluray (1:0.9.3-3) UNRELEASED; urgency=medium
  
 -  * Team upload.
++  [ Sebastian Ramacher ]
 +  * debian/{control,rules,compat}: Bump to debhelper compat 10.
 +  * debian/{control,rules}: Demote javahelper to B-D-I (Closes: #841711)
 +
++  [ Dylan Aïssi ]
+   * Add a patch to fix spelling error.
+ 
 - -- Dylan Aïssi <bob.dybian at gmail.com>  Wed, 12 Oct 2016 00:14:00 +0200
 + -- Sebastian Ramacher <sramacher at debian.org>  Thu, 10 Nov 2016 20:48:01 +0100
  
  libbluray (1:0.9.3-2) unstable; urgency=medium
  

-- 
libbluray packaging