[SCM] terminatorx/master: Drop 26-spelling_mistakes.patch - applied upstream

jcowgill at users.alioth.debian.org jcowgill at users.alioth.debian.org
Tue Aug 2 20:36:32 UTC 2016


The following commit has been merged in the master branch:
commit 1bb457bee0a144be7833a5180f73862516b3e84c
Author: James Cowgill <jcowgill at debian.org>
Date:   Thu Jul 28 20:55:15 2016 +0100

    Drop 26-spelling_mistakes.patch - applied upstream

diff --git a/debian/patches/26-spelling_mistakes.patch b/debian/patches/26-spelling_mistakes.patch
deleted file mode 100644
index 111f5e6..0000000
--- a/debian/patches/26-spelling_mistakes.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-Description: Fix minor misspellings.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: https://lisas.de/bugzilla/show_bug.cgi?id=34
----
- src/main.cc           |    2 +-
- src/tX_audiodevice.cc |    4 ++--
- src/tX_dialog.cc      |    2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- terminatorx.orig/src/main.cc
-+++ terminatorx/src/main.cc
-@@ -181,7 +181,7 @@ int main(int argc, char **argv)
- #ifdef USE_CAPABILITIES	
- 	if (!geteuid()) {
- 		if (prctl(PR_SET_KEEPCAPS, 1, -1, -1, -1)) {
--			tX_error("failed to keep capabilites.");
-+			tX_error("failed to keep capabilities.");
- 		}
- 		set_nice_capability(CAP_PERMITTED);
- 	}
---- terminatorx.orig/src/tX_dialog.cc
-+++ terminatorx/src/tX_dialog.cc
-@@ -657,7 +657,7 @@ void show_about(int nag)
- 				break;
- 			
- 			default:
--				sprintf(prio_str, "UNKOWN (%i)", policy);
-+				sprintf(prio_str, "UNKNOWN (%i)", policy);
- 		}
- 		
- 		sprintf(buffer, "Audio engine scheduling policy: %s.\nScheduling with realtime priority is %s.", prio_str, s_enabled ? "enabled" : "disabled");
---- terminatorx.orig/src/tX_audiodevice.cc
-+++ terminatorx/src/tX_audiodevice.cc
-@@ -272,7 +272,7 @@ int tX_audiodevice_alsa :: open()
- 	long unsigned int buffer_size;
- 
- 	if (snd_pcm_hw_params_get_buffer_size(hw_params, &buffer_size) < 0) {
--		tX_error("ALSA: failed to retreive buffer size");
-+		tX_error("ALSA: failed to retrieve buffer size");
- 		return -1;
- 	}
- 	
-@@ -284,7 +284,7 @@ int tX_audiodevice_alsa :: open()
- 	}
- 	
- 	if (snd_pcm_hw_params_get_period_size(hw_params, &period_size, &dir)<0) {
--		tX_error("ALSA: failed to retreive period size");
-+		tX_error("ALSA: failed to retrieve period size");
- 		return -1;
- 	}
- 	
diff --git a/debian/patches/series b/debian/patches/series
index 86077f8..e2cd8d8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 17_cleanup_desktop_file.patch
 22_manual.patch
 25-libdl_underlinkage.patch
-26-spelling_mistakes.patch
 27-kfreebsd.patch

-- 
terminatorx packaging



More information about the pkg-multimedia-commits mailing list