[SCM] cmus/master: Dropped 01_spelling_mistakes.diff; applied upstream

ryanakca-guest at users.alioth.debian.org ryanakca-guest at users.alioth.debian.org
Fri Feb 18 18:19:07 UTC 2011


The following commit has been merged in the master branch:
commit 266e8653725fa241dec140d1249a20781fe8a219
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Tue Feb 15 15:10:38 2011 -0500

    Dropped 01_spelling_mistakes.diff; applied upstream

diff --git a/debian/patches/01_spelling_mistakes.diff b/debian/patches/01_spelling_mistakes.diff
deleted file mode 100644
index 7759eed..0000000
--- a/debian/patches/01_spelling_mistakes.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-# 01_spelling_mistakes.diff by Ryan Kavanagh <ryanakca at kubuntu.org>
-# Description: Fix spelling mistakes in binary and documentation
-Index: cmus/Doc/cmus.txt
-===================================================================
---- cmus.orig/Doc/cmus.txt	2010-06-20 15:33:00.141293422 -0400
-+++ cmus/Doc/cmus.txt	2010-06-20 15:34:36.349293541 -0400
-@@ -454,7 +454,7 @@
- 
- player-play [filename] (*x*)
- 	Play the given track, or, if none is specified, [re]play the current
--	track from the begining.
-+	track from the beginning.
- 
- player-prev (*z*)
- 	Skip to the previous track.
-Index: cmus/expr.c
-===================================================================
---- cmus.orig/expr.c	2010-06-20 15:34:39.809293382 -0400
-+++ cmus/expr.c	2010-06-20 15:34:47.837295079 -0400
-@@ -462,14 +462,14 @@
- 	}
- 	if (expr->type != EXPR_BOOL) {
- 		/* unknown key */
--		set_error("unkown key %s", expr->key);
-+		set_error("unknown key %s", expr->key);
- 		return -1;
- 	}
- 
- 	/* user defined filter */
- 	filter = get_filter(expr->key);
- 	if (filter == NULL) {
--		set_error("unkown filter or boolean %s", expr->key);
-+		set_error("unknown filter or boolean %s", expr->key);
- 		return -1;
- 	}
- 	e = expr_parse(filter);
diff --git a/debian/patches/series b/debian/patches/series
index 074df25..8b1a296 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-01_spelling_mistakes.diff
 02_cmus-tutorial_whatis.diff
 03-terminal_corruption.patch
 10-roaraudio_support.patch

-- 
cmus packaging



More information about the pkg-multimedia-commits mailing list