[pkg-wine-party] [wine] 01/02: Merge branch 'stretch' into jessie-backports-1.8.x

[Jens Reyer]

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

jreyer-guest pushed a commit to branch jessie-backports-1.8.x
in repository wine.

commit 1e06a4c815cfa2d2941449ed955c95164a6615eb
Merge: 6d27b45 770a663
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Feb 5 21:10:08 2017 +0100

    Merge branch 'stretch' into jessie-backports-1.8.x
    
    # Conflicts:
    #	debian/changelog

 debian/changelog           | 13 +++++++++++++
 debian/control.in          |  2 +-
 debian/rules               |  6 ++++++
 debian/scripts/sonames2elf |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index 41bb6c9,35bdd7f..258a9f1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,16 +1,23 @@@
+ wine (1.8.6-5) unstable; urgency=medium
+ 
+   * Enable oss on kfreebsd, explicitly disable it on other archs.
+   * Create the sonames2elf binary without -nostdlib (cf. #853793)
+ 
+  -- Jens Reyer <jre.winesim at gmail.com>  Thu, 02 Feb 2017 15:04:27 +0100
+ 
+ wine (1.8.6-4) unstable; urgency=medium
+ 
+   * Remove outdated oss4 build dependency (closes: #852988).
+ 
+  -- Michael Gilbert <mgilbert at debian.org>  Tue, 31 Jan 2017 06:05:01 +0000
+ 
 +wine (1.8.6-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * No changes.
 +
 + -- Jens Reyer <jre.winesim at gmail.com>  Mon, 30 Jan 2017 23:48:53 +0100
 +
  wine (1.8.6-3) unstable; urgency=medium
  
    * Fix AppStream metainfo file (closes: #848839).

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