[pkg-wine-party] [wine] 01/02: Merge branch 'stretch' into jessie-backports-1.8.x
Jens Reyer
jreyer-guest at moszumanska.debian.org
Sat May 21 23:48:10 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 d67902be02d6f10085c6d39ffa4f2820995c297e
Merge: 78bb6b8 d8f7c4a
Author: Jens Reyer <jre.winesim at gmail.com>
Date: Wed May 18 22:14:39 2016 +0200
Merge branch 'stretch' into jessie-backports-1.8.x
# Conflicts:
# debian/changelog
ANNOUNCE | 632 +++++++--------------
AUTHORS | 6 +
LICENSE | 2 +-
MAINTAINERS | 17 +
VERSION | 2 +-
configure | 81 ++-
configure.ac | 53 +-
debian/README.debian | 82 +--
debian/bug-control.in | 2 +-
debian/changelog | 99 ++++
debian/clean | 10 +-
debian/control.in | 27 +-
debian/copyright | 8 +-
debian/{fonts-wineVERSION.docs => fonts-wine.docs} | 0
debian/fonts-wine.install | 7 +
debian/fonts-wineVERSION.install | 1 -
debian/libwineVERSION.lintian-overrides | 5 +-
debian/patches/development/apploader.patch | 44 --
debian/patches/font-divbyzero.patch | 2 +-
debian/patches/fontdir.patch | 103 ++++
debian/patches/makefile.patch | 8 +-
debian/patches/manpages-typo.patch | 15 +
debian/patches/manpages.patch | 14 +
debian/patches/series | 7 +-
debian/patches/sfnt2fon.patch | 36 ++
debian/patches/version-string.patch | 15 +
debian/patches/wine64-manpage.patch | 13 -
debian/rules | 63 +-
debian/scripts/wine | 37 +-
debian/scripts/wineapploader | 7 +
debian/scripts/winegcc | 6 +-
debian/scripts/wineserver | 7 +-
debian/source/lintian-overrides | 2 -
debian/wine32VERSION-preloader.install | 2 +-
debian/wine32VERSION-tools.install | 17 +-
debian/wine32VERSION-tools.links | 11 +
debian/wine32VERSION-tools.lintian-overrides | 2 +
debian/wine32VERSION-tools.manpages | 9 +-
debian/wine32VERSION.install | 4 +-
debian/wine32VERSION.links | 1 -
debian/wine32VERSION.lintian-overrides | 2 +
debian/wine64VERSION-preloader.install | 2 +-
debian/wine64VERSION-tools.install | 18 +-
debian/wine64VERSION-tools.links | 11 +
debian/wine64VERSION-tools.lintian-overrides | 2 +
debian/wine64VERSION-tools.manpages | 9 +-
debian/wine64VERSION.install | 4 +-
debian/wine64VERSION.lintian-overrides | 2 +
debian/wineVERSION.install | 5 +-
debian/wineVERSION.links | 3 +
debian/wineVERSION.manpages | 26 +-
dlls/advapi32/advapi32.spec | 4 +-
dlls/advapi32/eventlog.c | 64 ---
dlls/advapi32/registry.c | 2 +-
dlls/advapi32/tests/registry.c | 22 +
dlls/advapi32/tests/security.c | 84 ++-
.../api-ms-win-core-interlocked-l1-1-0.spec | 2 +-
.../api-ms-win-core-interlocked-l1-2-0.spec | 2 +-
.../api-ms-win-crt-convert-l1-1-0.spec | 4 +-
.../api-ms-win-crt-stdio-l1-1-0.spec | 4 +-
.../api-ms-win-crt-time-l1-1-0.spec | 2 +-
dlls/comctl32/tests/trackbar.c | 258 ++++++---
dlls/comctl32/toolbar.c | 1 +
dlls/comctl32/trackbar.c | 10 +-
dlls/ctl3d32/ctl3d32.c | 2 +-
dlls/d3d8/tests/device.c | 77 +++
dlls/d3d9/device.c | 20 +-
dlls/d3d9/tests/device.c | 78 +++
dlls/d3dx9_36/mesh.c | 7 +-
dlls/d3dx9_36/tests/mesh.c | 37 +-
dlls/dnsapi/dnsapi.spec | 6 +-
dlls/dnsapi/main.c | 32 ++
dlls/dnsapi/tests/name.c | 21 +
dlls/dwrite/font.c | 8 +-
dlls/dwrite/opentype.c | 39 +-
dlls/gdiplus/gdiplus_private.h | 1 +
dlls/gdiplus/pen.c | 21 +-
dlls/gdiplus/tests/pen.c | 63 ++
dlls/inetcomm/mimeole.c | 6 +-
dlls/kernel32/console.c | 14 +
dlls/kernel32/kernel32.spec | 7 +-
dlls/kernel32/process.c | 28 +-
dlls/kernel32/tests/comm.c | 4 -
dlls/kernel32/tests/locale.c | 31 +
dlls/kernel32/tests/process.c | 37 ++
dlls/kernel32/tests/sync.c | 275 ++++++---
dlls/kernel32/virtual.c | 25 +-
dlls/mapi32/imalloc.c | 10 +-
dlls/mciqtz32/mciqtz.c | 28 +-
dlls/msi/dialog.c | 18 +-
dlls/msi/sql.y | 2 +-
dlls/msi/tests/db.c | 22 +-
dlls/msvcr100/msvcr100.spec | 6 +-
dlls/msvcr110/msvcr110.spec | 8 +-
dlls/msvcr120/msvcr120.spec | 12 +-
dlls/msvcr120/tests/msvcr120.c | 102 ++++
dlls/msvcr120_app/msvcr120_app.spec | 10 +-
dlls/msvcr70/msvcr70.spec | 2 +-
dlls/msvcr71/msvcr71.spec | 2 +-
dlls/msvcr80/msvcr80.spec | 6 +-
dlls/msvcr90/msvcr90.spec | 6 +-
dlls/msvcrt/file.c | 148 +++--
dlls/msvcrt/locale.c | 17 +
dlls/msvcrt/math.c | 2 +-
dlls/msvcrt/msvcrt.h | 6 +
dlls/msvcrt/msvcrt.spec | 6 +-
dlls/msvcrt/scanf.h | 8 +
dlls/msvcrt/string.c | 16 +
dlls/msvcrt/tests/scanf.c | 7 +
dlls/msvcrt/time.c | 22 +-
dlls/msvideo.dll16/msvideo16.c | 1 +
dlls/msxml3/domdoc.c | 7 +
dlls/msxml3/msxml_private.h | 3 +
dlls/msxml3/node.c | 164 ++++--
dlls/msxml3/tests/domdoc.c | 8 +-
dlls/ntdll/actctx.c | 4 +-
dlls/ntdll/directory.c | 16 +-
dlls/ntdll/file.c | 5 +
dlls/ntdll/loader.c | 4 +-
dlls/ntdll/misc.c | 58 ++
dlls/ntdll/nt.c | 614 +++++++++++++-------
dlls/ntdll/ntdll.spec | 7 +-
dlls/ntdll/path.c | 2 +-
dlls/ntdll/reg.c | 19 +-
dlls/ntdll/rtl.c | 31 +-
dlls/ntdll/signal_arm.c | 2 +-
dlls/ntdll/signal_i386.c | 44 +-
dlls/ntdll/signal_x86_64.c | 80 ++-
dlls/ntdll/tests/directory.c | 41 +-
dlls/ntdll/tests/exception.c | 304 +++++++++-
dlls/ntdll/tests/info.c | 113 +++-
dlls/ntdll/thread.c | 4 +-
dlls/ole2.dll16/ole2.c | 74 ++-
dlls/ole2.dll16/ole2.dll16.spec | 2 +-
dlls/ole2disp.dll16/ole2disp.c | 204 +++++++
dlls/ole2disp.dll16/ole2disp.dll16.spec | 20 +-
dlls/ole2disp.dll16/ole2disp.h | 39 ++
dlls/ole32/ifs.c | 51 +-
dlls/ole32/ole2.c | 2 +-
dlls/ole32/tests/compobj.c | 135 +++++
dlls/ole32/tests/ole2.c | 56 +-
dlls/oleaut32/oleaut.c | 1 -
dlls/olepro32/Makefile.in | 2 +
dlls/olepro32/olepro.idl | 270 +++++++++
dlls/opengl32/version.rc | 2 +-
dlls/quartz/filtergraph.c | 5 +
dlls/secur32/tests/schannel.c | 3 +-
dlls/setupx.dll16/setupx.dll16.spec | 2 +-
dlls/setupx.dll16/setupx_main.c | 9 +
dlls/ucrtbase/ucrtbase.spec | 12 +-
dlls/user32/button.c | 1 +
dlls/user32/input.c | 2 +-
dlls/user32/mdi.c | 1 +
dlls/user32/message.c | 20 +-
dlls/user32/tests/msg.c | 34 +-
dlls/user32/tests/text.c | 39 +-
dlls/user32/text.c | 2 +-
dlls/usp10/indicsyllable.c | 212 +++----
dlls/vcomp/main.c | 68 ++-
dlls/vcomp/tests/vcomp.c | 10 +-
dlls/vcomp/vcomp.spec | 22 +-
dlls/vcomp100/vcomp100.spec | 22 +-
dlls/vcomp110/vcomp110.spec | 22 +-
dlls/vcomp120/vcomp120.spec | 22 +-
dlls/vcomp90/vcomp90.spec | 22 +-
dlls/vmm.vxd/vmm.c | 2 +-
dlls/wined3d/buffer.c | 2 +-
dlls/wined3d/device.c | 9 +-
dlls/wined3d/directx.c | 15 +-
dlls/wined3d/glsl_shader.c | 5 +-
dlls/wined3d/state.c | 5 +-
dlls/wined3d/surface.c | 4 +-
dlls/wined3d/utils.c | 3 +-
dlls/wined3d/wined3d_private.h | 5 +-
dlls/winejoystick.drv/joystick_osx.c | 2 +-
dlls/winepulse.drv/mmdevdrv.c | 3 +
dlls/winex11.drv/desktop.c | 4 +-
dlls/winex11.drv/opengl.c | 2 +-
dlls/winhttp/tests/winhttp.c | 10 +-
dlls/xaudio2_7/xaudio_dll.c | 11 +
include/gdiplusflat.h | 2 +
include/ntddndis.h | 56 ++
include/objbase.h | 4 +-
include/objidl.idl | 18 +-
include/tchar.h | 4 +-
include/winbase.h | 16 +-
include/wine/test.h | 29 +-
include/wine/wine_common_ver.rc | 2 +-
include/winternl.h | 2 +
include/winuser.h | 11 +
libs/wine/sortkey.c | 39 +-
loader/wine.fr.UTF-8.man.in | 4 +-
loader/wine.inf.in | 8 +-
loader/wine.pl.UTF-8.man.in | 4 +-
po/fr.po | 38 +-
po/zh_CN.po | 4 +-
programs/cmd/tests/batch.c | 52 +-
programs/cmd/tests/test_builtins.cmd.exp | 2 +-
programs/cmd/wcmdmain.c | 6 +-
programs/explorer/explorer.c | 7 +
programs/msiexec/msiexec.man.in | 50 +-
programs/reg/reg.c | 9 -
programs/winedbg/winedbg.man.in | 2 +-
server/handle.c | 6 +
server/serial.c | 35 +-
tools/make_announce | 172 ++++++
tools/make_unicode | 2 +-
tools/winemaker/winemaker.de.UTF-8.man.in | 83 ++-
tools/winemaker/winemaker.fr.UTF-8.man.in | 9 +-
tools/winemaker/winemaker.man.in | 1 -
210 files changed, 5176 insertions(+), 1809 deletions(-)
diff --cc debian/changelog
index 942fbe2,19d96d4..857be26
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,14 -1,102 +1,113 @@@
+ wine (1.8.2-1) unstable; urgency=medium
+
+ * New upstream release 1.8.2, released Apr 12, 2016.
+ - Various bug fixes.
+ - Small translation updates.
+ * Cherrypick changes from master:
+ - Use minimal wineapploader script, instead of patching the upstream one.
+ - Install executables to bindir usr/lib/wine-development.
+ Make wine32-tools and wine64-tools conflict with each other.
+ - Install 32-bit winecpp.
+ - Update lintian overrides.
+ - Add Jens Reyer to uploaders.
+ - Suggest winetricks and playonlinux.
+ - Update copyright.
+ - Explicitly specify which manpages to install.
+ - Install manpages for all installed executables.
+ - Install winegcc script again to specify WINEBUILD.
+ - Add symlinks in /usr/bin for installed tools in wine32|64-tools.
+ - Add symlink in /usr/bin for winepath in wine.
+ - Break older wine32|64 which don't have a reverse version requirement.
+ - Re-enable "err" level output by default (closes: #816014).
+ - Drop version output (closes: #816017).
+ - wineserver script: Drop obsolete script variable.
+ - If wine32 is missing warn about it unless err output is disabled
+ (closes: #818874).
+ - Add patch to append '(Debian)' to the version string.
+ * In the VCS-* fields point to the stretch git branch.
+ * Set fontdir /usr/share/wine/fonts.
+ * Add fontdir.patch to take into account the build time configuration
+ (closes: #814844).
+ * Install wine's TrueType fonts (closes: #818925).
+ * Build wine in maintainer mode.
+ * Don't error out on build warnings.
+ * Add TrueType fonts to clean to regenerate them.
+ * Bump standards-version to 3.9.8, no changes required.
+ * Add manpages-typo.patch to fix a typo in the msiexec manpage.
+ * Update lintian overrides (changes in lintian 2.5.44).
+
+ -- Jens Reyer <jre.winesim at gmail.com> Fri, 29 Apr 2016 03:28:50 +0200
+
+ wine (1.8.1-2) unstable; urgency=medium
+
+ [ Jens Reyer ]
+ * Simplify bug-control.
+ * Use secure uri in vcs fields.
+ * Update README.debian.
+ * Depend on libfontconfig1 (thanks Johannes Stezenbach, see #813381).
+ * Send script messages to STDERR (thanks Joerg Schiermeier).
+
+ [ Michael Gilbert ]
+ * Move fonts back to /usr/share/wine (closes: #813381).
+ * Remove references to the gecko package while its missing (closes: #814350).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 13 Feb 2016 18:02:54 +0000
+
+ wine (1.8.1-1) unstable; urgency=medium
+
+ * New upstream release 1.8.1, released Feb 3, 2016.
+ * Output a short blurb about debugging in the launcher script.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sat, 06 Feb 2016 00:55:14 +0000
+
+ wine (1.8-7) unstable; urgency=medium
+
+ * Install fonts to /usr/share/fonts.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 31 Jan 2016 07:55:06 +0000
+
+ wine (1.8-6) unstable; urgency=medium
+
+ * Fix installation of the wine64 loader (closes: #812319).
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 24 Jan 2016 17:25:33 +0000
+
+ wine (1.8-5) unstable; urgency=medium
+
+ * Re-add /usr/bin wine32 and wine64 symlinks (closes: #811427).
+
+ -- Michael Gilbert <mgilbert at debian.org> Mon, 18 Jan 2016 21:12:25 +0000
+
+ wine (1.8-4) unstable; urgency=medium
+
+ * Remove wine64 manpage.
+ * Use exec in launcher scripts.
+
+ -- Michael Gilbert <mgilbert at debian.org> Mon, 18 Jan 2016 06:18:57 +0000
+
+ wine (1.8-3) unstable; urgency=medium
+
+ [ Stephen Kitt ]
+ * Make libwine recommend libfontconfig1; the latter allows system-
+ installed fonts to be used in Windows applications.
+
+ [ Michael Gilbert ]
+ * Simplify the arch:all build.
+ * Build fonts only during the arch:all build.
+
+ -- Michael Gilbert <mgilbert at debian.org> Sun, 17 Jan 2016 21:51:02 +0000
+
+wine (1.8-2~bpo8+1) jessie-backports; urgency=medium
+
+ * Rebuild for jessie-backports.
+ * Add myself to Uploaders.
+ * Don't build -dbg or -dbgsym packages.
+ Drop versioned build-dependency on debhelper.
+ Don't override dh_strip. Binaries are stripped, but the debug
+ symbols are discarded.
+
+ -- Jens Reyer <jre.winesim at gmail.com> Fri, 15 Jan 2016 20:09:52 +0100
+
wine (1.8-2) unstable; urgency=medium
[ Michael Gilbert ]
diff --cc debian/rules
index a269f90,9be0f25..c9650f6
--- a/debian/rules
+++ b/debian/rules
@@@ -93,31 -98,52 +98,49 @@@ override_dh_auto_configure
cd dlls/opengl32 && ./make_opengl
ln -s /usr/share/misc/config.sub tools || true
ln -s /usr/share/misc/config.guess tools || true
- cp loader/wine.man.in loader/wine64.man.in
./configure $(CONFLAGS)
- override_dh_install: $(INSTALLS)
+ override_dh_auto_build-indep:
+ ./tools/makedep tools tools/sfnt2fon libs/port libs/wine fonts
+ make -C libs/port
+ make -C libs/wine
+ make -C tools/sfnt2fon
+ make -C fonts
+ make -C tools wineapploader
+ chmod 755 tools/wineapploader
+
+ override_dh_auto_install-indep: $(INSTALLS)
mkdir -p debian/tmp
cp ANNOUNCE debian/tmp/changelog
+ cp programs/winedbg/README debian/tmp/README.winedbg
cp debian/scripts/wine debian/tmp/wine$(VERSION)
- sed 's|LIBDIR|$(LIBDIR)|g' < debian/scripts/winegcc > debian/tmp/winegcc$(DEB_BUILD_ARCH_BITS)$(VERSION)
+ for dir in loader server programs/msiexec programs/winedbg \
+ programs/wineconsole programs/regedit programs/regsvr32 \
+ programs/wineboot programs/winefile programs/winepath \
+ programs/winecfg; do \
+ ./tools/makedep $$dir; \
+ make -C $$dir install-man; \
+ done
+ for file in $$(find . ! -path "./debian/*" -name \*.man); do \
+ rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \
+ cp $$file debian/tmp/$$rename || true; \
+ done
+
+ override_dh_auto_install-arch: $(INSTALLS)
+ mkdir -p debian/tmp
+ cp ANNOUNCE debian/tmp/changelog
cp tools/winedump/README debian/tmp/README.winedump
- cp programs/winedbg/README debian/tmp/README.winedbg
- cp debian/tmp/$(LIBDIR)/winecfg debian/tmp/wineapploader
- cp debian/tmp/$(LIBDIR)/wineserver debian/tmp/$(LIBDIR)/wineserver$(DEB_BUILD_ARCH_BITS)
- cp debian/scripts/wineserver debian/tmp/wineserver$(VERSION)
- test -f debian/tmp/$(LIBDIR)/wine-preloader || \
- cp debian/scripts/wine-preloader debian/tmp/$(LIBDIR)
- test -f debian/tmp/$(MANDIR)/man1/wine.1 || \
- cp debian/tmp/$(MANDIR)/man1/wine64.1 debian/tmp/$(MANDIR)/man1/wine.1
- for file in $$(find debian/tmp/$(MANDIR) -type f); do \
- rename=$$(echo $$file | sed s/\\.1/$(VERSION)\\.1/); \
- cp $$file $$rename || true; \
+ cp server/wineserver debian/tmp/wineserver$(DEB_BUILD_ARCH_BITS)
+ sed "s|BINDIR|$(BINDIR)|g" debian/scripts/winegcc > debian/tmp/winegcc$(VERSION)
+ dh_auto_install
+ for file in $$(find . ! -path "./debian/*" -name \*.man); do \
+ rename=$$(basename $$file | sed "s/\\./$(VERSION)./;s/UTF-8\\.//"); \
+ cp $$file debian/tmp/$$rename || true; \
done
- cd debian/tmp/usr/share/man/man1 && \
- cp winegcc.1 winegcc$(DEB_BUILD_ARCH_BITS)$(VERSION).1
- dh_install
+ cp loader/wine.man debian/tmp/usr/share/man/man1/wine64$(VERSION).1
+ test -f debian/tmp/$(BINDIR)/wine-preloader || \
+ cp debian/scripts/wine-preloader debian/tmp/$(BINDIR)
-override_dh_strip:
- dh_strip -Xwine-pthread -Xwine-kthread --ddeb-migration='libwine$(VERSION)-dbg (<< 1.8-2~)'
-
override_dh_gencontrol:
dh_gencontrol -- \
-Vbuilt:Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W khronos-api unicode-data)" \
--
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