Release 1.7.35.

We always have to use __ms_va_list because we depend on an ntoskrnl export here.

.gitignore

@@ -1,4 +1,2 @@
 debian/tools/wine
-.patchupdate.cache
-*.ok
 *.pyc

LICENSE.md

@@ -7,7 +7,7 @@ are part of **Wine Staging** and are licensed under the terms of the
 [LGPLv2.1](#gnu-lgpl-version-21), to stay compatible with Wine:
 
 ```
-Copyright (C) 2014 the Wine Staging project authors.
+Copyright (C) 2014-2015 the Wine Staging project authors.
 
 Wine Staging is free software; you can redistribute it and/or
 modify it under the terms of the GNU Lesser General Public

README.md

@@ -23,11 +23,12 @@ How to install and use Wine Staging
 
 Ready-to-use packages for Wine Staging are available for a variety
 of different Linux distributions directly for download. Just follow the
-instructions available on the [website](http://www.wine-staging.com/install.html).
+instructions available on the
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Installation).
 
 When using Wine Staging there are a few differences compared to regular
 Wine. The main difference is that it is not sufficient to type `wine` to
-run it, but instead you will have to type `/opt/wine-compholio/bin/wine`.
+run it, but instead you will have to type `/opt/wine-staging/bin/wine`.
 Besides that there are also some other differences, for example additional
 configuration options to tweak performance, which are not available in regular
 Wine. All those differences are also documented on the
@@ -37,93 +38,120 @@ Wine. All those differences are also documented on the
 Included bug fixes and improvements
 ===================================
 
-**Bugs fixed in Wine Staging 1.7.33 [119]:**
+**Bugs fixed in Wine Staging 1.7.35 [146]:**
 
-* ATL IOCS data should not be stored in GWLP_USERDATA ([Wine Bug #21767](https://bugs.winehq.org/show_bug.cgi?id=21767))
 * Add Dynamic DST exceptions for Israel Standard Time ([Wine Bug #36374](https://bugs.winehq.org/show_bug.cgi?id=36374))
 * Add default ACLs for user shell folders
+* Add nvapi stubs required for GPU PhysX support
+* Add stub for D3DXComputeNormalMap
+* Add stub for D3DXComputeTangentFrameEx ([Wine Bug #31984](https://bugs.winehq.org/show_bug.cgi?id=31984))
+* Add stub for D3DXIntersect
+* Add stub for KeWaitForMultipleObjects
 * Add stub for NtSetLdtEntries/ZwSetLdtEntries ([Wine Bug #26268](https://bugs.winehq.org/show_bug.cgi?id=26268))
+* Add stubs for D3DXCreateAnimationController interface
 * Add support for GetPropValue to PulseAudio backend
 * Adobe Reader needs ITextSelection_fnGetDuplicate implementation
 * Allow selection of audio device for PulseAudio backend
 * Allow special characters in pipe names ([Wine Bug #28995](https://bugs.winehq.org/show_bug.cgi?id=28995))
-* Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW
+* Anno 1602 installer depends on Windows 98 behavior of SHFileOperationW ([Wine Bug #37916](https://bugs.winehq.org/show_bug.cgi?id=37916))
 * Audio stuttering and performance drops in multiple applications ([Wine Bug #30639](https://bugs.winehq.org/show_bug.cgi?id=30639))
 * Avoid crashing when broken app tries to release surface although refcount is zero ([Wine Bug #18477](https://bugs.winehq.org/show_bug.cgi?id=18477))
 * Avoid race-conditions of async WSARecv() operations with write watches.
+* Avseq crashes when multisampling is enabled ([Wine Bug #31998](https://bugs.winehq.org/show_bug.cgi?id=31998))
+* Basic support for CUDA
 * Black & White needs DXTn software decoding support ([Wine Bug #14939](https://bugs.winehq.org/show_bug.cgi?id=14939))
-* Correctly treat '.' when checking for empty directories ([Wine Bug #26272](https://bugs.winehq.org/show_bug.cgi?id=26272))
+* Child of Light expects FindConnectionPoint to succeed and increase the refcount ([Wine Bug #36408](https://bugs.winehq.org/show_bug.cgi?id=36408))
+* CreateProcess does not prioritize the working directory over the system search path ([Wine Bug #23934](https://bugs.winehq.org/show_bug.cgi?id=23934))
 * D3DCompileShader should filter specific warning messages ([Wine Bug #33770](https://bugs.winehq.org/show_bug.cgi?id=33770))
+* Do not append duplicate NULL characters when importing keys with regedit ([Wine Bug #37575](https://bugs.winehq.org/show_bug.cgi?id=37575))
 * Do not fail when a used context is passed to wglShareLists ([Wine Bug #11436](https://bugs.winehq.org/show_bug.cgi?id=11436))
 * Don't fill KdHelp structure for usermode applications ([Wine Bug #37272](https://bugs.winehq.org/show_bug.cgi?id=37272))
 * Emulate access to KI_USER_SHARED_DATA kernel page on x86_64 ([Wine Bug #33849](https://bugs.winehq.org/show_bug.cgi?id=33849))
-* Emulate write to CR4 register ([Wine Bug #30220](https://bugs.winehq.org/show_bug.cgi?id=30220))
 * Ensure NtProtectVirtualMemory and NtCreateSection are on separate pages ([Wine Bug #33162](https://bugs.winehq.org/show_bug.cgi?id=33162))
+* Ensure X11 input events are handled even without explicit message loop ([Wine Bug #8854](https://bugs.winehq.org/show_bug.cgi?id=8854))
 * Exception during start of fr-043 caused by missing DXTn support ([Wine Bug #37391](https://bugs.winehq.org/show_bug.cgi?id=37391))
+* Expose PKEY_AudioEndpoint_PhysicalSpeakers device property in PulseAudio driver
 * FEAR 1 installer expects basic_string_wchar_dtor to return NULL ([Wine Bug #37358](https://bugs.winehq.org/show_bug.cgi?id=37358))
-* FairplayKD.sys needs KeSetSystemAffinityThread ([Wine Bug #36822](https://bugs.winehq.org/show_bug.cgi?id=36822))
+* Fix NULL dereference in ICSeqCompressFrameStart ([Wine Bug #27595](https://bugs.winehq.org/show_bug.cgi?id=27595))
+* Fix access violation when calling GetStringTypeW with NULL src. ([Wine Bug #37759](https://bugs.winehq.org/show_bug.cgi?id=37759))
 * Fix black screen on startup introduced by pixelformat changes. ([Wine Bug #35950](https://bugs.winehq.org/show_bug.cgi?id=35950))
 * Fix comparison of punctuation characters in lstrcmp ([Wine Bug #10767](https://bugs.winehq.org/show_bug.cgi?id=10767))
 * Fix condition mask handling in RtlVerifyVersionInfo ([Wine Bug #36143](https://bugs.winehq.org/show_bug.cgi?id=36143))
+* Fix crash in Space Rangers2 caused by missing DXTn support ([Wine Bug #24983](https://bugs.winehq.org/show_bug.cgi?id=24983))
 * Fix crash of Trine Demo on start ([Wine Bug #19231](https://bugs.winehq.org/show_bug.cgi?id=19231))
 * Fix crash of winedevice when relocation entry crosses page boundary ([Wine Bug #28254](https://bugs.winehq.org/show_bug.cgi?id=28254))
+* Fix cursor clip regression / broken raw input in multiple games ([Wine Bug #33479](https://bugs.winehq.org/show_bug.cgi?id=33479))
 * Fix flickering introduced by pixelformat changes. ([Wine Bug #35718](https://bugs.winehq.org/show_bug.cgi?id=35718))
 * Fix for ConnectNamedPort return value in overlapped mode ([Wine Bug #16550](https://bugs.winehq.org/show_bug.cgi?id=16550))
 * Fix for programs leaking wndproc slots ([Wine Bug #32451](https://bugs.winehq.org/show_bug.cgi?id=32451))
 * Fix gray screen on startup introduced by pixelformat changes. ([Wine Bug #35975](https://bugs.winehq.org/show_bug.cgi?id=35975))
 * Fix handling of empty section and key name for profile files. ([Wine Bug #8036](https://bugs.winehq.org/show_bug.cgi?id=8036))
 * Fix handling of invert_y in DrawTextExW ([Wine Bug #22109](https://bugs.winehq.org/show_bug.cgi?id=22109))
-* Fix issues when driver dispatch routine returns different status codes ([Wine Bug #30155](https://bugs.winehq.org/show_bug.cgi?id=30155))
+* Fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED ([Wine Bug #37876](https://bugs.winehq.org/show_bug.cgi?id=37876))
+* Fix init of LONGLONG variable with a negative value in TGA decoder
 * Fix issues with dragging layers between images in Adobe Photoshop 7.0 ([Wine Bug #12007](https://bugs.winehq.org/show_bug.cgi?id=12007))
 * Fix missing video introduced by pixelformat changes. ([Wine Bug #36900](https://bugs.winehq.org/show_bug.cgi?id=36900))
+* Fix parameters for ConvertToIndexedBlendedMesh stub ([Wine Bug #36449](https://bugs.winehq.org/show_bug.cgi?id=36449))
 * Fix possible segfault in pulse_rd_loop of PulseAudio backend
 * Fix return value of ScrollWindowEx for invisible windows ([Wine Bug #37706](https://bugs.winehq.org/show_bug.cgi?id=37706))
 * Fix texture corruption in CSI: Fatal Conspiracy ([Wine Bug #33768](https://bugs.winehq.org/show_bug.cgi?id=33768))
 * Fix unintentional leaks with ntdll internals
 * Fix wined3d performance drop introduced by pixelformat changes. ([Wine Bug #35655](https://bugs.winehq.org/show_bug.cgi?id=35655))
+* Fix wrong colors in Wolfenstein (2009) ([Wine Bug #34692](https://bugs.winehq.org/show_bug.cgi?id=34692))
 * Games For Windows Live 1.x expects a valid linker version in the PE header ([Wine Bug #28768](https://bugs.winehq.org/show_bug.cgi?id=28768))
+* GetMonitorInfo returns the same name for all monitors ([Wine Bug #37709](https://bugs.winehq.org/show_bug.cgi?id=37709))
 * GetSecurityInfo returns NULL DACL for process object ([Wine Bug #15980](https://bugs.winehq.org/show_bug.cgi?id=15980))
+* Graphical issues in Inquisitor ([Wine Bug #32490](https://bugs.winehq.org/show_bug.cgi?id=32490))
+* Hearthstone fails to start ([Wine Bug #36216](https://bugs.winehq.org/show_bug.cgi?id=36216))
+* IOCTL_DVD_READ_STRUCTURE expects the wrong size of output buffer for some requests ([Wine Bug #37767](https://bugs.winehq.org/show_bug.cgi?id=37767))
 * Ignore unsupported flags for CoInternetSetFeatureEnabled ([Wine Bug #35197](https://bugs.winehq.org/show_bug.cgi?id=35197))
+* Implement ID3DXEffect::FindNextValidTechnique ([Wine Bug #34101](https://bugs.winehq.org/show_bug.cgi?id=34101))
+* Implement IDXGIOutput::GetDesc
 * Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
 * Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
 * Implement exclusive mode in PulseAudio backend ([Wine Bug #37042](https://bugs.winehq.org/show_bug.cgi?id=37042))
-* Implement stubs for mfplat.MFStartup and MFShutdown ([Wine Bug #37701](https://bugs.winehq.org/show_bug.cgi?id=37701))
+* Implement ntoskrnl driver testing framework.
+* Implement semi-stub for IDirectPlayVoiceClient::GetCompressionTypes ([Wine Bug #29238](https://bugs.winehq.org/show_bug.cgi?id=29238))
 * Improvement for heap allocation performance
-* Initialize irp.Tail.Overlay.OriginalFileObject with stub file object ([Wine Bug #37537](https://bugs.winehq.org/show_bug.cgi?id=37537))
 * Lego Stunt Rally requires DXTn software de/encoding support ([Wine Bug #25486](https://bugs.winehq.org/show_bug.cgi?id=25486))
 * Limit cross thread access to ImmSet* functions ([Wine Bug #35361](https://bugs.winehq.org/show_bug.cgi?id=35361))
 * Lockfree algorithm for filedescriptor cache (improves file access speed)
 * MSVCRT crashes when NULL is passed as string to atof or strtod ([Wine Bug #32550](https://bugs.winehq.org/show_bug.cgi?id=32550))
 * Make it possible to change media center / tablet pc status ([Wine Bug #18732](https://bugs.winehq.org/show_bug.cgi?id=18732))
 * Multiple applications need EnumDisplayDevicesW implementation ([Wine Bug #34978](https://bugs.winehq.org/show_bug.cgi?id=34978))
+* Multiple applications start wrong executable if whitespace present in name ([Wine Bug #19666](https://bugs.winehq.org/show_bug.cgi?id=19666))
 * Need for Speed 3 installer requires devices in HKEY_DYN_DATA ([Wine Bug #7115](https://bugs.winehq.org/show_bug.cgi?id=7115))
 * Other Pipelight-specific enhancements
+* Port Royale doesn't display ocean correctly ([Wine Bug #17913](https://bugs.winehq.org/show_bug.cgi?id=17913))
 * Prevent window managers from grouping all wine programs together ([Wine Bug #32699](https://bugs.winehq.org/show_bug.cgi?id=32699))
-* Provide named entry point shell32.SHILCreateFromPath for vista apps ([Wine Bug #37265](https://bugs.winehq.org/show_bug.cgi?id=37265))
-* Reallocate buffer when adding records to AVI files ([Wine Bug #5137](https://bugs.winehq.org/show_bug.cgi?id=5137))
 * Reduced SetTimer minimum value from 10 ms to 5 ms (improves Silverlight framerates)
 * Return an error when trying to open a terminated process ([Wine Bug #37087](https://bugs.winehq.org/show_bug.cgi?id=37087))
 * Return correct IMediaSeeking stream positions in quartz ([Wine Bug #23174](https://bugs.winehq.org/show_bug.cgi?id=23174))
 * Return correct values for GetThreadTimes function ([Wine Bug #20230](https://bugs.winehq.org/show_bug.cgi?id=20230))
 * Return more context attributes in schan_InitializeSecurityContextW ([Wine Bug #37527](https://bugs.winehq.org/show_bug.cgi?id=37527))
 * SO_CONNECT_TIME returns the appropriate time
+* Scrolling causes mouse and screen to lock in Call to Power II ([Wine Bug #34559](https://bugs.winehq.org/show_bug.cgi?id=34559))
 * Send WM_PAINT event during dialog creation ([Wine Bug #35652](https://bugs.winehq.org/show_bug.cgi?id=35652))
 * Set last error when GetRawInputDeviceList fails ([Wine Bug #37667](https://bugs.winehq.org/show_bug.cgi?id=37667))
+* Super Mario 3: Mario Forever fails to load keyboard mapping from profile files. ([Wine Bug #18099](https://bugs.winehq.org/show_bug.cgi?id=18099))
 * Support for AllocateAndGetTcpExTableFromStack ([Wine Bug #34372](https://bugs.winehq.org/show_bug.cgi?id=34372))
 * Support for BindImageEx ([Wine Bug #3591](https://bugs.winehq.org/show_bug.cgi?id=3591))
 * Support for CSMT (command stream) to increase graphic performance ([Wine Bug #11674](https://bugs.winehq.org/show_bug.cgi?id=11674))
+* Support for CUDA GPU video decoding
+* Support for D3DXComputeNormals ([Wine Bug #26379](https://bugs.winehq.org/show_bug.cgi?id=26379))
 * Support for D3DXGetShaderInputSemantics ([Wine Bug #22682](https://bugs.winehq.org/show_bug.cgi?id=22682))
+* Support for DDS file format in D3DXSaveTextureToFileInMemory ([Wine Bug #26898](https://bugs.winehq.org/show_bug.cgi?id=26898))
 * Support for DOS hidden/system file attributes ([Wine Bug #9158](https://bugs.winehq.org/show_bug.cgi?id=9158))
 * Support for Dynamic DST (daylight saving time) information in registry
 * Support for GdipCreateRegionRgnData ([Wine Bug #34843](https://bugs.winehq.org/show_bug.cgi?id=34843))
 * Support for GetFinalPathNameByHandle ([Wine Bug #36073](https://bugs.winehq.org/show_bug.cgi?id=36073))
 * Support for GetSystemTimes ([Wine Bug #19813](https://bugs.winehq.org/show_bug.cgi?id=19813))
 * Support for GetVolumePathName
+* Support for ID3DXFont::DrawTextA/W ([Wine Bug #24754](https://bugs.winehq.org/show_bug.cgi?id=24754))
 * Support for ID3DXSkinInfoImpl_UpdateSkinnedMesh ([Wine Bug #32572](https://bugs.winehq.org/show_bug.cgi?id=32572))
 * Support for ITextDocument_fnRange function ([Wine Bug #12458](https://bugs.winehq.org/show_bug.cgi?id=12458))
 * Support for ITextRange, ITextFont and ITextPara ([Wine Bug #18303](https://bugs.winehq.org/show_bug.cgi?id=18303))
 * Support for Junction Points ([Wine Bug #12401](https://bugs.winehq.org/show_bug.cgi?id=12401))
-* Support for K32EnumProcessModulesEx ([Wine Bug #34864](https://bugs.winehq.org/show_bug.cgi?id=34864))
 * Support for KF_FLAG_DEFAULT_PATH in SHGetKnownFolderPath ([Wine Bug #30385](https://bugs.winehq.org/show_bug.cgi?id=30385))
 * Support for LoadIconMetric ([Wine Bug #35375](https://bugs.winehq.org/show_bug.cgi?id=35375))
 * Support for NtQuerySection ([Wine Bug #37338](https://bugs.winehq.org/show_bug.cgi?id=37338))
@@ -131,31 +159,31 @@ Included bug fixes and improvements
 * Support for PulseAudio backend for audio ([Wine Bug #10495](https://bugs.winehq.org/show_bug.cgi?id=10495))
 * Support for RtlDecompressBuffer ([Wine Bug #37449](https://bugs.winehq.org/show_bug.cgi?id=37449))
 * Support for SHCreateSessionKey ([Wine Bug #35630](https://bugs.winehq.org/show_bug.cgi?id=35630))
-* Support for StrCatChainW
+* Support for SLGetWindowsInformationDWORD ([Wine Bug #36709](https://bugs.winehq.org/show_bug.cgi?id=36709))
 * Support for TOOLTIPS_GetTipText edge cases ([Wine Bug #30648](https://bugs.winehq.org/show_bug.cgi?id=30648))
 * Support for TransmitFile ([Wine Bug #5048](https://bugs.winehq.org/show_bug.cgi?id=5048))
 * Support for UTF7 encoding/decoding ([Wine Bug #27388](https://bugs.winehq.org/show_bug.cgi?id=27388))
 * Support for WTSEnumerateProcessesW ([Wine Bug #29903](https://bugs.winehq.org/show_bug.cgi?id=29903))
-* Support for combase HSTRING objects
 * Support for extra large and jumbo icon lists in shell32 ([Wine Bug #24721](https://bugs.winehq.org/show_bug.cgi?id=24721))
 * Support for inherited file ACLs ([Wine Bug #34406](https://bugs.winehq.org/show_bug.cgi?id=34406))
 * Support for interface change notifications ([Wine Bug #32328](https://bugs.winehq.org/show_bug.cgi?id=32328))
 * Support for loader dll redirections
+* Support for named pipe message mode (Linux only) ([Wine Bug #17195](https://bugs.winehq.org/show_bug.cgi?id=17195))
 * Support for pasting HTML from Unix applications ([Wine Bug #7372](https://bugs.winehq.org/show_bug.cgi?id=7372))
 * Support for process ACLs ([Wine Bug #22006](https://bugs.winehq.org/show_bug.cgi?id=22006))
 * Support for setcap on wine-preloader ([Wine Bug #26256](https://bugs.winehq.org/show_bug.cgi?id=26256))
 * Support for stored file ACLs ([Wine Bug #31858](https://bugs.winehq.org/show_bug.cgi?id=31858))
-* Support for wine64 on FreeBSD/PC-BSD ([Wine Bug #34330](https://bugs.winehq.org/show_bug.cgi?id=34330))
+* Try harder to get the host name address in getaddrinfo() ([Wine Bug #29609](https://bugs.winehq.org/show_bug.cgi?id=29609))
 * Tumblebugs 2 requires DXTn software encoding support ([Wine Bug #29586](https://bugs.winehq.org/show_bug.cgi?id=29586))
-* Unity3D Editor requires ProductId registry value ([Wine Bug #36964](https://bugs.winehq.org/show_bug.cgi?id=36964))
 * Update a XIM candidate position when cursor location changes ([Wine Bug #30938](https://bugs.winehq.org/show_bug.cgi?id=30938))
+* Use actual program name if available to describe PulseAudio streams
 * Use manual relay for RunDLL_CallEntry16 in shell32 ([Wine Bug #23033](https://bugs.winehq.org/show_bug.cgi?id=23033))
 * Voobly expects correct handling of WRITECOPY memory protection ([Wine Bug #29384](https://bugs.winehq.org/show_bug.cgi?id=29384))
 * Wine ignores IDF_CHECKFIRST flag in SetupPromptForDisk ([Wine Bug #20465](https://bugs.winehq.org/show_bug.cgi?id=20465))
 * Workaround for shlwapi URLs with relative paths
 * XEMBED support for embedding Wine windows inside Linux applications
-* nVidia driver for high-end laptop cards does not list all supported resolutions
-* vSphere needs IoCsqInitialize ([Wine Bug #36777](https://bugs.winehq.org/show_bug.cgi?id=36777))
+* eRacer Demo doesn't correctly display text ([Wine Bug #29598](https://bugs.winehq.org/show_bug.cgi?id=29598))
+* ntdll is missing WinSqm[Start|End]Session implementation ([Wine Bug #31971](https://bugs.winehq.org/show_bug.cgi?id=31971))
 * wglDescribePixelFormat should return max index for NULL descriptor ([Wine Bug #6176](https://bugs.winehq.org/show_bug.cgi?id=6176))
 * wininet should allow Accept-Encoding header for HTTP/1.0 ([Wine Bug #37046](https://bugs.winehq.org/show_bug.cgi?id=37046))
 

debian/changelog

@@ -1,3 +1,92 @@
+wine-staging (1.7.35) unstable; urgency=low
+  * Add stub for KeWaitForMultipleObjects.
+  * Add support for patchinstall.sh parameters '--no-patchlist' and '--no-autoconf'.
+  * Add support for Gentoo epatch backend to patchinstall.sh.
+  * Fix compile warnings on x86_64 in several patchsets.
+  * Automatically enable fallback method to apply patches when running from inside of a git subdirectory.
+  * Synchronize CSMT patchset with https://github.com/stefand/wine.
+  * Several improvements to make nvcuvid (CUDA video decoding) better compatible with x86_64.
+  * Properly wrap CUDA stream callbacks by forwarding them to a separate worker thread.
+  * Added patch to quote program name in ShellExecute[Ex] when it contains spaces.
+  * Added patch to implement support for DDS file format in D3DXSaveTextureToFileInMemory.
+  * Added patch to avoid appending duplicate NULL character when importing keys with regedit.
+  * Added patch for IConnectionPoint/INetworkListManagerEvents stub interface.
+  * Added patch to fix init of LONGLONG variable with a negative value in TGA decoder.
+  * Added patch to implement stubs for D3DXCreateAnimationController interface.
+  * Added patch to implement semi-stub for IDirectPlayVoiceClient::GetCompressionTypes.
+  * Added patch to fix cursor clip regression / broken raw input in multiple games.
+  * Added patches to implement ntoskrnl driver testing framework.
+  * Added patch to fix handling of window attributes for WS_EX_LAYERED | WS_EX_COMPOSITED.
+  * Removed patch to fix RandR on some broken nVidia systems (accepted upstream).
+  * Removed patch to set last error on success in WSARecv (accepted upstream).
+  * Removed patch to fix handling of subdirectory in FtpFindFirstFile (accepted upstream).
+  * Removed patch to initialize irp.Tail.Overlay.OriginalFileObject with stub file object (accepted upstream).
+  * Removed patch to fix incorrect behaviour of PathIsDirectoryEmptyW (accepted upstream).
+  * Removed patch to store IOCS data in a property instead of GWLP_USERDATA (accepted upstream).
+  * Removed patch to fix color key regression (fixed upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 24 Jan 2015 16:03:35 +0100
+
+wine-staging (1.7.34-1) unstable; urgency=low
+  * Debian/Ubuntu specific package dependency fix (no changes for other distros).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 11 Jan 2015 19:14:09 +0100
+
+wine-staging (1.7.34) unstable; urgency=low
+  * Huge rewrite of patchupdate.py, deprecation of Makefile based way to apply patches.
+  * Rename debian package from 'wine-compholio' to 'wine-staging' and provide compatibility package.
+  * Avoid duplicate wined3d specfile by adding PARENTSPEC Makefile argument.
+  * Fix issue in DOS Attributes patch which broke ./configure on systems with alternative shells.
+  * Fix issue in user32-WndProc patch which caused crashes for some 16-bit apps.
+  * Fix issue in ws2_32-WriteWatches patch which can cause exceptions on the signal stack.
+  * Fix issue with invalid handles being incorrect when a new process is created.
+  * Update DXTn patches to better handle when libtxc_dxtn is missing or support is not compiled in.
+  * Added patch for WSARecv to call SetLastError on success.
+  * Added patch for CreateProcess to prioritize the working directory over the system search path.
+  * Added patch with stubs for WinSqm[Start|End]Session.
+  * Added patch to fix handling of subdirectory in FtpFindFirstFile.
+  * Added patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK.
+  * Added patch to ensure X11 input events are handled even without explicit message loop.
+  * Added test for server-Unexpected_Wakeup patch.
+  * Added patch for stub of ntdll.RtlSetHeapInformation.
+  * Added patch for IDXGIOutput::GetDesc.
+  * Added patch for ID3DXEffect::FindNextValidTechnique.
+  * Added patch with stub for D3DXComputeTangentFrameEx.
+  * Added patch with stub for D3DXIntersect.
+  * Added test for RtlIpv4StringToAddressExA.
+  * Added patch for support of SLGetWindowsInformationDWORD.
+  * Added patch to expect the correct buffer size for different IOCTL_DVD_READ_STRUCTURE requests.
+  * Added patch to use actual program name if available to describe PulseAudio streams.
+  * Added patch to try harder to get the host name address in getaddrinfo().
+  * Added patch to fix invalid usage of RegOpenKeyExW in msdmo.
+  * Added patch to add support for named pipe message mode.
+  * Added patch to avoid calling IDirect3DDevice7_DrawIndexedPrimitive if there is no primitive.
+  * Added patch to fix access violation when calling GetStringTypeW with NULL src.
+  * Added patch for ID3DXFont::DrawTextA/W support.
+  * Added patch to fix parameters for ConvertToIndexedBlendedMesh stub.
+  * Added patch for basic CUDA support.
+  * Added patches for D3DXComputeNormals and D3DXComputeNormalMap.
+  * Added patch for nvapi stubs (required for GPU PhysX support).
+  * Added patch to fix NULL dereference in ICSeqCompressFrameStart.
+  * Added patch to implement support for CUDA GPU video decoding.
+  * Added patch to fix color key regression causing pink rectangles around text.
+  * Rebased winepulse-Pulseaudio_Support patches to latest version from http://repo.or.cz/w/wine/multimedia.git.
+  * Removed patch to emulate write to CR4 register (accepted upstream).
+  * Removed patch with stub for KeSetSystemAffinityThread (accepted upstream).
+  * Removed patch to implement combase HSTRING objects (accepted upstream).
+  * Removed patch to add fake ProductId to registry (accepted upstream).
+  * Removed patch to implement stubs for MFStartup and MFShutdown (accepted upstream).
+  * Removed patch to implement shlwapi.StrCatChainW (accepted upstream).
+  * Removed patch to implement semi-stub for psapi/kernel32 K32EnumProcessModulesEx (accepted upstream).
+  * Removed patch to return proper charcount for GetLocaleInfo with LOCALE_IFIRSTDAYOFWEEK (accepted upstream).
+  * Removed patch to export SHILCreateFromPath by name (accepted upstream).
+  * Removed patch for stub of ntdll.RtlSetHeapInformation (accepted upstream).
+  * Removed patch for wine64 support on FreeBSD (accepted upstream).
+  * Removed patch for IoCsqInitialize (accepted upstream).
+  * Removed patch to fix invalid usage of RegOpenKeyExW in msdmo (fixed upstream).
+  * Removed patch to reallocate buffer when adding records to AVI files (fixed upstream).
+  * Partially removed patches for ntdll DOS attributes (accepted upstream).
+  * Partially removed patches for UTF7 support (accepted upstream).
+ -- Sebastian Lackner <sebastian@fds-team.de>  Sat, 10 Jan 2015 22:22:01 +0100
+
 wine-compholio (1.7.33) unstable; urgency=low
   * Various improvements of patchupdate.py.
   * Added patches for wined3d CSMT (command stream) support.
@@ -54,7 +143,7 @@ wine-compholio (1.7.32) unstable; urgency=low
   * Removed patch to fix implementation ofCoWaitForMultipleHandles (accepted upstream).
   * Removed patch to avoid interthread no-op messages in ShowWindow (accepted upstream).
   * Removed patches to take abs() of vertex z coordinate as FFP fog coordinate (fixed upstream).
-  * Removed patch to fix detection of gnutls on Ubuntu 14.10.
+  * Removed patch to fix detection of gnutls on Ubuntu 14.10 (accepted upstream).
  -- Sebastian Lackner <sebastian@fds-team.de>  Sun, 30 Nov 2014 15:22:49 +0100
 
 wine-compholio (1.7.31) unstable; urgency=low

debian/control

@@ -1,4 +1,4 @@
-Source: wine-compholio
+Source: wine-staging
 Section: otherosfs
 Priority: optional
 Maintainer: Erich E. Hoover <erich.e.hoover@gmail.com>
@@ -69,7 +69,7 @@ Build-Depends: autotools-dev,
                x11proto-xinerama-dev
 Standards-Version: 3.9.2
 
-Package: wine-compholio-i386
+Package: wine-staging-i386
 Architecture: i386
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
@@ -108,9 +108,7 @@ Recommends: libcapi20-3,
             libgsm1
 Section: otherosfs
 Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
+Description: The Staging Edition is a special build of the popular Wine software
  with patches representing my current staging tree for Wine.
  .
  Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -125,7 +123,7 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
  work, there may be some loss of functionality compared with the stable release
  provided by the regular wine package.
 
-Package: wine-compholio-amd64
+Package: wine-staging-amd64
 Architecture: amd64
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
@@ -164,9 +162,7 @@ Recommends: libcapi20-3,
             libgsm1
 Section: otherosfs
 Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
+Description: The Staging Edition is a special build of the popular Wine software
  with patches representing my current staging tree for Wine.
  .
  Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -181,16 +177,16 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
  work, there may be some loss of functionality compared with the stable release
  provided by the regular wine package.
 
-Package: wine-compholio
+Package: wine-staging
 Architecture: i386 amd64
 Multi-Arch: foreign
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
 Depends:    ${misc:Depends}, ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
+            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
+            wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: otherosfs
 Priority: optional
-Description: The Compholio Edition is a special build of the popular Wine software
+Description: The Staging Edition is a special build of the popular Wine software
  with patches representing my current staging tree for Wine.
  .
  Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -207,18 +203,16 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
  work, there may be some loss of functionality compared with the stable release
  provided by the regular wine package.
 
-Package: wine-compholio-dev
+Package: wine-staging-dev
 Architecture: i386 amd64
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
 Depends:    libc6-dev,
             ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
+            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
+            wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: libdevel
 Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
+Description: The Staging Edition is a special build of the popular Wine software
  with patches representing my current staging tree for Wine.
  .
  Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -230,18 +224,16 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
  This package consists of the development files needed to compile programs
  using wine's free version of the Microsoft Windows API.
 
-Package: wine-compholio-dbg
+Package: wine-staging-dbg
 Architecture: i386 amd64
 Multi-Arch: same
 Pre-Depends: dpkg (>= 1.14.12ubuntu3), ${misc:Pre-Depends}
 Depends:    ${shlibs:Depends},
-            wine-compholio-i386  (= ${binary:Version}) [i386 amd64],
-            wine-compholio-amd64 (= ${binary:Version}) [amd64],
+            wine-staging-i386  (= ${binary:Version}) [i386 amd64],
+            wine-staging-amd64 (= ${binary:Version}) [amd64],
 Section: debug
 Priority: optional
-Replaces: wine-compholio (<< 1.7.15-1~)
-Breaks: wine-compholio (<< 1.7.15-1~)
-Description: The Compholio Edition is a special build of the popular Wine software
+Description: The Staging Edition is a special build of the popular Wine software
  with patches representing my current staging tree for Wine.
  .
  Microsoft Windows Compatibility Layer (Binary Emulator and Library)
@@ -252,3 +244,43 @@ Description: The Compholio Edition is a special build of the popular Wine softwa
  .
  This package includes debugging symbols useful for reporting crashes and other
  failures.
+
+Package: wine-compholio
+Architecture: i386 amd64
+Depends: wine-staging, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-i386
+Architecture: i386
+Depends: wine-staging-i386, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-amd64
+Architecture: amd64
+Depends: wine-staging-amd64, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-dev
+Architecture: i386 amd64
+Depends: wine-staging-dev, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.
+
+Package: wine-compholio-dbg
+Architecture: i386 amd64
+Depends: wine-staging-dbg, ${misc:Depends}
+Priority: extra
+Section: oldlibs
+Description: Transitional dummy package
+ This is a transitional dummy package. It can safely be removed.

debian/rules

@@ -14,11 +14,11 @@ endif
 override_dh_auto_configure:
 
 	# Apply our patches, reconfigure, and update the wineserver protocol request data
-	make -C "$(CURDIR)/patches/" DESTDIR="$(CURDIR)" install
+	"$(CURDIR)/patches/patchinstall.sh" DESTDIR="$(CURDIR)" --all
 
 	# Run configure
 ifeq ($(DEB_BUILD_ARCH), amd64)
-	./configure --prefix=/opt/wine-compholio \
+	./configure --prefix=/opt/wine-staging \
 				--libdir=\$${prefix}/lib64 \
 				--mandir=\$${prefix}/share/man \
 				--infodir=\$${prefix}/share/info \
@@ -27,7 +27,7 @@ ifeq ($(DEB_BUILD_ARCH), amd64)
 				--with-xattr \
 				$(CONFFLAGS)
 else
-	./configure --prefix=/opt/wine-compholio \
+	./configure --prefix=/opt/wine-staging \
 				--libdir=\$${prefix}/lib \
 				--mandir=\$${prefix}/share/man \
 				--infodir=\$${prefix}/share/info \
@@ -42,31 +42,42 @@ override_dh_auto_test:
 
 
 override_dh_installdocs:
-
-	# Create copies of license files
-	cp "$(CURDIR)/LICENSE" "$(CURDIR)/LICENSE.wine"
-	cp "$(CURDIR)/LICENSE.md" "$(CURDIR)/LICENSE.wine-compholio"
-
-	dh_installdocs --link-doc=wine-compholio
+	dh_installdocs --link-doc=wine-staging
 
 
 override_dh_install:
 	dh_install --fail-missing
 
 	# These files will end up in multiple packages otherwise
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine-preloader
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64
-	rm -f debian/wine-compholio/opt/wine-compholio/bin/wine64-preloader
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine-preloader
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine64
+	rm -f debian/wine-staging/opt/wine-staging/bin/wine64-preloader
 
+	# Create compatibility symlinks
+	mkdir -p debian/wine-compholio/opt/wine-compholio/bin
+	for _file in $$(ls "debian/wine-staging/opt/wine-staging/bin"); do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+
+	# Architecture specific compatibility symlinks
+ifeq ($(DEB_HOST_ARCH),amd64)
+	for _file in wine wine-preloader wine64 wine64-preloader; do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+else
+	for _file in wine wine-preloader; do \
+		ln -s "/opt/wine-staging/bin/$$_file" "debian/wine-compholio/opt/wine-compholio/bin/$$_file"; \
+	done
+endif
 
 override_dh_strip:
-	dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-compholio-dbg
+	dh_strip -Xwine-pthread -Xwine-kthread --dbg-package=wine-staging-dbg
 
 
 override_dh_shlibdeps:
 ifeq ($(DEB_HOST_ARCH),amd64)
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib64/
+	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib64/
 else
-	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-compholio/lib/
+	dh_shlibdeps -l $(CURDIR)/debian/tmp/opt/wine-staging/lib/
 endif

debian/tools/README.md.in

@@ -23,11 +23,12 @@ How to install and use Wine Staging
 
 Ready-to-use packages for Wine Staging are available for a variety
 of different Linux distributions directly for download. Just follow the
-instructions available on the [website](http://www.wine-staging.com/install.html).
+instructions available on the
+[Wiki](https://github.com/wine-compholio/wine-staging/wiki/Installation).
 
 When using Wine Staging there are a few differences compared to regular
 Wine. The main difference is that it is not sufficient to type `wine` to
-run it, but instead you will have to type `/opt/wine-compholio/bin/wine`.
+run it, but instead you will have to type `/opt/wine-staging/bin/wine`.
 Besides that there are also some other differences, for example additional
 configuration options to tweak performance, which are not available in regular
 Wine. All those differences are also documented on the

debian/tools/gitapply.sh

@@ -2,7 +2,7 @@
 #
 # Wrapper to apply binary patches without git.
 #
-# Copyright (C) 2014 Sebastian Lackner
+# Copyright (C) 2014-2015 Sebastian Lackner
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -75,7 +75,7 @@ filesize()
 
 
 # Parse environment variables
-while [[ $# > 0 ]]; do
+while [ "$#" -gt 0 ]; do
 	cmd="$1"; shift
 	case "$cmd" in
 

debian/tools/patchinstall.sh.in

@@ -0,0 +1,373 @@
+#!/bin/sh
+#
+# Script to automatically install all Wine Staging patches
+#
+# Copyright (C) 2015 Sebastian Lackner
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
+#
+
+# Show usage information
+usage()
+{{
+	echo ""
+	echo "Usage: ./patchinstall.sh [DESTDIR=path] [--all] [-W patchset] [patchset ...]"
+	echo ""
+	echo "Autogenerated script to apply all Wine Staging patches on your Wine"
+	echo "source tree. This script replaces and enhances the old method of"
+	echo "using a Makefile."
+	echo ""
+	echo "Configuration:"
+	echo "  DESTDIR=path         Specify the path to the wine source tree"
+	echo "  --all                Select all patches"
+	echo "  --help               Display this help and exit"
+	echo "  --no-patchlist       Do not apply patchlist (needed for 'wine --patches')"
+	echo "  --no-autoconf        Do not run autoreconf and tools/make_requests"
+	echo "  -W patchset          Exclude a specific patchset"
+	echo ""
+	echo "Backends:"
+	echo "  --backend=patch      Use regular 'patch' utility to apply patches (default)"
+	echo "  --backend=epatch     Use 'epatch' to apply patches (Gentoo only)"
+	echo "  --backend=git-am     Use 'git am' to apply patches"
+	echo "  --backend=git-apply  Use 'git apply' to apply patches"
+	echo "  --backend=stg        Import the patches using stacked git"
+	echo ""
+}}
+
+# Critical error, abort
+abort()
+{{
+	echo "ERROR: $1" >&2
+	exit 1
+}}
+
+{patch_helpers}
+
+# Default settings
+patch_enable_all 0
+enable_patchlist=1
+enable_autoconf=1
+patchlist="/dev/null"
+backend="patch"
+enable=1
+
+# Find location of patches
+patchdir="$(dirname "$(readlink -f "$0")")"
+if ! test -f "$patchdir/patchinstall.sh"; then
+	if test -f ./patchinstall.sh; then
+		patchdir="$(pwd)"
+	else
+		abort "Failed to find patch directory."
+	fi
+fi
+
+# Parse commandline arguments
+if test "$#" -eq 0; then
+	abort "No commandline arguments given, don't know what to do."
+fi
+
+while test "$#" -gt 0; do
+	if patch_enable "$1" "$enable"; then
+		shift
+		enable=1
+		continue
+	fi
+
+	if test "$enable" -ne 1; then
+		abort "Wrong use of -W commandline argument, expected patchname."
+	fi
+
+	case "$1" in
+		DESTDIR=*)
+			DESTDIR="${{1#*=}}"
+			shift
+			;;
+
+		--all)
+			patch_enable_all 1
+			shift
+			;;
+
+		--backend=*)
+			backend="${{1#*=}}"
+			shift
+			;;
+
+		--help)
+			usage
+			exit 0
+			;;
+
+		--no-patchlist)
+			enable_patchlist=0
+			shift
+			;;
+
+		--no-autoconf)
+			enable_autoconf=0
+			shift
+			;;
+
+		-W)
+			enable=2
+			shift
+			;;
+
+		*)
+			abort "Unknown commandline argument $1"
+			exit 1
+	esac
+done
+
+if test "$enable" -ne 1; then
+	abort "Missing argument for -W, expected patchname."
+fi
+
+# Determine DESTDIR if not explicitly specified
+if test -z "$DESTDIR" -a -f ./tools/make_requests; then
+	DESTDIR="$(pwd)"
+
+elif test ! -f "$DESTDIR/tools/make_requests"; then
+	abort "DESTDIR does not point to the Wine source tree."
+fi
+
+# Change directory to DESTDIR, epatch depends on that
+if ! cd "$DESTDIR"; then
+	abort "Unable to change directory to $DESTDIR."
+fi
+
+# Most backends will try to use git, either directly or indirectly.
+# Unfortunately this does not work when "$DESTDIR" points to a
+# subdirectory of a git tree, which has the effect that no patches
+# are applied, but the exitcode is zero. To avoid broken builds we
+# will workaround this issue or abort. For more information see
+# https://github.com/wine-compholio/wine-staging/issues/7
+test ! -d "$DESTDIR/.git" && (cd "$DESTDIR"; git rev-parse --git-dir) &> /dev/null
+workaround_git_bug="$?"
+
+# Apply the patches using gitapply.sh, a small wrapper around 'patch'
+if test "$backend" = "patch"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		gitapply_args="--nogit"
+	else
+		gitapply_args=""
+	fi
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		if ! "$patchdir/../debian/tools/gitapply.sh" $gitapply_args < "$1"; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+# 'epatch' backend - used on Gentoo
+elif test "$backend" = "epatch"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		gitapply_args="--nogit"
+	else
+		gitapply_args=""
+	fi
+
+	if ! command -v epatch &> /dev/null || \
+	   ! command -v ebegin &> /dev/null || \
+	   ! command -v eend &> /dev/null; then
+		abort "Shell functions epatch/ebegin/eend not found. You have to source this script from your ebuild."
+	fi
+
+	patch_apply_file ()
+	{{
+		shortname="$(basename "$1")"
+		if grep -q "^GIT binary patch" "$1"; then
+			ebegin "Applying $shortname"
+			"$patchdir/../debian/tools/gitapply.sh" $gitapply_args < "$1" || \
+				die "Failed Patch: $1!"
+			eend
+
+		else
+			epatch "$1" # epatch calls die upon failure
+		fi
+	}}
+
+# GIT backend - apply patches using 'git am'
+elif test "$backend" = "git" -o "$backend" = "git-am"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		abort "Backend 'git-am' not possible when DESTDIR points to a git subdirectory."
+	fi
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		if ! git am "$1"; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+# Git apply backend
+elif test "$backend" = "git-apply"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		abort "Backend 'git-apply' not possible when DESTDIR points to a git subdirectory."
+	fi
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		if ! git apply "$1"; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+# Stacked GIT backend - import the patches (mainly for developers)
+elif test "$backend" = "stg"; then
+
+	if test "$workaround_git_bug" -eq 0; then
+		abort "Backend 'stg' not possible when DESTDIR points to a git subdirectory."
+	fi
+
+	# Only import the regular patches, no autogenerated ones -
+	# moreover, don't run autoreconf or ./tools/make_requests.
+	enable_patchlist=0
+	enable_autoconf=0
+
+	patch_apply_file ()
+	{{
+		echo "Applying $1"
+		shortname="$(basename "$1")"
+		if ! echo "staging/$shortname" | cat - "$1" | stg import; then
+			abort "Failed to apply patch, aborting!"
+		fi
+	}}
+
+else
+	abort "Selected backend $backend not supported."
+fi
+
+patch_apply ()
+{{
+	patch_apply_file "$patchdir/$1"
+}}
+
+
+{patch_resolver}
+
+
+# If autoupdate is enabled then create a tempfile to keep track of all patches
+if test "$enable_patchlist" -eq 1; then
+	patchlist=$(mktemp)
+	if test ! -f "$patchlist"; then
+		abort "Unable to create temporary file for patchlist."
+	fi
+fi
+
+
+{patch_apply}
+
+
+if test "$enable_patchlist" -eq 1; then
+
+	# Generate a temporary patch containing the patchlist and apply it
+	patch_data=$(cat "$patchlist" | sort)
+	patch_lines=$(echo "$patch_data" | wc -l)
+	if test ! -z "$patch_data"; then
+		patch_lines=$((${{patch_lines}}+23))
+		cat > "$patchlist" <<EOF
+From: Wine Staging Team <webmaster@fds-team.de>
+Subject: Autogenerated patch list.
+
+diff --git a/include/wine/library.h b/include/wine/library.h
+--- a/include/wine/library.h
++++ b/include/wine/library.h
+@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
+ extern const char *wine_get_server_dir(void);
+ extern const char *wine_get_user_name(void);
+ extern const char *wine_get_version(void);
++extern const void *wine_get_patches(void);
+ extern const char *wine_get_build_id(void);
+ extern void wine_init_argv0_path( const char *argv0 );
+ extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
+diff --git a/libs/wine/config.c b/libs/wine/config.c
+index a273502..0a3182f 100644
+--- a/libs/wine/config.c
++++ b/libs/wine/config.c
+@@ -478,6 +478,${{patch_lines}} @@ const char *wine_get_version(void)
+     return PACKAGE_VERSION;
+ }}
+ 
++static const struct
++{{
++    const char *author;
++    const char *subject;
++    int revision;
++}}
++wine_patch_data[] =
++{{
+${{patch_data}}
++    {{ NULL, NULL, 0 }}
++}};
++
++/* return the applied non-standard patches */
++const void *wine_get_patches(void)
++{{
++    return &wine_patch_data[0];
++}}
++
+ /* return the build id string */
+ const char *wine_get_build_id(void)
+ {{
+diff --git a/libs/wine/wine.def b/libs/wine/wine.def
+index ed315bd..5b42029 100644
+--- a/libs/wine/wine.def
++++ b/libs/wine/wine.def
+@@ -83,6 +83,7 @@ EXPORTS
+     wine_get_sortkey
+     wine_get_user_name
+     wine_get_version
++    wine_get_patches
+     wine_init
+     wine_init_argv0_path
+     wine_is_dbcs_leadbyte
+diff --git a/libs/wine/wine.map b/libs/wine/wine.map
+index 2159fac..7cb2918 100644
+--- a/libs/wine/wine.map
++++ b/libs/wine/wine.map
+@@ -90,6 +90,7 @@ WINE_1.0
+     wine_get_ss;
+     wine_get_user_name;
+     wine_get_version;
++    wine_get_patches;
+     wine_init;
+     wine_init_argv0_path;
+     wine_is_dbcs_leadbyte;
+EOF
+		patch_apply_file "$patchlist"
+	fi
+	rm "$patchlist"
+fi
+
+if test "$enable_autoconf" -eq 1; then
+	if ! autoreconf -f; then
+		abort "'autoreconf -f' failed."
+	fi
+	if ! ./tools/make_requests; then
+		abort "'./tools/make_requests' failed."
+	fi
+fi
+
+# Success
+exit 0

debian/tools/patchlist.sh

@@ -1,74 +0,0 @@
-#!/bin/sh
-PATCH_DATA=$(cat);
-PATCH_LINES=$(echo "${PATCH_DATA}" | wc -l);
-PATCH_LINES=$((${PATCH_LINES}+23));
-
-cat <<EOF
-From: Wine Staging Team <webmaster@fds-team.de>
-Subject: Autogenerated patch list.
-
-diff --git a/include/wine/library.h b/include/wine/library.h
---- a/include/wine/library.h
-+++ b/include/wine/library.h
-@@ -43,6 +43,7 @@ extern const char *wine_get_data_dir(void);
- extern const char *wine_get_server_dir(void);
- extern const char *wine_get_user_name(void);
- extern const char *wine_get_version(void);
-+extern const void *wine_get_patches(void);
- extern const char *wine_get_build_id(void);
- extern void wine_init_argv0_path( const char *argv0 );
- extern void wine_exec_wine_binary( const char *name, char **argv, const char *env_var );
-diff --git a/libs/wine/config.c b/libs/wine/config.c
-index a273502..0a3182f 100644
---- a/libs/wine/config.c
-+++ b/libs/wine/config.c
-@@ -478,6 +478,${PATCH_LINES} @@ const char *wine_get_version(void)
-     return PACKAGE_VERSION;
- }
- 
-+static const struct
-+{
-+    const char *author;
-+    const char *subject;
-+    int revision;
-+}
-+wine_patch_data[] =
-+{
-${PATCH_DATA}
-+    { NULL, NULL, 0 }
-+};
-+
-+/* return the applied non-standard patches */
-+const void *wine_get_patches(void)
-+{
-+    return &wine_patch_data[0];
-+}
-+
- /* return the build id string */
- const char *wine_get_build_id(void)
- {
-diff --git a/libs/wine/wine.def b/libs/wine/wine.def
-index ed315bd..5b42029 100644
---- a/libs/wine/wine.def
-+++ b/libs/wine/wine.def
-@@ -83,6 +83,7 @@ EXPORTS
-     wine_get_sortkey
-     wine_get_user_name
-     wine_get_version
-+    wine_get_patches
-     wine_init
-     wine_init_argv0_path
-     wine_is_dbcs_leadbyte
-diff --git a/libs/wine/wine.map b/libs/wine/wine.map
-index 2159fac..7cb2918 100644
---- a/libs/wine/wine.map
-+++ b/libs/wine/wine.map
-@@ -90,6 +90,7 @@ WINE_1.0
-     wine_get_ss;
-     wine_get_user_name;
-     wine_get_version;
-+    wine_get_patches;
-     wine_init;
-     wine_init_argv0_path;
-     wine_is_dbcs_leadbyte;
-EOF

debian/wine-compholio-amd64.install

@@ -1,4 +0,0 @@
-/opt/wine-compholio/lib64/libwine.so*
-/opt/wine-compholio/lib64/wine
-/opt/wine-compholio/bin/wine64
-/opt/wine-compholio/bin/wine64-preloader

debian/wine-compholio-dev.install

@@ -1 +0,0 @@
-/opt/wine-compholio/include

debian/wine-compholio-i386.install

@@ -1,4 +0,0 @@
-/opt/wine-compholio/lib/libwine.so*
-/opt/wine-compholio/lib/wine
-/opt/wine-compholio/bin/wine
-/opt/wine-compholio/bin/wine-preloader

debian/wine-compholio.docs

@@ -1,6 +0,0 @@
-documentation/README.*
-ANNOUNCE
-AUTHORS
-LICENSE.wine
-LICENSE.wine-compholio
-README

debian/wine-compholio.install

@@ -1,2 +0,0 @@
-/opt/wine-compholio/bin
-/opt/wine-compholio/share

debian/wine-staging-amd64.install

@@ -0,0 +1,4 @@
+/opt/wine-staging/lib64/libwine.so*
+/opt/wine-staging/lib64/wine
+/opt/wine-staging/bin/wine64
+/opt/wine-staging/bin/wine64-preloader

debian/wine-staging-dev.install

@@ -0,0 +1 @@
+/opt/wine-staging/include

debian/wine-staging-i386.install

@@ -0,0 +1,4 @@
+/opt/wine-staging/lib/libwine.so*
+/opt/wine-staging/lib/wine
+/opt/wine-staging/bin/wine
+/opt/wine-staging/bin/wine-preloader

debian/wine-staging.docs

@@ -0,0 +1,9 @@
+documentation/README.*
+ANNOUNCE
+AUTHORS
+LICENSE
+COPYING.LIB
+COPYING.arial
+COPYING.cour
+COPYING.msyh
+README