[pkg-wine-party] [wine] 01/02: Merge tag 'debian/1.9.12-1' into jessie-backports-1.9.x

Jens Reyer jreyer-guest at moszumanska.debian.org
Sun Jun 19 02:21:32 UTC 2016


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

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

commit f542c918921fb2bb40eccc6a066e6421c03f137f
Merge: 46671eb 588f8bd
Author: Jens Reyer <jre.winesim at gmail.com>
Date:   Sun Jun 19 01:16:25 2016 +0200

    Merge tag 'debian/1.9.12-1' into jessie-backports-1.9.x
    
    release 1.9.12-1
    
    # Conflicts:
    #	debian/changelog

 ANNOUNCE                                           |  721 +++++------
 AUTHORS                                            |    3 +
 VERSION                                            |    2 +-
 configure                                          |   35 +-
 configure.ac                                       |   17 +-
 debian/README.debian                               |   23 +-
 debian/TODO                                        |    1 +
 debian/changelog                                   |   31 +
 debian/clean                                       |    1 +
 debian/control.in                                  |   38 +-
 debian/fonts-wineVERSION.install                   |    6 +
 debian/patches/generate/request.patch              |    4 +-
 debian/patches/manpages.patch                      |    2 +-
 debian/patches/sfnt2fon.patch                      |    4 +-
 debian/rules                                       |    4 +
 dlls/advapi32/crypt.c                              |    2 +-
 .../api-ms-win-crt-runtime-l1-1-0.spec             |    4 +-
 dlls/appwiz.cpl/addons.c                           |    4 +-
 dlls/cfgmgr32/cfgmgr32.spec                        |    4 +-
 dlls/comctl32/tests/header.c                       |    4 +-
 dlls/comctl32/tests/progress.c                     |   12 +-
 dlls/comctl32/tests/rebar.c                        |   11 +-
 dlls/comctl32/tests/status.c                       |    5 +-
 dlls/comctl32/tests/toolbar.c                      |    6 +-
 dlls/comdlg32/tests/filedlg.c                      |   56 +-
 dlls/crtdll/Makefile.in                            |    1 -
 dlls/ctl3d32/Makefile.in                           |    1 -
 dlls/d3d10/d3d10_private.h                         |    2 +-
 dlls/d3d10/effect.c                                |    4 +-
 dlls/d3d10_1/tests/d3d10_1.c                       |   23 +
 dlls/d3d10core/tests/device.c                      | 1294 ++++++++++++++++---
 dlls/d3d11/device.c                                |   39 +-
 dlls/d3d11/tests/d3d11.c                           | 1314 +++++++++++++++++---
 dlls/d3d11/view.c                                  |  328 +++--
 dlls/d3d8/device.c                                 |    9 +-
 dlls/d3d9/device.c                                 |    9 +-
 dlls/d3d9/tests/d3d9ex.c                           |   27 +-
 dlls/d3d9/tests/device.c                           |  128 +-
 dlls/d3dim/Makefile.in                             |    1 -
 dlls/d3drm/tests/d3drm.c                           |    6 +-
 dlls/d3dx9_36/effect.c                             |  116 +-
 dlls/d3dx9_36/tests/effect.c                       |  539 ++++----
 dlls/d3dxof/parsing.c                              |    4 +-
 dlls/ddraw/device.c                                |    6 +-
 dlls/ddraw/surface.c                               |    5 +-
 dlls/ddraw/tests/ddraw1.c                          |  219 ++--
 dlls/ddraw/tests/ddraw2.c                          |  234 ++--
 dlls/ddraw/tests/ddraw4.c                          |  234 ++--
 dlls/ddraw/tests/ddraw7.c                          |  234 ++--
 dlls/ddraw/tests/visual.c                          |  344 -----
 dlls/ddraw/utils.c                                 |    6 +-
 dlls/dmsynth/synth.c                               |    2 +-
 dlls/dmusic32/Makefile.in                          |    1 -
 dlls/dplay/Makefile.in                             |    1 -
 dlls/dsound/primary.c                              |    3 +-
 dlls/dwrite/font.c                                 |   59 +-
 dlls/dwrite/tests/font.c                           |   92 +-
 dlls/dxgi/tests/device.c                           |   31 +-
 dlls/gdi.exe16/printdrv.c                          |    2 +-
 dlls/gdi32/enhmetafile.c                           |   64 +-
 dlls/gdi32/gdi_private.h                           |   21 +
 dlls/gdi32/metafile.c                              |   30 +-
 dlls/gdi32/tests/metafile.c                        |   22 +-
 dlls/gdiplus/gdiplus_private.h                     |    2 +-
 dlls/gdiplus/graphics.c                            |    8 +
 dlls/gdiplus/tests/font.c                          |    1 +
 dlls/gdiplus/tests/graphics.c                      |   23 +
 dlls/gdiplus/tests/metafile.c                      |   24 +-
 dlls/hlink/tests/hlink.c                           |    6 +-
 dlls/imm32/tests/imm32.c                           |  154 ++-
 dlls/inetcomm/mimeole.c                            |  168 ++-
 dlls/inetcomm/tests/mimeole.c                      |   41 +
 dlls/kernel32/locale.c                             |    4 +-
 dlls/kernel32/tests/locale.c                       |    2 +
 dlls/kernel32/tests/thread.c                       |    4 +-
 dlls/kernel32/virtual.c                            |    2 +-
 dlls/mlang/mlang.c                                 |    2 +-
 dlls/mmdevapi/tests/capture.c                      |    2 +-
 dlls/mmdevapi/tests/render.c                       |    2 +-
 dlls/mscoree/mscoree_main.c                        |    2 +-
 dlls/msctf/context.c                               |    3 -
 dlls/msctf/tests/inputprocessor.c                  |   34 +-
 dlls/mshtml/persist.c                              |    2 +-
 dlls/msi/action.c                                  |   15 +-
 dlls/msi/tests/action.c                            |   58 +-
 dlls/msscript.ocx/Makefile.in                      |    2 +-
 dlls/msscript.ocx/msscript.c                       |  452 ++++++-
 dlls/msscript.ocx/tests/Makefile.in                |    7 +
 dlls/msscript.ocx/tests/msscript.c                 |  213 ++++
 dlls/msscript.ocx/tests/msscript.idl               |  306 +++++
 dlls/msvcr120/tests/msvcr120.c                     |  251 ++++
 dlls/msvcrt/errno.c                                |   19 +
 dlls/msvcrt/lock.c                                 |    3 +-
 dlls/msvcrt/mbcs.c                                 |    4 +-
 dlls/msvcrt20/Makefile.in                          |    1 -
 dlls/msvcrt40/Makefile.in                          |    1 -
 dlls/msxml3/saxreader.c                            |    2 +-
 dlls/msxml3/schema.c                               |   25 +-
 dlls/ntdll/file.c                                  |   80 +-
 dlls/ntdll/misc.c                                  |   22 +-
 dlls/ntdll/ntdll.spec                              |    2 +
 dlls/ntdll/tests/reg.c                             |    5 +
 dlls/ole32/clipboard.c                             |    2 +-
 dlls/ole32/compobj.c                               |    4 +-
 dlls/ole32/moniker.c                               |   19 +-
 dlls/oledb32/errorinfo.c                           |   62 +-
 dlls/oledb32/tests/database.c                      |  134 +-
 dlls/quartz/dsoundrender.c                         |    2 +-
 dlls/riched20/editor.c                             |  147 ++-
 dlls/riched20/tests/editor.c                       |  131 +-
 dlls/riched20/writer.c                             |   94 +-
 dlls/secur32/schannel_macosx.c                     |    2 +-
 dlls/serialui/Makefile.in                          |    1 -
 dlls/setupapi/setupapi.spec                        |    4 +-
 dlls/setupapi/stubs.c                              |   20 +
 dlls/shell32/assoc.c                               |    4 +-
 dlls/shell32/iconcache.c                           |    4 +-
 dlls/shell32/tests/appbar.c                        |    5 +-
 dlls/shell32/tests/assoc.c                         |   48 +-
 dlls/shell32/tests/ebrowser.c                      |   12 +-
 dlls/ucrtbase/ucrtbase.spec                        |    4 +-
 dlls/urlmon/tests/misc.c                           |    2 +-
 dlls/user32/defwnd.c                               |   19 +-
 dlls/user32/focus.c                                |    2 +
 dlls/user32/menu.c                                 |    4 +
 dlls/user32/nonclient.c                            |    9 +
 dlls/user32/scroll.c                               |   10 +-
 dlls/user32/tests/cursoricon.c                     |    2 +
 dlls/user32/tests/menu.c                           |    4 +-
 dlls/user32/tests/msg.c                            |    7 +-
 dlls/user32/tests/uitools.c                        |   55 +
 dlls/user32/tests/win.c                            |   16 +-
 dlls/user32/win.c                                  |    5 +-
 dlls/usp10/tests/usp10.c                           |   36 +-
 dlls/usp10/usp10.c                                 |   53 +-
 dlls/webservices/tests/url.c                       |    7 +-
 dlls/webservices/url.c                             |  106 +-
 dlls/wined3d/arb_program_shader.c                  |    8 +
 dlls/wined3d/context.c                             |   22 +-
 dlls/wined3d/cs.c                                  |    5 +-
 dlls/wined3d/device.c                              |   58 +-
 dlls/wined3d/directx.c                             |   42 +-
 dlls/wined3d/drawprim.c                            |   15 +-
 dlls/wined3d/glsl_shader.c                         |  351 ++++--
 dlls/wined3d/shader.c                              |   12 +-
 dlls/wined3d/shader_sm4.c                          |   16 +
 dlls/wined3d/state.c                               |   92 +-
 dlls/wined3d/stateblock.c                          |    7 +-
 dlls/wined3d/texture.c                             |    2 +-
 dlls/wined3d/utils.c                               |  153 ++-
 dlls/wined3d/view.c                                |  187 ++-
 dlls/wined3d/wined3d.spec                          |    6 +-
 dlls/wined3d/wined3d_gl.h                          |    2 +
 dlls/wined3d/wined3d_private.h                     |   69 +-
 dlls/winegstreamer/gstdemux.c                      |   11 +-
 dlls/winemac.drv/cocoa_app.m                       |    9 +-
 dlls/winemac.drv/cocoa_window.m                    |    7 +-
 dlls/winemac.drv/ime.c                             |   16 +-
 dlls/wineps.drv/data/COPYRIGHTS                    |    4 +-
 dlls/winex11.drv/ime.c                             |   16 +-
 dlls/winex11.drv/opengl.c                          |   67 +-
 dlls/winex11.drv/window.c                          |   16 +-
 dlls/wininet/cookie.c                              |    1 +
 dlls/wininet/http.c                                |    6 +-
 dlls/wininet/internet.c                            |    2 +-
 dlls/wininet/tests/http.c                          |   29 +-
 dlls/xaudio2_7/compat.c                            |  447 ++++++-
 dlls/xaudio2_7/tests/xaudio2.c                     |   68 +
 dlls/xaudio2_7/xaudio_dll.c                        |   29 +-
 dlls/xaudio2_7/xaudio_private.h                    |    8 +
 include/Makefile.in                                |    1 +
 include/d3d10.idl                                  |    2 +-
 include/d3d10sdklayers.idl                         |  676 ++++++++++
 include/d3drmobj.h                                 |    6 +-
 include/mimeole.idl                                |    4 +
 include/mshtml.idl                                 |    2 +-
 include/msidefs.h                                  |    5 +
 include/richedit.h                                 |    8 +
 include/shlwapi.h                                  |   28 +-
 include/wine/test.h                                |   12 +
 include/wine/wined3d.h                             |   46 +-
 include/winnt.h                                    |   18 +
 include/winuser.h                                  |    9 +-
 include/wmsdkidl.idl                               |    2 +-
 include/xaudio2.idl                                |  116 +-
 po/de.po                                           |   23 +-
 programs/explorer/desktop.c                        |    2 +-
 programs/explorer/explorer_private.h               |    2 +-
 programs/explorer/startmenu.c                      |   61 +-
 programs/explorer/systray.c                        |  208 +++-
 programs/reg/reg.c                                 |  377 +++---
 programs/reg/tests/reg.c                           |   36 +
 programs/winebrowser/Makefile.in                   |    2 +-
 programs/winebrowser/main.c                        |   94 +-
 programs/winefile/winefile.c                       |   29 +-
 programs/winevdm/winevdm.c                         |    9 +-
 programs/wordpad/print.c                           |    5 +-
 server/console.c                                   |    2 +-
 198 files changed, 9791 insertions(+), 3222 deletions(-)

diff --cc debian/changelog
index f7502a3,f53491d..5c06423
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,12 -1,34 +1,43 @@@
+ wine-development (1.9.12-1) unstable; urgency=medium
+ 
+   [ Michael Gilbert ]
+   * New upstream release 1.9.12, released Jun 10, 2016.
+     - Bug fix update of the Mono engine.
+     - Initial version of a taskbar in desktop mode.
+     - Fixes for right-to-left languages in Uniscribe.
+     - More Shader Model 4 support in Direct3D.
+     - Better metafile support in RichEdit.
+     - Various bug fixes.
+ 
+   [ Jens Reyer ]
+   * Cherrypick changes from stretch:
+     - Add Wine's TrueType fonts to clean to regenerate them and to
+       fonts-wineVERSION.install (see: #818925).
+       Note: fonts-wine-development isn't built currently, instead the
+       already fixed fonts-wine is used.
+     - Build Wine in maintainer mode.
+       Note: added alternative build-dependency on fontforge.
+     - Don't error out on build warnings.
+   * Drop useless workaround for one-arch-only binNMUs.
+   * Add alternative dependency on 32-bit libwine-dev to wine64-tools.
+   * Make wineNN-tools multi-arch installable (closes: #824673, see: #823264).
+     Thanks to Javier Serrano Polo.
+   * Let libwine-dev prefer wine64-tools to wine32-tools.
+   * Document generating 32-bit results with the -tools packages.
+     Thanks to Andrey Gursky and Javier Serrano Polo.
+   * Update suggests libwine-gecko to 2.44 (needs packaging).
+ 
+  -- Michael Gilbert <mgilbert at debian.org>  Sun, 12 Jun 2016 23:18:42 +0000
+ 
 +wine-development (1.9.11-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +  * Remaining diff to stretch:
 +    - Don't build -dbg or -dbgsym packages.
 +      Drop versioned build-dependency on debhelper.
 +
 + -- Jens Reyer <jre.winesim at gmail.com>  Sat, 11 Jun 2016 16:35:36 +0200
 +
  wine-development (1.9.11-1) unstable; urgency=medium
  
    * New upstream release 1.9.11, released May 27, 2016.

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