[pkg-wine-party] [wine] 01/02: Merge branch 'master' into jessie-backports-1.7.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.7.x
in repository wine.

commit e87d941417338fa97979a9cebcbc11be54b9338e
Merge: 1c43b0d 967f93d
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Aug 30 00:51:12 2015 +0200

    Merge branch 'master' into jessie-backports-1.7.x
    
    # Conflicts:
    #	debian/changelog

 debian/changelog                                   | 17 ++++++
 debian/control.in                                  |  3 +-
 ...downloading.patch => external-installers.patch} |  2 +-
 debian/patches/series                              |  4 +-
 debian/patches/world-of-warcraft.patch             | 64 ++++++++++++++++++++++
 5 files changed, 87 insertions(+), 3 deletions(-)

diff --cc debian/changelog
index 873cedc,c0f705a..8787dc3
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,20 +1,29 @@@
+ wine-development (1.7.50-3) unstable; urgency=medium
+ 
+   * Fix typo in dependencies.
+ 
+  -- Michael Gilbert <mgilbert at debian.org>  Sat, 29 Aug 2015 21:21:45 +0000
+ 
+ wine-development (1.7.50-2) unstable; urgency=medium
+ 
+   [ Jens Reyer ]
+   * Update recommends libwine-gecko to 2.40.
+ 
+   [ Michael Gilbert ]
+   * Tighten dependencies (closes: #797299).
+   * Apply upstream patch fixing World of Warcraft (closes: #796819).
+ 
+  -- Michael Gilbert <mgilbert at debian.org>  Sat, 29 Aug 2015 14:20:54 +0000
+ 
 +wine-development (1.7.50-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  [ Jens Reyer ]
 +  * Rebuild for jessie-backports (closes: #793551).
 +    Note: depends on backported khronos-api.
 +  * Add myself to uploaders.
 +
 + -- Jens Reyer <jre.winesim at gmail.com>  Fri, 28 Aug 2015 22:48:43 +0200
 +
  wine-development (1.7.50-1) unstable; urgency=medium
  
    * New upstream release 1.7.50, released Aug 21, 2015.

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