diff --git a/0001-Fixed-Makefile.patch b/0001-Fixed-Makefile.patch index 0a8d7c3..7342560 100644 --- a/0001-Fixed-Makefile.patch +++ b/0001-Fixed-Makefile.patch @@ -1,7 +1,7 @@ From 8b32b8b088be1f29e8bfea57a97b9bfaa76ec8ee Mon Sep 17 00:00:00 2001 From: Chris Wong Date: Wed, 23 Nov 2011 10:39:53 +1300 -Subject: [PATCH 1/6] Fixed Makefile +Subject: [PATCH] Fixed Makefile * Use /usr/share/man (see http://www.pathname.com/fhs/2.2/fhs-4.11.html#4.11.5) @@ -41,5 +41,5 @@ index cc359c4..0f4f810 100644 # rm -f /usr/man/man1/beep.1.bz2 cp ${MAN_FILE} ${MAN_DIR} -- -1.8.4.2 +2.7.5 diff --git a/0002-Add-more-error-detection.patch b/0002-Add-more-error-detection.patch index a4f0ca3..6a229e0 100644 --- a/0002-Add-more-error-detection.patch +++ b/0002-Add-more-error-detection.patch @@ -1,7 +1,7 @@ From d3aee6c489852108c91dc22abcacff364e9429f2 Mon Sep 17 00:00:00 2001 From: Chris Wong Date: Wed, 23 Nov 2011 11:34:55 +1300 -Subject: [PATCH 2/6] Add more error detection +Subject: [PATCH] Add more error detection --- beep.c | 15 +++++++++------ @@ -41,5 +41,5 @@ index 452fc08..14fac3e 100644 } -- -1.8.4.2 +2.7.5 diff --git a/0004-also-catch-SIGTERM-for-stopping-the-beep.patch b/0004-also-catch-SIGTERM-for-stopping-the-beep.patch index 89187b9..8574b32 100644 --- a/0004-also-catch-SIGTERM-for-stopping-the-beep.patch +++ b/0004-also-catch-SIGTERM-for-stopping-the-beep.patch @@ -1,7 +1,7 @@ From e1320c1da52ca92aa68b4224f9532982184fbe00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me?= Date: Thu, 7 Feb 2013 12:54:53 +0100 -Subject: [PATCH 4/6] also catch SIGTERM for stopping the beep +Subject: [PATCH] also catch SIGTERM for stopping the beep Signed-off-by: Gerfried Fuchs --- @@ -29,5 +29,5 @@ index 452fc08..9cb63bf 100644 /* this outermost while loop handles the possibility that -n/--new has been -- -1.8.4.2 +2.7.5 diff --git a/0005-Make-build-install-more-user-and-packaging-friendly.patch b/0005-Make-build-install-more-user-and-packaging-friendly.patch index b6a84e4..9e2b481 100644 --- a/0005-Make-build-install-more-user-and-packaging-friendly.patch +++ b/0005-Make-build-install-more-user-and-packaging-friendly.patch @@ -1,7 +1,7 @@ From 947a7e332908dcba1c7e523fbdc927d39ee6adb1 Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Tue, 19 Nov 2013 23:40:50 +0100 -Subject: [PATCH 5/6] Make build/install more user and packaging friendly +Subject: [PATCH] Make build/install more user and packaging friendly Make the build and install more user and packaging friendly by introducing the following features in the Makefile: @@ -81,5 +81,5 @@ index 0f4f810..942a7a5 100644 + rm -f $(DESTDIR)$(bindir)/$(EXEC_NAME) + rm -f $(DESTDIR)$(man1dir)/$(MAN_FILE) -- -1.8.4.2 +2.7.5 diff --git a/0006-Preserve-file-modification-time-on-install.patch b/0006-Preserve-file-modification-time-on-install.patch index 4db0272..8a32405 100644 --- a/0006-Preserve-file-modification-time-on-install.patch +++ b/0006-Preserve-file-modification-time-on-install.patch @@ -1,7 +1,7 @@ From 4622dd15dc12dab47a0381a8a7188f0f0421e01d Mon Sep 17 00:00:00 2001 From: Hans Ulrich Niedermann Date: Wed, 20 Nov 2013 00:00:54 +0100 -Subject: [PATCH 6/6] Preserve file modification time on install +Subject: [PATCH] Preserve file modification time on install Add -p option to install(1) invocation in order to preserve the timestamps of the files being installed. @@ -29,5 +29,5 @@ index 942a7a5..290b8a4 100644 uninstall: rm -f $(DESTDIR)$(bindir)/$(EXEC_NAME) -- -1.8.4.2 +2.7.5 diff --git a/0007-Fix-indentation-if-brace-error.patch b/0007-Fix-indentation-if-brace-error.patch index 00f485d..b318247 100644 --- a/0007-Fix-indentation-if-brace-error.patch +++ b/0007-Fix-indentation-if-brace-error.patch @@ -1,24 +1,26 @@ -commit 07a33095b0c057373bce5f5bf66eb8c4d1c45c91 -Author: Hans Ulrich Niedermann -Date: Sat Jun 4 04:17:57 2016 +0200 +From 35ba84dccb8fc8dc43cb3f575904a33ffa27e7b7 Mon Sep 17 00:00:00 2001 +From: Hans Ulrich Niedermann +Date: Tue, 3 Apr 2018 19:11:07 +0200 +Subject: [PATCH] Fix indentation/if brace error - Fix indentation/if brace error - - As beep.c is not Python, the code blocks must be defined by - using braces instead of just indenting them differently. - - Once we do that, the outcome of multiple -f parameters will - actually match what the warning message documents beep does: - Only the last -f value will be used. - - Many projects proscribe using braces everywhere, but this - change keeps the beep.c coding style of using braces only - when absolutely necessary. - - This issue was discovered by compiling with gcc 6. +As beep.c is not Python, the code blocks must be defined by +using braces instead of just indenting them differently. + +Once we do that, the outcome of multiple -f parameters will +actually match what the warning message documents beep does: +Only the last -f value will be used. + +Many projects proscribe using braces everywhere, but this +change keeps the beep.c coding style of using braces only +when absolutely necessary. + +This issue was discovered by compiling with gcc 6. +--- + beep.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/beep.c b/beep.c -index 7da2e70..250be56 100644 +index 7da2e70..d46adc8 100644 --- a/beep.c +++ b/beep.c @@ -194,11 +194,12 @@ void parse_command_line(int argc, char **argv, beep_parms_t *result) { @@ -30,9 +32,11 @@ index 7da2e70..250be56 100644 if (result->freq != 0) fprintf(stderr, "WARNING: multiple -f values given, only last " "one is used.\n"); -- result->freq = argfreq; -+ result->freq = argfreq; + result->freq = argfreq; + } break; case 'l' : /* length */ if(!sscanf(optarg, "%d", &argval) || (argval < 0)) +-- +2.7.5 +