diff --git a/debian/tools/patchupdate.py b/debian/tools/patchupdate.py index c7499f3a..0e88f5bd 100755 --- a/debian/tools/patchupdate.py +++ b/debian/tools/patchupdate.py @@ -431,9 +431,9 @@ def generate_makefile(all_patches, fp): fp.write("\t( \\\n") for info in patch.authors: if not info.subject: continue - s = info.subject + s = info.subject.replace("\\", "\\\\\\\\").replace("\"", "\\\\\"") if info.revision and info.revision != "1": s += " [rev %s]" % info.revision - fp.write("\t\techo \"+ { \\\"%s\\\", \\\"%s\\\", \\\"%s\\\" },\"; \\\n" % (patch.name, info.author, s)) + fp.write("\t\techo '+ { \"%s\", \"%s\", \"%s\" },'; \\\n" % (patch.name, info.author, s)) fp.write("\t) > %s.ok\n" % patch.name) else: fp.write("\ttouch %s.ok\n" % patch.name) diff --git a/patches/Makefile b/patches/Makefile index 96add461..2eb4d675 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -64,9 +64,9 @@ Miscellaneous.ok: $(PATCH) < Miscellaneous/0002-kernel32-Silence-repeated-CompareStringEx-FIXME.patch $(PATCH) < Miscellaneous/0003-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch ( \ - echo "+ { \"Miscellaneous\", \"Sebastian Lackner\", \"kernel32: Silence repeated CompareStringEx FIXME.\" },"; \ - echo "+ { \"Miscellaneous\", \"Erich E. Hoover\", \"wined3d: Silence repeated resource_check_usage FIXME. [rev 2]\" },"; \ - echo "+ { \"Miscellaneous\", \"Sebastian Lackner\", \"wined3d: Silence repeated wined3d_swapchain_present FIXME.\" },"; \ + echo '+ { "Miscellaneous", "Sebastian Lackner", "kernel32: Silence repeated CompareStringEx FIXME." },'; \ + echo '+ { "Miscellaneous", "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME. [rev 2]" },'; \ + echo '+ { "Miscellaneous", "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME." },'; \ ) > Miscellaneous.ok # Patchset Pipelight @@ -87,10 +87,10 @@ Pipelight.ok: $(PATCH) < Pipelight/0003-wined3d-allow-changing-strict-drawing-through-an-exp.patch $(PATCH) < Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch ( \ - echo "+ { \"Pipelight\", \"Michael Müller\", \"Decrease minimum SetTimer interval to 5 ms. [rev 2]\" },"; \ - echo "+ { \"Pipelight\", \"Michael Müller\", \"Allow changing strict draw ordering through an exported function.\" },"; \ - echo "+ { \"Pipelight\", \"Michael Müller\", \"Indicate direct rendering through OpenGL extension.\" },"; \ - echo "+ { \"Pipelight\", \"Sebastian Lackner\", \"Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command.\" },"; \ + echo '+ { "Pipelight", "Michael Müller", "Decrease minimum SetTimer interval to 5 ms. [rev 2]" },'; \ + echo '+ { "Pipelight", "Michael Müller", "Allow changing strict draw ordering through an exported function." },'; \ + echo '+ { "Pipelight", "Michael Müller", "Indicate direct rendering through OpenGL extension." },'; \ + echo '+ { "Pipelight", "Sebastian Lackner", "Implement X11DRV_FLUSH_GDI_DISPLAY ExtEscape command." },'; \ ) > Pipelight.ok # Patchset fonts-Missing_Fonts @@ -110,7 +110,7 @@ fonts-Missing_Fonts.ok: $(PATCH) < fonts-Missing_Fonts/0001-fonts-Add-Liberation-Sans-as-an-Arial-replacement.patch $(PATCH) < fonts-Missing_Fonts/0002-fonts-Add-WenQuanYi-Micro-Hei-as-a-Microsoft-Yahei-r.patch ( \ - echo "+ { \"fonts-Missing_Fonts\", \"Torsten Kurbad / Erich E. Hoover\", \"Implement missing fonts expected by Silverlight. [rev 2]\" },"; \ + echo '+ { "fonts-Missing_Fonts", "Torsten Kurbad / Erich E. Hoover", "Implement missing fonts expected by Silverlight. [rev 2]" },'; \ ) > fonts-Missing_Fonts.ok # Patchset kernel32-GetVolumePathName @@ -126,7 +126,7 @@ kernel32-GetVolumePathName.ok: $(PATCH) < kernel32-GetVolumePathName/0002-kernel32-Convert-GetVolumePathName-tests-into-a-list.patch $(PATCH) < kernel32-GetVolumePathName/0003-kernel32-Add-a-bunch-more-GetVolumePathName-tests.patch ( \ - echo "+ { \"kernel32-GetVolumePathName\", \"Erich E. Hoover\", \"Implement GetVolumePathName.\" },"; \ + echo '+ { "kernel32-GetVolumePathName", "Erich E. Hoover", "Implement GetVolumePathName." },'; \ ) > kernel32-GetVolumePathName.ok # Patchset kernel32-Named_Pipe @@ -144,7 +144,7 @@ kernel32-GetVolumePathName.ok: kernel32-Named_Pipe.ok: $(PATCH) < kernel32-Named_Pipe/0001-kernel32-Change-return-value-of-stub-SetNamedPipeHandl.patch ( \ - echo "+ { \"kernel32-Named_Pipe\", \"Sebastian Lackner\", \"Change return value of stub SetNamedPipeHandleState to TRUE.\" },"; \ + echo '+ { "kernel32-Named_Pipe", "Sebastian Lackner", "Change return value of stub SetNamedPipeHandleState to TRUE." },'; \ ) > kernel32-Named_Pipe.ok # Patchset loader-Cmdline_Diagnostics @@ -161,8 +161,8 @@ loader-Cmdline_Diagnostics.ok: $(PATCH) < loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch $(PATCH) < loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch ( \ - echo "+ { \"loader-Cmdline_Diagnostics\", \"Sebastian Lackner\", \"Add commandline option --patches to show the patch list.\" },"; \ - echo "+ { \"loader-Cmdline_Diagnostics\", \"Michael Müller\", \"Add commandline option --check-libs to test if shared libraries are installed.\" },"; \ + echo '+ { "loader-Cmdline_Diagnostics", "Sebastian Lackner", "Add commandline option --patches to show the patch list." },'; \ + echo '+ { "loader-Cmdline_Diagnostics", "Michael Müller", "Add commandline option --check-libs to test if shared libraries are installed." },'; \ ) > loader-Cmdline_Diagnostics.ok # Patchset ntdll-Dynamic_DST @@ -181,8 +181,8 @@ ntdll-Dynamic_DST.ok: $(PATCH) < ntdll-Dynamic_DST/0001-ntdll-Add-support-for-Dynamic-DST-daylight-saving-ti.patch $(PATCH) < ntdll-Dynamic_DST/0002-wine.inf-Add-Dynamic-DST-exceptions-for-Israel-Stand.patch ( \ - echo "+ { \"ntdll-Dynamic_DST\", \"Michael Müller\", \"Add support for Dynamic DST (daylight saving time) information in registry.\" },"; \ - echo "+ { \"ntdll-Dynamic_DST\", \"Sebastian Lackner\", \"Add Dynamic DST exceptions for Israel Standard Time.\" },"; \ + echo '+ { "ntdll-Dynamic_DST", "Michael Müller", "Add support for Dynamic DST (daylight saving time) information in registry." },'; \ + echo '+ { "ntdll-Dynamic_DST", "Sebastian Lackner", "Add Dynamic DST exceptions for Israel Standard Time." },'; \ ) > ntdll-Dynamic_DST.ok # Patchset ntdll-FD_Cache @@ -196,7 +196,7 @@ ntdll-Dynamic_DST.ok: ntdll-FD_Cache.ok: $(PATCH) < ntdll-FD_Cache/0001-ntdll-Use-lockfree-implementation-for-get_cached_fd.patch ( \ - echo "+ { \"ntdll-FD_Cache\", \"Sebastian Lackner\", \"Use lockfree implementation for get_cached_fd. [rev 4]\" },"; \ + echo '+ { "ntdll-FD_Cache", "Sebastian Lackner", "Use lockfree implementation for get_cached_fd. [rev 4]" },'; \ ) > ntdll-FD_Cache.ok # Patchset ntdll-Junction_Points @@ -219,7 +219,7 @@ ntdll-Junction_Points.ok: $(PATCH) < ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch $(PATCH) < ntdll-Junction_Points/0007-ntdll-tests-Add-test-for-deleting-junction-point-tar.patch ( \ - echo "+ { \"ntdll-Junction_Points\", \"Erich E. Hoover\", \"Support for junction points/reparse points.\" },"; \ + echo '+ { "ntdll-Junction_Points", "Erich E. Hoover", "Support for junction points/reparse points." },'; \ ) > ntdll-Junction_Points.ok # Patchset quartz-MediaSeeking_Positions @@ -239,7 +239,7 @@ quartz-MediaSeeking_Positions.ok: $(PATCH) < quartz-MediaSeeking_Positions/0003-quartz-Implement-MediaSeeking_GetStopPosition-on-top.patch $(PATCH) < quartz-MediaSeeking_Positions/0004-quartz-Remove-unused-cache-of-MediaSeeking-stop-posi.patch ( \ - echo "+ { \"quartz-MediaSeeking_Positions\", \"Erich E. Hoover\", \"Return correct IMediaSeeking stream positions in quartz.\" },"; \ + echo '+ { "quartz-MediaSeeking_Positions", "Erich E. Hoover", "Return correct IMediaSeeking stream positions in quartz." },'; \ ) > quartz-MediaSeeking_Positions.ok # Patchset server-ACL_Compat @@ -253,7 +253,7 @@ quartz-MediaSeeking_Positions.ok: server-ACL_Compat.ok: server-Inherited_ACLs.ok $(PATCH) < server-ACL_Compat/0010-server-Add-compatibility-code-for-handling-the-old-m.patch ( \ - echo "+ { \"server-ACL_Compat\", \"Erich E. Hoover\", \"Compatibility patch for old method of storing extended file system attributes. [rev 6]\" },"; \ + echo '+ { "server-ACL_Compat", "Erich E. Hoover", "Compatibility patch for old method of storing extended file system attributes. [rev 6]" },'; \ ) > server-ACL_Compat.ok # Patchset server-Address_Change_Notification @@ -274,7 +274,7 @@ server-Address_Change_Notification.ok: $(PATCH) < server-Address_Change_Notification/0004-server-Implement-the-interface-change-notification-o.patch $(PATCH) < server-Address_Change_Notification/0005-ws2_32-Add-an-interactive-test-for-interface-change-.patch ( \ - echo "+ { \"server-Address_Change_Notification\", \"Erich E. Hoover\", \"Implement SIO_ADDRESS_LIST_CHANGE. [rev 2]\" },"; \ + echo '+ { "server-Address_Change_Notification", "Erich E. Hoover", "Implement SIO_ADDRESS_LIST_CHANGE. [rev 2]" },'; \ ) > server-Address_Change_Notification.ok # Patchset server-CreateProcess_ACLs @@ -295,7 +295,7 @@ server-CreateProcess_ACLs.ok: $(PATCH) < server-CreateProcess_ACLs/0003-server-implement-passing-a-process-security-descript.patch $(PATCH) < server-CreateProcess_ACLs/0004-server-implement-passing-a-thread-security-descripto.patch ( \ - echo "+ { \"server-CreateProcess_ACLs\", \"Joris van der Wel\", \"Implement passing ACLs to CreateProcess.\" },"; \ + echo '+ { "server-CreateProcess_ACLs", "Joris van der Wel", "Implement passing ACLs to CreateProcess." },'; \ ) > server-CreateProcess_ACLs.ok # Patchset server-Inherited_ACLs @@ -313,7 +313,7 @@ server-Inherited_ACLs.ok: server-Stored_ACLs.ok $(PATCH) < server-Inherited_ACLs/0001-server-Inherit-security-attributes-from-parent-direc.patch $(PATCH) < server-Inherited_ACLs/0002-server-Inherit-security-attributes-from-parent-direc.patch ( \ - echo "+ { \"server-Inherited_ACLs\", \"Erich E. Hoover\", \"Add support for inherited security attributes. [rev 6]\" },"; \ + echo '+ { "server-Inherited_ACLs", "Erich E. Hoover", "Add support for inherited security attributes. [rev 6]" },'; \ ) > server-Inherited_ACLs.ok # Patchset server-Misc_ACL @@ -331,7 +331,7 @@ server-Misc_ACL.ok: server-Stored_ACLs.ok $(PATCH) < server-Misc_ACL/0001-server-Add-default-security-descriptor-ownership-for.patch $(PATCH) < server-Misc_ACL/0002-server-Add-default-security-descriptor-DACL-for-proc.patch ( \ - echo "+ { \"server-Misc_ACL\", \"Erich E. Hoover\", \"Add default security descriptor ownership and DACLs for processes.\" },"; \ + echo '+ { "server-Misc_ACL", "Erich E. Hoover", "Add default security descriptor ownership and DACLs for processes." },'; \ ) > server-Misc_ACL.ok # Patchset server-Stored_ACLs @@ -353,7 +353,7 @@ server-Stored_ACLs.ok: $(PATCH) < server-Stored_ACLs/0005-server-Retrieve-file-security-attributes-with-extend.patch $(PATCH) < server-Stored_ACLs/0006-server-Convert-return-of-file-security-masks-with-ge.patch ( \ - echo "+ { \"server-Stored_ACLs\", \"Erich E. Hoover\", \"Store and return security attributes with extended file attributes. [rev 6]\" },"; \ + echo '+ { "server-Stored_ACLs", "Erich E. Hoover", "Store and return security attributes with extended file attributes. [rev 6]" },'; \ ) > server-Stored_ACLs.ok # Patchset shell32-Default_Folder_ACLs @@ -367,7 +367,7 @@ server-Stored_ACLs.ok: shell32-Default_Folder_ACLs.ok: $(PATCH) < shell32-Default_Folder_ACLs/0001-shell32-Set-the-default-security-attributes-for-user.patch ( \ - echo "+ { \"shell32-Default_Folder_ACLs\", \"Erich E. Hoover\", \"Generate default ACLs for user shell folders. [rev 6]\" },"; \ + echo '+ { "shell32-Default_Folder_ACLs", "Erich E. Hoover", "Generate default ACLs for user shell folders. [rev 6]" },'; \ ) > shell32-Default_Folder_ACLs.ok # Patchset shlwapi-UrlCombine @@ -382,7 +382,7 @@ shlwapi-UrlCombine.ok: $(PATCH) < shlwapi-UrlCombine/0001-shlwapi-tests-Add-additional-tests-for-UrlCombine-and-.patch $(PATCH) < shlwapi-UrlCombine/0002-shlwapi-UrlCombineW-workaround-for-relative-paths.patch ( \ - echo "+ { \"shlwapi-UrlCombine\", \"Sebastian Lackner\", \"Workaround for broken implementation of shlwapi url functions.\" },"; \ + echo '+ { "shlwapi-UrlCombine", "Sebastian Lackner", "Workaround for broken implementation of shlwapi url functions." },'; \ ) > shlwapi-UrlCombine.ok # Patchset strmbase-Lock_Race_Conditions @@ -404,7 +404,7 @@ strmbase-Lock_Race_Conditions.ok: $(PATCH) < strmbase-Lock_Race_Conditions/0005-quartz-Fix-race-condition-on-EndFlush-between-csRend.patch $(PATCH) < strmbase-Lock_Race_Conditions/0006-quartz-Fix-race-condition-between-EndOfStream-and-Pa.patch ( \ - echo "+ { \"strmbase-Lock_Race_Conditions\", \"Erich E. Hoover\", \"Fix possible race conditions in strmbase/quartz.\" },"; \ + echo '+ { "strmbase-Lock_Race_Conditions", "Erich E. Hoover", "Fix possible race conditions in strmbase/quartz." },'; \ ) > strmbase-Lock_Race_Conditions.ok # Patchset wineboot-HKEY_DYN_DATA @@ -422,7 +422,7 @@ strmbase-Lock_Race_Conditions.ok: wineboot-HKEY_DYN_DATA.ok: $(PATCH) < wineboot-HKEY_DYN_DATA/0001-wineboot-Add-some-generic-hardware-in-HKEY_DYN_DATA-.patch ( \ - echo "+ { \"wineboot-HKEY_DYN_DATA\", \"Michael Müller\", \"Add some generic hardware in HKEY_DYN_DATA\Config Manager\Enum.\" },"; \ + echo '+ { "wineboot-HKEY_DYN_DATA", "Michael Müller", "Add some generic hardware in HKEY_DYN_DATA\\\\Config Manager\\\\Enum." },'; \ ) > wineboot-HKEY_DYN_DATA.ok # Patchset winepulse-PulseAudio_Support @@ -464,7 +464,7 @@ winepulse-PulseAudio_Support.ok: $(PATCH) < winepulse-PulseAudio_Support/0026-winepulse-add-support-for-IMarshal.patch $(PATCH) < winepulse-PulseAudio_Support/0027-winepulse-handle-stream-create-failing-correctly.patch ( \ - echo "+ { \"winepulse-PulseAudio_Support\", \"Maarten Lankhorst\", \"Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.22-0ubuntu1.debian.tar.gz. [rev 4]\" },"; \ + echo '+ { "winepulse-PulseAudio_Support", "Maarten Lankhorst", "Winepulse patches extracted from https://launchpad.net/~ubuntu-wine/+archive/ubuntu/ppa/+files/wine1.7_1.7.22-0ubuntu1.debian.tar.gz. [rev 4]" },'; \ ) > winepulse-PulseAudio_Support.ok # Patchset winex11-XEMBED @@ -480,8 +480,8 @@ winex11-XEMBED.ok: $(PATCH) < winex11-XEMBED/0001-winex11-Update-gl_drawable-for-embedded-windows.patch $(PATCH) < winex11-XEMBED/0002-winex11-Enable-disable-windows-when-they-are-un-mapped.patch ( \ - echo "+ { \"winex11-XEMBED\", \"Sebastian Lackner\", \"Enable/disable windows when they are (un)mapped by foreign applications.\" },"; \ - echo "+ { \"winex11-XEMBED\", \"Sebastian Lackner\", \"Update gl_drawable for embedded windows.\" },"; \ + echo '+ { "winex11-XEMBED", "Sebastian Lackner", "Enable/disable windows when they are (un)mapped by foreign applications." },'; \ + echo '+ { "winex11-XEMBED", "Sebastian Lackner", "Update gl_drawable for embedded windows." },'; \ ) > winex11-XEMBED.ok # Patchset ws2_32-TransmitFile @@ -503,7 +503,7 @@ ws2_32-TransmitFile.ok: $(PATCH) < ws2_32-TransmitFile/0004-ws2_32-Add-asynchronous-support-for-TransmitFile.patch $(PATCH) < ws2_32-TransmitFile/0005-ws2_32-Add-support-for-TF_DISCONNECT-and-TF_REUSE_SO.patch ( \ - echo "+ { \"ws2_32-TransmitFile\", \"Erich E. Hoover\", \"Implement TransmitFile.\" },"; \ + echo '+ { "ws2_32-TransmitFile", "Erich E. Hoover", "Implement TransmitFile." },'; \ ) > ws2_32-TransmitFile.ok # Patchset wtsapi32-EnumerateProcesses @@ -521,6 +521,6 @@ ws2_32-TransmitFile.ok: wtsapi32-EnumerateProcesses.ok: $(PATCH) < wtsapi32-EnumerateProcesses/0001-wtsapi32-Partial-implementation-of-WTSEnumerateProce.patch ( \ - echo "+ { \"wtsapi32-EnumerateProcesses\", \"Sebastian Lackner\", \"Partial implementation of WTSEnumerateProcessesW.\" },"; \ + echo '+ { "wtsapi32-EnumerateProcesses", "Sebastian Lackner", "Partial implementation of WTSEnumerateProcessesW." },'; \ ) > wtsapi32-EnumerateProcesses.ok