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

Jens Reyer jreyer-guest at moszumanska.debian.org
Fri Sep 11 17:53:36 UTC 2015


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 960058cb1cd794d7551661e68827584e970723e3
Merge: 2efafc7 95b87c1
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Thu Sep 10 15:24:08 2015 +0200

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

 ANNOUNCE                                           |  671 ++--
 AUTHORS                                            |    2 +
 VERSION                                            |    2 +-
 configure                                          |  105 +-
 configure.ac                                       |   34 +-
 debian/changelog                                   |   11 +
 debian/patches/disable/shlib-exit-calls.patch      |    2 +-
 debian/patches/series                              |    2 -
 debian/patches/world-of-warcraft.patch             |   64 -
 dlls/advapi32/registry.c                           |   16 +
 dlls/advapi32/security.c                           |    6 +-
 dlls/advapi32/tests/cred.c                         |    4 +-
 dlls/advapi32/tests/registry.c                     |   40 +-
 dlls/advapi32/tests/security.c                     |   17 +-
 dlls/api-ms-win-crt-conio-l1-1-0/Makefile.in       |    1 +
 .../api-ms-win-crt-conio-l1-1-0.spec               |   30 +
 dlls/api-ms-win-crt-convert-l1-1-0/Makefile.in     |    1 +
 .../api-ms-win-crt-convert-l1-1-0.spec             |  122 +
 dlls/api-ms-win-crt-environment-l1-1-0/Makefile.in |    1 +
 .../api-ms-win-crt-environment-l1-1-0.spec         |   18 +
 dlls/api-ms-win-crt-filesystem-l1-1-0/Makefile.in  |    1 +
 .../api-ms-win-crt-filesystem-l1-1-0.spec          |   65 +
 dlls/api-ms-win-crt-heap-l1-1-0/Makefile.in        |    1 +
 .../api-ms-win-crt-heap-l1-1-0.spec                |   27 +
 dlls/api-ms-win-crt-locale-l1-1-0/Makefile.in      |    1 +
 .../api-ms-win-crt-locale-l1-1-0.spec              |   20 +
 dlls/api-ms-win-crt-math-l1-1-0/Makefile.in        |    1 +
 .../api-ms-win-crt-math-l1-1-0.spec                |  340 ++
 dlls/api-ms-win-crt-multibyte-l1-1-0/Makefile.in   |    1 +
 .../api-ms-win-crt-multibyte-l1-1-0.spec           |  200 ++
 dlls/api-ms-win-crt-private-l1-1-0/Makefile.in     |    1 +
 .../api-ms-win-crt-private-l1-1-0.spec             | 1167 ++++++
 dlls/api-ms-win-crt-process-l1-1-0/Makefile.in     |    1 +
 .../api-ms-win-crt-process-l1-1-0.spec             |   36 +
 dlls/api-ms-win-crt-runtime-l1-1-0/Makefile.in     |    1 +
 .../api-ms-win-crt-runtime-l1-1-0.spec             |  107 +
 dlls/api-ms-win-crt-stdio-l1-1-0/Makefile.in       |    1 +
 .../api-ms-win-crt-stdio-l1-1-0.spec               |  159 +
 dlls/api-ms-win-crt-string-l1-1-0/Makefile.in      |    1 +
 .../api-ms-win-crt-string-l1-1-0.spec              |  178 +
 dlls/api-ms-win-crt-time-l1-1-0/Makefile.in        |    1 +
 .../api-ms-win-crt-time-l1-1-0.spec                |   72 +
 dlls/api-ms-win-crt-utility-l1-1-0/Makefile.in     |    1 +
 .../api-ms-win-crt-utility-l1-1-0.spec             |   30 +
 dlls/comdlg32/comdlg32.rc                          |   19 +-
 dlls/comdlg32/itemdlg.c                            |  255 +-
 dlls/comdlg32/tests/itemdlg.c                      |    4 +-
 dlls/crypt32/cert.c                                |    1 +
 dlls/d2d1/factory.c                                |    1 +
 dlls/d2d1/geometry.c                               |   16 +-
 dlls/d3d10core/d3d10core_main.c                    |    1 -
 dlls/d3d10core/tests/device.c                      |  175 +-
 dlls/d3d11/async.c                                 |    6 +-
 dlls/d3d11/buffer.c                                |  198 +-
 dlls/d3d11/d3d11_main.c                            |   22 +-
 dlls/d3d11/d3d11_private.h                         |   61 +-
 dlls/d3d11/device.c                                | 3724 ++++++++++----------
 dlls/d3d11/inputlayout.c                           |    6 +-
 dlls/d3d11/shader.c                                |   18 +-
 dlls/d3d11/state.c                                 |   24 +-
 dlls/d3d11/tests/Makefile.in                       |    5 +
 dlls/d3d11/tests/d3d11.c                           |  653 ++++
 dlls/d3d11/texture.c                               |  567 ++-
 dlls/d3d11/utils.c                                 |  166 +-
 dlls/d3d11/view.c                                  |   18 +-
 dlls/d3d8/device.c                                 |   89 +-
 dlls/d3d8/swapchain.c                              |   15 +-
 dlls/d3d8/tests/device.c                           |  157 +
 dlls/d3d9/device.c                                 |  101 +-
 dlls/d3d9/swapchain.c                              |   19 +-
 dlls/d3d9/tests/d3d9ex.c                           |  159 +
 dlls/d3d9/tests/device.c                           |  156 +
 dlls/d3d9/tests/visual.c                           |    6 +-
 dlls/d3drm/texture.c                               |  459 ++-
 dlls/d3dx9_36/effect.c                             |    2 +-
 dlls/d3dx9_36/surface.c                            |   22 +-
 dlls/d3dx9_36/tests/core.c                         |    2 +-
 dlls/d3dx9_36/tests/surface.c                      |  196 +-
 dlls/ddraw/ddraw.c                                 |   23 +-
 dlls/ddraw/surface.c                               |   30 +-
 dlls/ddraw/tests/ddraw1.c                          |  452 +++
 dlls/ddraw/tests/ddraw2.c                          |  425 +++
 dlls/ddraw/tests/ddraw4.c                          |  447 ++-
 dlls/ddraw/tests/ddraw7.c                          |  419 +++
 dlls/dplayx/dplay.c                                |    2 +-
 dlls/dwrite/dwrite_private.h                       |   17 +-
 dlls/dwrite/font.c                                 |  810 +++--
 dlls/dwrite/freetype.c                             |  198 +-
 dlls/dwrite/gdiinterop.c                           |   10 +
 dlls/dwrite/main.c                                 |   22 +-
 dlls/dwrite/opentype.c                             |    2 +-
 dlls/dwrite/tests/font.c                           |   22 +-
 dlls/dxgi/device.c                                 |   10 +-
 dlls/dxgi/factory.c                                |   30 +-
 dlls/dxgi/swapchain.c                              |   12 +-
 dlls/dxgi/tests/device.c                           |  195 +-
 dlls/gdi.exe16/printdrv.c                          |    4 +-
 dlls/gdi32/dibdrv/dc.c                             |    4 +-
 dlls/gdi32/driver.c                                |   12 +-
 dlls/gdi32/enhmfdrv/init.c                         |    2 +-
 dlls/gdi32/font.c                                  |   46 +-
 dlls/gdi32/freetype.c                              |   18 +-
 dlls/gdi32/gdi32.spec                              |    1 +
 dlls/gdi32/gdi_private.h                           |   10 +-
 dlls/gdi32/mfdrv/init.c                            |    2 +-
 dlls/gdi32/path.c                                  |    2 +-
 dlls/gdi32/tests/font.c                            |   42 +-
 dlls/gdi32/tests/metafile.c                        |   34 +
 dlls/hidclass.sys/Makefile.in                      |    1 +
 dlls/hidclass.sys/device.c                         |  196 ++
 dlls/hidclass.sys/hid.h                            |   30 +
 dlls/hidclass.sys/parse.h                          |   72 +
 dlls/ieframe/tests/webbrowser.c                    |    2 +
 dlls/imm32/imm.c                                   |    1 -
 dlls/imm32/tests/imm32.c                           |   24 +
 dlls/kernel32/locale.c                             |    3 +
 dlls/kernel32/locale_rc.rc                         |    2 +
 dlls/kernel32/nls/ivl.nls                          |  160 +
 dlls/kernel32/tests/locale.c                       |  192 +-
 dlls/kernel32/tests/thread.c                       |   38 +-
 dlls/mciavi32/mciavi.c                             |   13 +-
 dlls/mfplat/mfplat.spec                            |    2 +-
 dlls/mscoree/metahost.c                            |   22 +-
 dlls/mshtml/htmloption.c                           |   84 +-
 dlls/mshtml/htmlselect.c                           |    1 -
 dlls/mshtml/tests/dom.c                            |   93 +-
 dlls/mshtml/tests/htmldoc.c                        |    2 +-
 dlls/mshtml/tests/xmlhttprequest.c                 |    3 +
 dlls/msi/action.c                                  |   73 +-
 dlls/msi/automation.c                              |   30 +-
 dlls/msi/tests/action.c                            |    8 +-
 dlls/msi/tests/automation.c                        |   33 +-
 dlls/msscript.ocx/msscript.idl                     |    4 +-
 dlls/msvcrt/data.c                                 |   26 +
 dlls/msvcrt/exit.c                                 |    9 +
 dlls/msvcrt/main.c                                 |   16 +-
 dlls/msvcrt/tests/data.c                           |    6 +-
 dlls/msvcrt/tests/locale.c                         |    4 +-
 dlls/msvcrt/tests/string.c                         |    5 +
 dlls/msvidc32/msvideo1.c                           |   32 +-
 dlls/msxml3/saxreader.c                            |    3 +-
 dlls/netapi32/netapi32.c                           |    5 +
 dlls/netprofm/list.c                               | 1326 ++++++-
 dlls/netprofm/tests/Makefile.in                    |    2 +-
 dlls/netprofm/tests/list.c                         |  166 +-
 dlls/ntdll/debugtools.c                            |    3 +
 dlls/ntdll/sync.c                                  |   22 +-
 dlls/ole32/compobj.c                               |   44 +-
 dlls/ole32/compobj_private.h                       |    6 +-
 dlls/ole32/marshal.c                               |   99 +-
 dlls/ole32/stubmanager.c                           |   76 +-
 dlls/ole32/tests/compobj.c                         |  126 +-
 dlls/ole32/tests/marshal.c                         |   78 +-
 dlls/oleaut32/tests/tmarshal.c                     |   33 +-
 dlls/oleaut32/tests/tmarshal.idl                   |    5 +-
 dlls/oleaut32/tests/tmarshal_dispids.h             |    1 +
 dlls/oleaut32/tmarshal.c                           |   16 +-
 dlls/quartz/avisplit.c                             |   47 +-
 dlls/riched20/editor.c                             |   45 +-
 dlls/riched20/tests/editor.c                       |   95 +
 dlls/riched20/undo.c                               |    1 +
 dlls/rpcrt4/tests/ndr_marshall.c                   |    2 +-
 dlls/shell32/shlfileop.c                           |   11 +-
 dlls/ucrtbase/Makefile.in                          |   32 +
 dlls/ucrtbase/ucrtbase.spec                        | 2598 ++++++++++++++
 dlls/user32/tests/win.c                            |    6 +-
 dlls/usp10/tests/usp10.c                           |   36 +-
 dlls/usp10/usp10.c                                 |    3 +-
 dlls/version/version.c                             |    4 +-
 dlls/wined3d/arb_program_shader.c                  |  128 +-
 dlls/wined3d/buffer.c                              |    8 +-
 dlls/wined3d/context.c                             |   40 +-
 dlls/wined3d/cs.c                                  |    4 +-
 dlls/wined3d/device.c                              |   91 +-
 dlls/wined3d/directx.c                             |    3 +-
 dlls/wined3d/drawprim.c                            |   24 +-
 dlls/wined3d/glsl_shader.c                         |  110 +-
 dlls/wined3d/nvidia_texture_shader.c               |   12 +-
 dlls/wined3d/shader.c                              |   70 +-
 dlls/wined3d/shader_sm1.c                          |   38 +-
 dlls/wined3d/shader_sm4.c                          |   28 +-
 dlls/wined3d/state.c                               |   62 +-
 dlls/wined3d/stateblock.c                          |   22 +-
 dlls/wined3d/surface.c                             |   45 +-
 dlls/wined3d/swapchain.c                           |   71 +-
 dlls/wined3d/texture.c                             |   10 +-
 dlls/wined3d/utils.c                               |  128 +-
 dlls/wined3d/wined3d.spec                          |    1 -
 dlls/wined3d/wined3d_private.h                     |   66 +-
 dlls/winemac.drv/gdi.c                             |    2 +-
 dlls/wineps.drv/init.c                             |    2 +-
 dlls/winex11.drv/init.c                            |    2 +-
 dlls/winex11.drv/keyboard.c                        |    2 +-
 dlls/winex11.drv/window.c                          |    1 +
 dlls/winex11.drv/xrender.c                         |    2 +-
 dlls/winhttp/request.c                             |   46 +-
 dlls/winhttp/tests/winhttp.c                       |  306 +-
 dlls/wininet/http.c                                |   32 +-
 dlls/wininet/internet.c                            |    5 +-
 dlls/wininet/tests/http.c                          |   10 +-
 dlls/winspool.drv/info.c                           |    5 +
 dlls/wpcap/wpcap.c                                 |   51 +
 dlls/wpcap/wpcap.spec                              |    2 +-
 dlls/xaudio2_7/Makefile.in                         |    1 +
 dlls/xaudio2_7/tests/Makefile.in                   |    5 +
 dlls/xaudio2_7/tests/xaudio2.c                     |  517 +++
 dlls/xaudio2_7/xaudio_dll.c                        | 1403 +++++++-
 include/access.idl                                 |    2 +-
 include/d3d11.idl                                  |  393 +++
 include/d3d8types.h                                |    2 +-
 include/d3drmobj.h                                 |   12 +-
 include/ddk/hidpi.h                                |   38 +-
 include/ddk/hidport.h                              |   43 +
 include/dwrite.idl                                 |    1 +
 include/dxgi.idl                                   |    2 +
 include/netlistmgr.idl                             |  193 +
 include/winbase.h                                  |    3 +
 include/wine/debug.h                               |    4 +-
 include/wine/gdi_driver.h                          |    4 +-
 include/wine/wined3d.h                             |   48 +-
 include/winnls.h                                   |    5 +-
 include/winnt.h                                    |   12 +
 include/xaudio2.idl                                |    1 +
 libs/wine/debug.c                                  |    3 +
 po/ar.po                                           |    4 +-
 po/bg.po                                           |    4 +-
 po/ca.po                                           |    4 +-
 po/cs.po                                           |    4 +-
 po/da.po                                           |    4 +-
 po/de.po                                           |  438 +--
 po/el.po                                           |    4 +-
 po/en.po                                           |    4 +-
 po/en_US.po                                        |    4 +-
 po/eo.po                                           |    4 +-
 po/es.po                                           |    4 +-
 po/fa.po                                           |    4 +-
 po/fi.po                                           |   40 +-
 po/fr.po                                           |    4 +-
 po/he.po                                           |    4 +-
 po/hi.po                                           |    4 +-
 po/hr.po                                           |    4 +-
 po/hu.po                                           |    4 +-
 po/it.po                                           |    4 +-
 po/ja.po                                           |    4 +-
 po/ko.po                                           |    4 +-
 po/lt.po                                           |   20 +-
 po/ml.po                                           |    4 +-
 po/nb_NO.po                                        |    4 +-
 po/nl.po                                           |    4 +-
 po/or.po                                           |    4 +-
 po/pa.po                                           |    4 +-
 po/pl.po                                           |    4 +-
 po/pt_BR.po                                        |   81 +-
 po/pt_PT.po                                        |    4 +-
 po/rm.po                                           |    4 +-
 po/ro.po                                           |    4 +-
 po/ru.po                                           |    4 +-
 po/sk.po                                           |    4 +-
 po/sl.po                                           |    4 +-
 po/sr_RS at cyrillic.po                               |    4 +-
 po/sr_RS at latin.po                                  |    4 +-
 po/sv.po                                           |    4 +-
 po/te.po                                           |    4 +-
 po/th.po                                           |    4 +-
 po/tr.po                                           |    4 +-
 po/uk.po                                           |    4 +-
 po/wa.po                                           |    4 +-
 po/wine.pot                                        |    4 +-
 po/zh_CN.po                                        |    4 +-
 po/zh_TW.po                                        |    4 +-
 programs/notepad/main.c                            |    9 +
 programs/regsvr32/regsvr32.c                       |   40 +-
 programs/regsvr32/regsvr32.h                       |    6 +
 programs/winedbg/tgt_minidump.c                    |   24 +-
 server/process.c                                   |    8 +-
 tools/make_specfiles                               |   20 +-
 tools/winedump/minidump.c                          |   13 +
 tools/wrc/utils.c                                  |    1 +
 278 files changed, 20739 insertions(+), 4516 deletions(-)

diff --cc debian/changelog
index 56ccba2,d38bc56..8549617
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,14 +1,20 @@@
+ wine-development (1.7.51-1) unstable; urgency=medium
+ 
+   * New upstream release 1.7.51, released Sep 4, 2015.
+     - XAudio2 implementation using OpenAL Soft.
+     - Support for the new Universal C Runtime DLL.
+     - Dropdown menu support in the standard Open Dialog.
+     - Grayscale rendering mode in DirectWrite.
+     - Various bug fixes.
+ 
+  -- Michael Gilbert <mgilbert at debian.org>  Fri, 04 Sep 2015 22:51:43 +0000
+ 
 +wine-development (1.7.50-3~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Jens Reyer <jre.winesim at gmail.com>  Sun, 30 Aug 2015 01:05:10 +0200
 +
  wine-development (1.7.50-3) unstable; urgency=medium
  
    * Fix typo in dependencies.

-- 
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