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 1cff1aed05df6c4a5f6b1c684ad3f1d289f873ad Merge: 196aa3d 0dba056 Author: Jens Reyer <[email protected]> Date: Sun Oct 16 22:05:09 2016 +0200 Merge branch 'stretch' into jessie-backports-1.8.x # Conflicts: # debian/changelog ANNOUNCE | 346 ++++++++++----------- AUTHORS | 7 + VERSION | 2 +- configure | 18 +- debian/README.debian | 40 ++- debian/changelog | 14 + debian/control.in | 49 ++- debian/patches/font-divbyzero.patch | 2 +- debian/patches/fontdir.patch | 12 +- debian/patches/generate/request.patch | 19 +- debian/rules | 5 +- debian/scripts/import | 8 + debian/wineVERSION.examples | 1 + dlls/advapi32/registry.c | 48 ++- dlls/advapi32/tests/registry.c | 13 + .../api-ms-win-crt-math-l1-1-0.spec | 6 +- .../api-ms-win-crt-runtime-l1-1-0.spec | 10 +- .../api-ms-win-crt-stdio-l1-1-0.spec | 4 +- dlls/apphelp/apphelp.c | 6 + dlls/apphelp/apphelp.spec | 2 +- dlls/cfgmgr32/cfgmgr32.spec | 2 +- dlls/comctl32/dsa.c | 3 + dlls/comctl32/listview.c | 2 +- dlls/comctl32/tests/listview.c | 22 ++ dlls/comctl32/tests/trackbar.c | 23 ++ dlls/comctl32/trackbar.c | 26 +- dlls/comctl32/treeview.c | 71 +++-- dlls/d3d8/surface.c | 16 +- dlls/d3d8/tests/visual.c | 10 +- dlls/d3d9/tests/visual.c | 10 +- dlls/dbghelp/dwarf.c | 6 + dlls/dinput/joystick.c | 14 +- dlls/gdi32/freetype.c | 91 ++++-- dlls/gdi32/icm.c | 9 +- dlls/gdi32/tests/icm.c | 1 - dlls/hal/hal.c | 5 + dlls/hal/hal.spec | 2 +- dlls/kernel32/locale.c | 6 +- dlls/kernel32/process.c | 3 +- dlls/mmdevapi/devenum.c | 1 + dlls/mmdevapi/tests/propstore.c | 6 +- dlls/mpr/wnet.c | 10 +- dlls/msctf/context.c | 341 ++++++++++---------- dlls/msctf/tests/inputprocessor.c | 8 +- dlls/mshtml/htmlelem.c | 8 + dlls/mshtml/navigate.c | 4 +- dlls/mshtml/tests/dom.c | 13 +- dlls/msvcp100/msvcp100.spec | 32 +- dlls/msvcp60/msvcp60.spec | 240 +++++++------- dlls/msvcp90/ios.c | 223 ++++++++++--- dlls/msvcp90/math.c | 48 +++ dlls/msvcr100/msvcr100.spec | 3 +- dlls/msvcr110/msvcr110.spec | 4 +- dlls/msvcr120/msvcr120.spec | 12 +- dlls/msvcr120_app/msvcr120_app.spec | 10 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 3 +- dlls/msvcrt/data.c | 72 +++++ dlls/msvcrt/math.c | 29 +- dlls/msvcrt/misc.c | 8 + dlls/msvcrt/tests/cpp.c | 5 + dlls/msvcrt/undname.c | 79 ++++- dlls/msvcrt/wcs.c | 80 +++-- dlls/msxml3/domdoc.c | 31 +- dlls/msxml3/tests/domdoc.c | 49 ++- dlls/ntdll/directory.c | 13 +- dlls/ntdll/loader.c | 21 +- dlls/ntdll/tests/directory.c | 2 + dlls/ole32/ole32.spec | 2 + dlls/ole32/stg_prop.c | 86 +++++ dlls/oleaut32/tests/vartype.c | 20 ++ dlls/oleaut32/variant.c | 6 + dlls/oledb32/datainit.c | 24 +- dlls/oledb32/tests/database.c | 4 + dlls/pdh/pdh.spec | 8 +- dlls/pdh/pdh_main.c | 36 +++ dlls/riched20/editor.c | 2 +- dlls/riched20/paint.c | 43 ++- dlls/setupapi/misc.c | 9 + dlls/setupapi/setupapi.spec | 2 +- dlls/setupapi/tests/misc.c | 10 + dlls/ucrtbase/tests/printf.c | 56 ++++ dlls/ucrtbase/ucrtbase.spec | 20 +- dlls/user32/dde_client.c | 2 +- dlls/user32/dialog.c | 3 + dlls/user32/tests/dialog.c | 50 +++ dlls/wined3d/directx.c | 9 + dlls/wined3d/swapchain.c | 49 ++- dlls/wined3d/wined3d_private.h | 4 + dlls/winepulse.drv/mmdevdrv.c | 325 ++++++++++++++----- dlls/winspool.drv/info.c | 4 + dlls/wlanapi/main.c | 14 + dlls/wlanapi/wlanapi.spec | 4 +- include/Makefile.in | 1 + include/cfgmgr32.h | 1 + include/devpkey.h | 6 +- include/msctf.idl | 30 ++ include/pdh.h | 3 + include/wlanapi.h | 52 ++++ loader/wine.inf.in | 2 +- programs/services/services.c | 3 +- 101 files changed, 2332 insertions(+), 851 deletions(-) diff --cc debian/changelog index a8b707e,f5dc750..08b5ac8 --- a/debian/changelog +++ b/debian/changelog @@@ -1,12 -1,17 +1,26 @@@ + wine (1.8.5-1) unstable; urgency=medium + + * New upstream release 1.8.5, released Oct 7, 2016. + - Various bug fixes. + * Cherrypick changes from master: + - Make libc6-dev dependency portable. + - Generate the correct SERVER_PROTOCOL_VERSION (closes: #836566). + - Mention the alternatives system in wine's package description. + - Provide wine.desktop as example in package wine. + * Declare relationship to the old Ubuntu packages in d/control.in. + * Refresh patches. + + -- Jens Reyer <[email protected]> Mon, 10 Oct 2016 14:27:43 +0200 + +wine (1.8.4-1~bpo8+1) jessie-backports; urgency=medium + + * Rebuild for jessie-backports. + * Remaining changes: + - Revert "Drop alternative depends on perl:any (now handled by debhelper)." + - debhelper in backports doesn't support this yet. + + -- Jens Reyer <[email protected]> Sun, 04 Sep 2016 02:03:26 +0200 + wine (1.8.4-1) unstable; urgency=medium * New upstream release 1.8.4, released Aug 22, 2016. -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-wine/wine.git _______________________________________________ pkg-wine-party mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-wine-party
