[pkg-wine-party] [wine] 01/03: Merge branch 'stretch' into jessie-backports-1.8.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Mon Sep 12 11:21:15 UTC 2016
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 1bffa6da76abb51a6e5d2c40fb7ccc8947dba523
Merge: be1a0f3 ee6f649
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Sun Sep 4 02:00:58 2016 +0200
Merge branch 'stretch' into jessie-backports-1.8.x
# Conflicts:
# debian/changelog
ANNOUNCE | 358 ++++++++++-----------
AUTHORS | 6 +
VERSION | 2 +-
configure | 30 +-
configure.ac | 3 +-
debian/changelog | 11 +
debian/patches/gnutls.patch | 23 --
debian/patches/series | 1 -
debian/patches/sfnt2fon.patch | 4 +-
debian/scripts/import | 2 +-
debian/wineVERSION.prerm | 2 +-
dlls/amstream/mediastream.c | 12 +-
dlls/amstream/tests/amstream.c | 51 ++-
.../api-ms-win-core-localization-l1-2-0.spec | 2 +-
.../api-ms-win-core-localization-l1-2-1.spec | 2 +-
.../api-ms-win-core-memory-l1-1-1.spec | 2 +-
.../api-ms-win-crt-convert-l1-1-0.spec | 2 +-
.../api-ms-win-crt-heap-l1-1-0.spec | 6 +-
.../api-ms-win-crt-locale-l1-1-0.spec | 4 +-
.../api-ms-win-crt-runtime-l1-1-0.spec | 4 +-
dlls/cfgmgr32/cfgmgr32.spec | 4 +-
dlls/comctl32/datetime.c | 4 +-
dlls/comctl32/syslink.c | 2 +
dlls/comctl32/tests/datetime.c | 7 +
dlls/comctl32/tests/tooltips.c | 175 +++++-----
dlls/comctl32/tooltips.c | 6 +
dlls/dbghelp/dbghelp.spec | 4 +-
dlls/dsound/capture.c | 82 ++---
dlls/dsound/dsound_convert.c | 46 +++
dlls/dsound/dsound_private.h | 2 +
dlls/dsound/mixer.c | 8 +
dlls/dwmapi/dwmapi.spec | 2 +-
dlls/dwmapi/dwmapi_main.c | 9 +
dlls/dwrite/font.c | 1 +
dlls/dwrite/opentype.c | 5 +-
dlls/gdi32/tests/dc.c | 1 -
dlls/gdiplus/gdiplus.spec | 2 +-
dlls/gdiplus/gdiplus_private.h | 3 +
dlls/gdiplus/graphics.c | 2 +-
dlls/gdiplus/imageattributes.c | 15 +
dlls/gdiplus/tests/image.c | 66 ++++
dlls/hal/hal.c | 17 +
dlls/hal/hal.spec | 6 +-
dlls/ieframe/ieframe.h | 1 +
dlls/ieframe/oleobject.c | 28 +-
dlls/ieframe/tests/webbrowser.c | 24 +-
dlls/imaadp32.acm/imaadp32.c | 85 +++--
dlls/kernel32/console.c | 14 +
dlls/kernel32/cpu.c | 12 +
dlls/kernel32/heap.c | 8 +
dlls/kernel32/kernel32.spec | 12 +-
dlls/kernel32/locale.c | 88 +++++
dlls/kernel32/tests/locale.c | 220 +++++++++++++
dlls/kernel32/tests/process.c | 16 +
dlls/kernel32/thread.c | 20 --
dlls/msvcp90/locale.c | 37 ++-
dlls/msvcp90/msvcp90.h | 2 +
dlls/msvcr100/msvcr100.spec | 2 +-
dlls/msvcr110/msvcr110.spec | 6 +-
dlls/msvcr120/msvcr120.spec | 6 +-
dlls/msvcr120_app/msvcr120_app.spec | 6 +-
dlls/msvcr80/msvcr80.spec | 2 +-
dlls/msvcr90/msvcr90.spec | 2 +-
dlls/msvcrt/cpp.c | 9 +
dlls/msvcrt/errno.c | 19 ++
dlls/msvcrt/heap.c | 24 ++
dlls/msvcrt/locale.c | 16 +
dlls/msvcrt/mbcs.c | 55 +++-
dlls/msvcrt/msvcrt.spec | 2 +-
dlls/msvcrt/undname.c | 1 +
dlls/ndis.sys/main.c | 22 ++
dlls/ndis.sys/ndis.sys.spec | 6 +-
dlls/ntdll/nt.c | 12 +
dlls/ntdll/ntdll.spec | 4 +-
dlls/riched20/editor.c | 1 -
dlls/riched20/tests/editor.c | 13 +
dlls/secur32/ntlm.c | 92 +++++-
dlls/secur32/schannel_gnutls.c | 3 +-
dlls/setupapi/setupapi.spec | 4 +-
dlls/setupapi/stubs.c | 20 ++
dlls/shell32/shlfileop.c | 2 +-
dlls/t2embed/main.c | 2 +-
dlls/ucrtbase/ucrtbase.spec | 16 +-
dlls/user32/painting.c | 16 +-
dlls/wined3d/context.c | 31 --
dlls/wined3d/device.c | 8 +-
dlls/wined3d/directx.c | 41 ++-
dlls/wined3d/glsl_shader.c | 7 +-
dlls/wined3d/swapchain.c | 43 +++
dlls/wined3d/wined3d_main.c | 7 +
dlls/wined3d/wined3d_private.h | 12 +
dlls/winemac.drv/cocoa_window.m | 2 +
dlls/wininet/netconnection.c | 1 +
dlls/winspool.drv/info.c | 3 +
dlls/winsta/main.c | 7 +
dlls/winsta/winsta.spec | 2 +-
dlls/ws2_32/socket.c | 23 +-
dlls/ws2_32/tests/sock.c | 1 -
dlls/xaudio2_7/xaudio_dll.c | 25 +-
include/Makefile.in | 1 +
include/config.h.in | 3 +
include/dbghelp.h | 2 +
dlls/ndis.sys/main.c => include/ddk/ndis.h | 32 +-
include/ddk/wdm.h | 1 +
include/dwmapi.h | 18 ++
include/gdiplusflat.h | 2 +
include/windef.h | 12 +-
include/winnls.h | 2 +
include/winternl.h | 2 +-
programs/winevdm/winevdm.c | 9 +-
programs/winhlp32/hlpfile.c | 129 +++++---
programs/winhlp32/hlpfile.h | 8 +
server/token.c | 4 +-
tools/make_announce | 11 +-
tools/widl/expr.c | 8 +-
115 files changed, 1738 insertions(+), 645 deletions(-)
diff --cc debian/changelog
index 9d7ee28,c72f366..c97af53
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,14 +1,23 @@@
+ wine (1.8.4-1) unstable; urgency=medium
+
+ * New upstream release 1.8.4, released Aug 22, 2016.
+ - Various bug fixes.
+ - A few more cards added to the GPU description table.
+ * Refresh patches, drop gnutls.patch (applied upstream).
+ * Cherrypick changes from master:
+ - Make "update-alternatives --remove" quiet.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Mon, 29 Aug 2016 17:49:04 +0200
+
+wine (1.8.3-3~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Adjust version in NEWS entry to be shown in backports.
+ * Revert "Drop alternative depends on perl:any (now handled by debhelper)."
+ - debhelper in backports doesn't support this yet.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Tue, 16 Aug 2016 04:44:37 +0200
+
wine (1.8.3-3) unstable; urgency=medium
* Cherrypick changes from master:
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git
More information about the pkg-wine-party
mailing list