[pkg-wine-party] [wine] 01/02: Merge branch 'master' into jessie-backports-1.9.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Wed Mar 16 20:41:37 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 27e55e1711fdc6d4460f176df896a2edbc406e0c
Merge: 2a82ad5 361b4aa
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Tue Mar 15 21:22:21 2016 +0100
Merge branch 'master' into jessie-backports-1.9.x
# Conflicts:
# debian/changelog
# debian/rules
ANNOUNCE | 915 ++++++++++-----------
AUTHORS | 3 +
Makefile.in | 18 +-
VERSION | 2 +-
aclocal.m4 | 102 +--
configure | 510 +++++-------
configure.ac | 344 +++-----
debian/changelog | 32 +-
debian/clean | 6 +-
debian/control.in | 2 +-
debian/patches/disable/tests.patch | 100 +++
debian/patches/generate/unicode.patch | 2 +-
debian/patches/makefile.patch | 16 +-
debian/patches/manpages-errors.patch | 40 -
debian/patches/manpages.patch | 17 +-
debian/patches/series | 2 +-
debian/patches/sfnt2fon.patch | 19 +-
debian/rules | 9 +-
debian/scripts/winegcc | 7 +
debian/scripts/wineserver | 6 -
debian/wine32VERSION-tools.install | 2 +
debian/wine32VERSION-tools.links | 6 +-
debian/wine64VERSION-tools.install | 2 +
debian/wine64VERSION-tools.links | 6 +-
dlls/advapi32/advapi32.spec | 12 +-
dlls/advapi32/eventlog.c | 64 --
dlls/advapi32/registry.c | 196 +++--
dlls/advapi32/security.c | 34 +
dlls/advapi32/tests/registry.c | 157 +++-
.../api-ms-win-core-com-l1-1-0.spec | 2 +-
.../api-ms-win-core-com-l1-1-1.spec | 2 +-
.../api-ms-win-core-registry-l1-1-0.spec | 2 +-
.../api-ms-win-downlevel-advapi32-l1-1-0.spec | 6 +-
.../api-ms-win-downlevel-ole32-l1-1-0.spec | 2 +-
.../api-ms-win-security-base-l1-1-0.spec | 4 +-
.../api-ms-win-security-base-l1-2-0.spec | 4 +-
dlls/appwiz.cpl/addons.c | 4 +-
dlls/combase/combase.spec | 2 +-
dlls/comctl32/listview.c | 6 +-
dlls/crypt32/tests/chain.c | 6 +-
dlls/d3d10_1/d3d10_1_main.c | 8 +
dlls/d3d10core/tests/device.c | 765 +++++++++++++++--
dlls/d3d11/d3d11_main.c | 2 +-
dlls/d3d11/tests/d3d11.c | 314 ++++++-
dlls/d3d11/utils.c | 25 +-
dlls/d3d8/device.c | 22 +-
dlls/d3d8/surface.c | 8 +-
dlls/d3d8/tests/visual.c | 55 +-
dlls/d3d8/texture.c | 43 +-
dlls/d3d8/volume.c | 8 +-
dlls/d3d9/device.c | 31 +-
dlls/d3d9/surface.c | 8 +-
dlls/d3d9/swapchain.c | 4 +-
dlls/d3d9/tests/visual.c | 55 +-
dlls/d3d9/texture.c | 87 +-
dlls/d3d9/volume.c | 8 +-
dlls/d3dcompiler_43/Makefile.in | 2 +-
dlls/d3dcompiler_46/Makefile.in | 2 +-
dlls/d3dcompiler_47/Makefile.in | 2 +-
dlls/d3drm/d3drm_main.c | 71 +-
dlls/d3drm/d3drm_private.h | 13 +
dlls/d3drm/tests/d3drm.c | 179 +++-
dlls/d3drm/viewport.c | 61 +-
dlls/d3dx9_36/effect.c | 424 +++++++++-
dlls/d3dx9_36/math.c | 12 +-
dlls/d3dx9_36/tests/effect.c | 283 ++++++-
dlls/d3dx9_36/tests/math.c | 11 +-
dlls/d3dx9_36/tests/surface.c | 6 +-
dlls/d3dx9_36/tests/texture.c | 16 +-
dlls/d3dx9_36/texture.c | 2 +-
dlls/ddraw/device.c | 48 +-
dlls/ddraw/surface.c | 15 +-
dlls/ddraw/tests/d3d.c | 5 +-
dlls/dwrite/analyzer.c | 4 +-
dlls/dwrite/bidi.c | 4 +-
dlls/dwrite/bracket.c | 4 +-
dlls/dwrite/dwrite_private.h | 24 +-
dlls/dwrite/font.c | 414 ++++++----
dlls/dwrite/freetype.c | 44 +-
dlls/dwrite/linebreak.c | 4 +-
dlls/dwrite/main.c | 4 +-
dlls/dwrite/mirror.c | 2 +-
dlls/dwrite/scripts.c | 4 +-
dlls/dxgi/tests/device.c | 20 +-
dlls/dxgi/utils.c | 25 +-
dlls/gdi32/freetype.c | 4 +-
dlls/gdi32/tests/dc.c | 6 +-
dlls/gdi32/tests/metafile.c | 57 ++
dlls/gdi32/vertical.c | 4 +-
dlls/hidclass.sys/pnp.c | 10 +-
dlls/ieframe/tests/webbrowser.c | 4 +-
dlls/inetcpl.cpl/general.c | 13 +-
dlls/kernel32/locale.c | 4 +-
dlls/kernel32/nameprep.c | 6 +-
dlls/kernel32/process.c | 17 +-
dlls/kernel32/tests/comm.c | 4 -
dlls/kernel32/tests/directory.c | 7 +
dlls/kernel32/tests/file.c | 16 +-
dlls/kernel32/tests/path.c | 6 +
dlls/kernel32/virtual.c | 16 +-
dlls/mciqtz32/mciqtz.c | 28 +-
dlls/mscoree/mscoree_main.c | 2 +-
dlls/mscoree/tests/mscoree.c | 109 ++-
dlls/msctf/tests/inputprocessor.c | 8 +-
dlls/mshtml/dispex.c | 52 +-
dlls/mshtml/htmlattr.c | 15 +-
dlls/mshtml/htmlwindow.c | 3 +-
dlls/mshtml/mshtml_private.h | 3 +
dlls/mshtml/tests/dom.c | 41 +
dlls/mshtml/tests/events.html | 4 +-
dlls/mshtml/tests/jstest.html | 9 +
dlls/mshtml/tests/xmlhttprequest.c | 17 +
dlls/mshtml/xmlhttprequest.c | 65 +-
dlls/msi/action.c | 2 +-
dlls/msi/tests/automation.c | 9 +-
dlls/msi/tests/package.c | 19 +-
dlls/msvcp100/msvcp100.spec | 8 +-
dlls/msvcp110/msvcp110.spec | 54 +-
dlls/msvcp120/msvcp120.spec | 54 +-
dlls/msvcp120/tests/msvcp120.c | 308 ++++++-
dlls/msvcp120_app/msvcp120_app.spec | 54 +-
dlls/msvcp90/ios.c | 52 ++
dlls/msvcp90/misc.c | 284 ++++++-
dlls/msvcr120/tests/msvcr120.c | 6 +-
dlls/msvcrt/cpp.c | 13 +
dlls/msvcrt/file.c | 8 +
dlls/msvcrt/tests/cpp.c | 6 +-
dlls/msvcrt/tests/file.c | 59 ++
dlls/msvcrt/tests/misc.c | 6 +-
dlls/ndis.sys/main.c | 18 +
dlls/ndis.sys/ndis.sys.spec | 4 +-
dlls/ntdll/file.c | 5 +
dlls/ntdll/misc.c | 58 ++
dlls/ntdll/ntdll.spec | 6 +-
dlls/ntdll/sec.c | 38 +-
dlls/ntdll/signal_arm.c | 2 +-
dlls/ntdll/tests/directory.c | 6 +-
dlls/ntdll/tests/reg.c | 7 +
dlls/ntdll/tests/rtl.c | 7 +-
dlls/ole32/comcat.c | 2 +-
dlls/ole32/compobj.c | 29 +
dlls/ole32/ifs.c | 15 +-
dlls/ole32/ole2.c | 280 +++----
dlls/ole32/ole32.spec | 1 +
dlls/ole32/ole32res.rc | 10 +-
dlls/ole32/olestd.h | 5 +
dlls/ole32/tests/compobj.c | 206 +++++
dlls/ole32/tests/dragdrop.c | 356 +++++---
dlls/ole32/tests/ole2.c | 7 +-
dlls/oleaut32/variant.c | 16 +-
dlls/opengl32/wgl.c | 8 +-
dlls/quartz/pin.c | 2 -
dlls/riched20/editor.c | 252 +++---
dlls/riched20/reader.c | 25 +
dlls/riched20/rtf.h | 2 +
dlls/riched20/tests/editor.c | 60 +-
dlls/setupapi/tests/parser.c | 9 +-
dlls/setupapi/tests/setupcab.c | 22 +-
dlls/shell32/tests/ebrowser.c | 4 +-
dlls/shell32/tests/progman_dde.c | 11 +-
dlls/shell32/tests/shelllink.c | 62 +-
dlls/shell32/tests/shlexec.c | 200 ++++-
dlls/shlwapi/tests/path.c | 12 +-
dlls/shlwapi/tests/url.c | 5 +-
dlls/shlwapi/url.c | 13 +-
dlls/urlmon/tests/misc.c | 22 +-
dlls/urlmon/tests/sec_mgr.c | 57 +-
dlls/user.exe16/dialog.c | 4 +-
dlls/user.exe16/user_private.h | 2 +-
dlls/user32/controls.h | 4 +-
dlls/user32/dialog.c | 90 +-
dlls/user32/mdi.c | 4 +-
dlls/user32/painting.c | 2 +-
dlls/user32/sysparams.c | 9 +
dlls/user32/tests/listbox.c | 3 +-
dlls/user32/tests/msg.c | 296 ++++++-
dlls/user32/tests/text.c | 10 +-
dlls/user32/tests/win.c | 59 +-
dlls/user32/user32.spec | 1 +
dlls/user32/win.c | 2 +
dlls/usp10/bidi.c | 2 +-
dlls/usp10/bracket.c | 4 +-
dlls/usp10/breaking.c | 2 +-
dlls/usp10/indicsyllable.c | 4 +-
dlls/usp10/linebreak.c | 4 +-
dlls/usp10/mirror.c | 2 +-
dlls/usp10/shape.c | 6 +-
dlls/usp10/shaping.c | 6 +-
dlls/usp10/usp10.c | 2 +-
dlls/wbemprox/tests/services.c | 5 +-
dlls/webservices/reader.c | 486 +++++------
dlls/webservices/tests/reader.c | 343 +++++++-
dlls/webservices/tests/writer.c | 387 ++++++++-
dlls/webservices/webservices.spec | 6 +-
dlls/webservices/webservices_private.h | 2 -
dlls/webservices/writer.c | 323 +++++---
dlls/windowscodecs/tests/bitmap.c | 7 +-
dlls/windowscodecs/tests/converter.c | 4 +-
dlls/winecoreaudio.drv/coremidi.c | 4 +-
dlls/winecoreaudio.drv/mmdevdrv.c | 64 +-
dlls/wined3d/arb_program_shader.c | 33 +-
dlls/wined3d/context.c | 521 +++++++-----
dlls/wined3d/device.c | 21 -
dlls/wined3d/directx.c | 2 +
dlls/wined3d/glsl_shader.c | 7 +-
dlls/wined3d/resource.c | 3 -
dlls/wined3d/shader_sm4.c | 42 +-
dlls/wined3d/state.c | 5 +
dlls/wined3d/surface.c | 296 +++----
dlls/wined3d/swapchain.c | 79 +-
dlls/wined3d/texture.c | 268 +++++-
dlls/wined3d/utils.c | 52 +-
dlls/wined3d/volume.c | 140 +---
dlls/wined3d/wined3d.spec | 3 +-
dlls/wined3d/wined3d_gl.h | 1 +
dlls/wined3d/wined3d_main.c | 7 +
dlls/wined3d/wined3d_private.h | 77 +-
dlls/winegstreamer/gsttffilter.c | 13 +-
dlls/winejoystick.drv/joystick_osx.c | 34 +-
dlls/winemac.drv/clipboard.c | 87 +-
dlls/winemac.drv/cocoa_opengl.m | 3 -
dlls/winemac.drv/opengl.c | 8 +-
dlls/wineps.drv/text.c | 2 +-
dlls/wineps.drv/vertical.c | 4 +-
dlls/winepulse.drv/mmdevdrv.c | 287 +++++--
dlls/winex11.drv/desktop.c | 6 +-
dlls/winex11.drv/xdnd.c | 2 +-
dlls/winmm/tests/mci.c | 12 +-
dlls/winmm/tests/midi.c | 8 +-
include/config.h.in | 3 +
include/ddk/hidsdi.h | 1 +
include/ddk/ndis.h | 184 ++++-
include/dwrite_3.idl | 2 +-
include/objbase.h | 1 +
include/objidl.idl | 9 +
include/webservices.h | 6 +
include/winbase.h | 12 +-
include/wine/wined3d.h | 29 +-
include/wingdi.h | 21 +-
include/winternl.h | 2 +
include/winuser.h | 1 +
libs/port/c_037.c | 2 +-
libs/port/c_10000.c | 2 +-
libs/port/c_10001.c | 2 +-
libs/port/c_10002.c | 2 +-
libs/port/c_10003.c | 2 +-
libs/port/c_10004.c | 2 +-
libs/port/c_10005.c | 2 +-
libs/port/c_10006.c | 2 +-
libs/port/c_10007.c | 2 +-
libs/port/c_10008.c | 2 +-
libs/port/c_10010.c | 2 +-
libs/port/c_10017.c | 2 +-
libs/port/c_10021.c | 2 +-
libs/port/c_10029.c | 2 +-
libs/port/c_1006.c | 2 +-
libs/port/c_10079.c | 2 +-
libs/port/c_10081.c | 2 +-
libs/port/c_10082.c | 2 +-
libs/port/c_1026.c | 2 +-
libs/port/c_1250.c | 2 +-
libs/port/c_1251.c | 2 +-
libs/port/c_1252.c | 2 +-
libs/port/c_1253.c | 2 +-
libs/port/c_1254.c | 2 +-
libs/port/c_1255.c | 2 +-
libs/port/c_1256.c | 2 +-
libs/port/c_1257.c | 2 +-
libs/port/c_1258.c | 2 +-
libs/port/c_1361.c | 2 +-
libs/port/c_20127.c | 2 +-
libs/port/c_20866.c | 2 +-
libs/port/c_20932.c | 2 +-
libs/port/c_21866.c | 2 +-
libs/port/c_28591.c | 2 +-
libs/port/c_28592.c | 2 +-
libs/port/c_28593.c | 2 +-
libs/port/c_28594.c | 2 +-
libs/port/c_28595.c | 2 +-
libs/port/c_28596.c | 2 +-
libs/port/c_28597.c | 2 +-
libs/port/c_28598.c | 2 +-
libs/port/c_28599.c | 2 +-
libs/port/c_28600.c | 2 +-
libs/port/c_28603.c | 2 +-
libs/port/c_28604.c | 2 +-
libs/port/c_28605.c | 2 +-
libs/port/c_28606.c | 2 +-
libs/port/c_424.c | 2 +-
libs/port/c_437.c | 2 +-
libs/port/c_500.c | 2 +-
libs/port/c_737.c | 2 +-
libs/port/c_775.c | 2 +-
libs/port/c_850.c | 2 +-
libs/port/c_852.c | 2 +-
libs/port/c_855.c | 2 +-
libs/port/c_856.c | 2 +-
libs/port/c_857.c | 2 +-
libs/port/c_860.c | 2 +-
libs/port/c_861.c | 2 +-
libs/port/c_862.c | 2 +-
libs/port/c_863.c | 2 +-
libs/port/c_864.c | 2 +-
libs/port/c_865.c | 2 +-
libs/port/c_866.c | 2 +-
libs/port/c_869.c | 2 +-
libs/port/c_874.c | 2 +-
libs/port/c_875.c | 2 +-
libs/port/c_878.c | 2 +-
libs/port/c_932.c | 2 +-
libs/port/c_936.c | 2 +-
libs/port/c_949.c | 2 +-
libs/port/c_950.c | 2 +-
libs/port/compose.c | 2 +-
libs/port/decompose.c | 2 +-
libs/port/digitmap.c | 4 +-
libs/port/fold.c | 4 +-
libs/port/mbtowc.c | 2 +-
libs/port/utf8.c | 2 +-
libs/port/wctomb.c | 2 +-
libs/wine/Makefile.in | 3 +-
libs/wine/string.c | 3 +
loader/wine.pl.UTF-8.man.in | 4 +-
po/LINGUAS | 45 -
po/Makefile.in | 46 ++
po/ar.po | 4 +
po/bg.po | 4 +
po/ca.po | 9 +
po/cs.po | 4 +
po/da.po | 4 +
po/de.po | 9 +
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 | 4 +
po/fr.po | 6 +
po/he.po | 4 +
po/hi.po | 4 +
po/hr.po | 4 +
po/hu.po | 4 +
po/it.po | 4 +
po/ja.po | 6 +
po/ko.po | 4 +
po/lt.po | 6 +-
po/ml.po | 4 +
po/nb_NO.po | 4 +
po/nl.po | 4 +
po/or.po | 4 +
po/pa.po | 4 +
po/pl.po | 8 +
po/pt_BR.po | 4 +
po/pt_PT.po | 4 +
po/rm.po | 4 +
po/ro.po | 4 +
po/ru.po | 8 +-
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 | 182 ++--
po/te.po | 4 +
po/th.po | 4 +
po/tr.po | 9 +
po/uk.po | 9 +
po/wa.po | 4 +
po/wine.pot | 4 +
po/zh_CN.po | 8 +
po/zh_TW.po | 4 +
programs/msiexec/msiexec.man.in | 50 +-
programs/reg/reg.c | 52 +-
programs/reg/reg.h | 1 +
programs/reg/reg.rc | 1 +
programs/reg/tests/reg.c | 103 ++-
programs/services/rpc.c | 125 ++-
programs/services/services.c | 135 +--
programs/services/services.h | 28 +-
programs/services/tests/service.c | 25 +-
programs/shutdown/Makefile.in | 5 +
tools/wmc/lang.h => programs/shutdown/main.c | 31 +-
programs/winedbg/info.c | 4 +
programs/winedbg/winedbg.man.in | 2 +-
programs/winedevice/device.c | 33 +-
server/fd.c | 4 +-
server/window.c | 3 +-
tools/make_makefiles | 27 +-
tools/make_unicode | 27 +-
tools/makedep.c | 515 ++++++++----
tools/sfnt2fon/Makefile.in | 2 +-
tools/sfnt2fon/sfnt2fon.c | 1 -
tools/widl/Makefile.in | 2 +-
tools/winebuild/res32.c | 15 +
tools/winemaker/winemaker.de.UTF-8.man.in | 8 +-
tools/winemaker/winemaker.man.in | 1 -
tools/wmc/Makefile.in | 2 +-
tools/wmc/lang.h | 1 -
tools/wrc/Makefile.in | 2 +-
tools/wrc/genres.c | 26 +-
tools/wrc/parser.l | 2 +-
tools/wrc/parser.y | 38 +-
tools/wrc/utils.c | 29 +-
tools/wrc/utils.h | 2 +
tools/wrc/wrc.h | 1 -
405 files changed, 10630 insertions(+), 4914 deletions(-)
diff --cc debian/changelog
index 96a7308,5f01a4a..aa6ed90
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,10 -1,33 +1,40 @@@
+ wine-development (1.9.5-3) unstable; urgency=medium
+
+ * Re-upload with the previous change actually applied.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 05 Mar 2016 23:32:42 +0000
+
+ wine-development (1.9.5-2) unstable; urgency=medium
+
+ * Change gstreamer build dependency to libgstreamer-plugins-base1.0-dev.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 05 Mar 2016 19:51:23 +0000
+
+ wine-development (1.9.5-1) unstable; urgency=medium
+
+ [ Michael Gilbert ]
+ * New upstream release 1.9.5, released Mar 4, 2016.
+ - Beginnings of the WineD3D command stream.
+ - Support for effect states in Direct3DX.
+ - Drag & drop improvements.
+ - Various bug fixes.
+ * Drop version output (closes: #816432).
+ * Support recent upstream changes to wine_port.
+
+ [ Jens Reyer ]
+ * Add symlinks in /usr/bin for installed tools.
+ * Install winegcc script again to specify WINEBUILD.
+ * dh_strip: Use the current name dbgsym-migration.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 05 Mar 2016 00:40:42 +0000
+
+wine-development (1.9.4-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Don't build -dbg or -dbgsym packages.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Sat, 05 Mar 2016 02:10:06 +0100
+
wine-development (1.9.4-2) unstable; urgency=medium
[ Michael Gilbert ]
--
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