[Pkg-opt-media-team] [SCM] cdparanoia packaging branch, master, updated. debian/3.10.2+debian-9-12-g0aee613
Rogério Brito
rbrito at ime.usp.br
Sat Nov 6 16:11:31 UTC 2010
The following commit has been merged in the master branch:
commit 0aee613075954b167f6b3a0cc5eef741dd8f14e3
Author: Rogério Brito <rbrito at ime.usp.br>
Date: Sat Nov 6 14:10:56 2010 -0200
Update 01-typos-and-spelling.patch with some other spelling errors
diff --git a/debian/patches/01-typos-and-spelling.patch b/debian/patches/01-typos-and-spelling.patch
index 2516eed..8bd15a1 100644
--- a/debian/patches/01-typos-and-spelling.patch
+++ b/debian/patches/01-typos-and-spelling.patch
@@ -3,6 +3,7 @@ Author: Rogério Brito <rbrito at ime.usp.br>
Description: Fixes some typos and spelling mistakes.
Bug-Debian: http://bugs.debian.org/552209
Forwarded: yes
+Last-Updated: 2010-11-06
--- a/cdparanoia.1
+++ b/cdparanoia.1
@@ -397,8 +398,12 @@ Forwarded: yes
"offset is taken to be the start or end of the disc, respectively. Thus:\n\n"
" 1:[20.35] Specifies ripping from track 1, second 20, sector 35 to \n"
-@@ -323,12 +323,15 @@
- "Don't forget to protect square brackets and preceeding hyphens from\n"
+@@ -320,15 +320,18 @@
+ " 2-4 Specifies ripping from the beginning of track two to the\n"
+ " end of track 4.\n\n"
+
+-"Don't forget to protect square brackets and preceeding hyphens from\n"
++"Don't forget to protect square brackets and preceding hyphens from\n"
"the shell...\n\n"
"A few examples, protected from the shell:\n"
+"Don't forget to protect square brackets from the shell...\n\n"
@@ -415,3 +420,21 @@ Forwarded: yes
" C) extract from track 1, time 0:30.12 to 1:10.00:\n"
" cdparanoia \"1[:30.12]-1[1:10]\"\n\n"
+@@ -726,7 +729,7 @@
+ break;
+ case 'g':
+ if(force_cooked_device){
+- report("-g option incompatable with -k\n");
++ report("-g option incompatible with -k\n");
+ exit(1);
+ }
+ force_cooked_device=NULL;
+@@ -735,7 +738,7 @@
+ break;
+ case 'k':
+ if(force_generic_device || force_cdrom_device){
+- report("-k option incompatable with -d and -g\n");
++ report("-k option incompatible with -d and -g\n");
+ exit(1);
+ }
+ if(force_cooked_device)free(force_cooked_device);
--
cdparanoia packaging
More information about the Pkg-opt-media-team
mailing list