From 802ebcbb917f4fd611662cce43b46406aa9487bf Mon Sep 17 00:00:00 2001 From: "Erich E. Hoover" Date: Fri, 25 Jul 2014 18:34:36 -0600 Subject: [PATCH] Move 00-Commandline to loader-Cmdline_Diagnostics. --- patches/Makefile | 40 +++++++++---------- ...ndline-option-patches-to-show-the-pa.patch | 0 ...er-Add-commandline-option-check-libs.patch | 0 .../definition | 0 4 files changed, 20 insertions(+), 20 deletions(-) rename patches/{00-Commandline => loader-Cmdline_Diagnostics}/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch (100%) rename patches/{00-Commandline => loader-Cmdline_Diagnostics}/0002-loader-Add-commandline-option-check-libs.patch (100%) rename patches/{00-Commandline => loader-Cmdline_Diagnostics}/definition (100%) diff --git a/patches/Makefile b/patches/Makefile index b6005d8b..7657d112 100644 --- a/patches/Makefile +++ b/patches/Makefile @@ -5,8 +5,7 @@ CURDIR ?= ${.CURDIR} PATCH := $(CURDIR)/../debian/tools/gitapply.sh -d $(DESTDIR) -PATCHLIST := 00-Commandline.ok \ - 04-XEMBED.ok \ +PATCHLIST := 04-XEMBED.ok \ 05-Named_Pipe.ok \ 06-winepulse.ok \ 07-GetVolumePathName.ok \ @@ -23,6 +22,7 @@ PATCHLIST := 00-Commandline.ok \ 19-ntdll-Dynamic_DST.ok \ 97-Pipelight.ok \ 98-Miscellaneous.ok \ + loader-Cmdline_Diagnostics.ok \ server-ACL_Compat.ok \ server-Address_Change_Notification.ok \ server-Inherited_ACLs.ok \ @@ -48,24 +48,6 @@ clean: .NOTPARALLEL: -# Patchset 00-Commandline -# | -# | Included patches: -# | * Add commandline option --patches to show the patch list. [by Sebastian Lackner] -# | * Add commandline option --check-libs to test if shared libraries are installed. [by Michael Müller] -# | -# | Modified files: -# | * dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec, include/wine/library.h, libs/wine/config.c, libs/wine/loader.c, -# | libs/wine/wine.def, libs/wine/wine.map, loader/main.c -# | -00-Commandline.ok: - $(PATCH) < 00-Commandline/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch - $(PATCH) < 00-Commandline/0002-loader-Add-commandline-option-check-libs.patch - ( \ - echo "+ { \"00-Commandline\", \"Sebastian Lackner\", \"Add commandline option --patches to show the patch list.\" },"; \ - echo "+ { \"00-Commandline\", \"Michael Müller\", \"Add commandline option --check-libs to test if shared libraries are installed.\" },"; \ - ) > 00-Commandline.ok - # Patchset 04-XEMBED # | # | Included patches: @@ -414,6 +396,24 @@ clean: echo "+ { \"98-Miscellaneous\", \"Sebastian Lackner\", \"wined3d: Silence repeated wined3d_swapchain_present FIXME.\" },"; \ ) > 98-Miscellaneous.ok +# Patchset loader-Cmdline_Diagnostics +# | +# | Included patches: +# | * Add commandline option --patches to show the patch list. [by Sebastian Lackner] +# | * Add commandline option --check-libs to test if shared libraries are installed. [by Michael Müller] +# | +# | Modified files: +# | * dlls/ntdll/misc.c, dlls/ntdll/ntdll.spec, include/wine/library.h, libs/wine/config.c, libs/wine/loader.c, +# | libs/wine/wine.def, libs/wine/wine.map, loader/main.c +# | +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.\" },"; \ + ) > loader-Cmdline_Diagnostics.ok + # Patchset server-ACL_Compat # | # | Included patches: diff --git a/patches/00-Commandline/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch b/patches/loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch similarity index 100% rename from patches/00-Commandline/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch rename to patches/loader-Cmdline_Diagnostics/0001-loader-Add-commandline-option-patches-to-show-the-pa.patch diff --git a/patches/00-Commandline/0002-loader-Add-commandline-option-check-libs.patch b/patches/loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch similarity index 100% rename from patches/00-Commandline/0002-loader-Add-commandline-option-check-libs.patch rename to patches/loader-Cmdline_Diagnostics/0002-loader-Add-commandline-option-check-libs.patch diff --git a/patches/00-Commandline/definition b/patches/loader-Cmdline_Diagnostics/definition similarity index 100% rename from patches/00-Commandline/definition rename to patches/loader-Cmdline_Diagnostics/definition