r21 - trunk/packages/vorbis-tools/debian/patches

[Adeodato Simó]

Author: adeodato
Date: 2006-01-16 22:23:41 +0000 (Mon, 16 Jan 2006)
New Revision: 21

Modified:
   trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff
   trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff
   trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff
Log:
Refresh patches to match vorbis-tools 1.1.1.


Modified: trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff	2006-01-16 22:13:58 UTC (rev 20)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-encodage_vs_codage_in_fr.po.diff	2006-01-16 22:23:41 UTC (rev 21)
@@ -1,15 +1,15 @@
---- a/po/fr.po
-+++ b/po/fr.po
-@@ -733,7 +733,7 @@
+--- vorbis-tools-1.1.1.orig/po/fr.po
++++ vorbis-tools-1.1.1/po/fr.po
+@@ -771,7 +771,7 @@
  #: oggenc/encode.c:391
  #, fuzzy, c-format
  msgid "\tEncoding [%2dm%.2ds so far] %c "
 -msgstr "\tEncodage [%2dm%.2ds pour l'instant] %c"
 +msgstr "\tCodage [%2dm%.2ds pour l'instant] %c"
  
- #: oggenc/encode.c:377
+ #: oggenc/encode.c:409
  #, c-format
-@@ -791,7 +791,7 @@
+@@ -830,7 +830,7 @@
  "         %s%s%s \n"
  "at average bitrate %d kbps "
  msgstr ""
@@ -18,7 +18,7 @@
  "         en %s%s%s \n"
  "au débit moyen de %d kbps "
  
-@@ -812,7 +812,7 @@
+@@ -851,7 +851,7 @@
  "         %s%s%s \n"
  "at approximate bitrate %d kbps (VBR encoding enabled)\n"
  msgstr ""
@@ -27,7 +27,7 @@
  "         en %s%s%s \n"
  "au débit approximatif de %d kbps (encodage VBR en cours)\n"
  
-@@ -823,7 +823,7 @@
+@@ -862,7 +862,7 @@
  "         %s%s%s \n"
  "at quality level %2.2f using constrained VBR "
  msgstr ""
@@ -36,7 +36,7 @@
  "         en %s%s%s \n"
  "au niveau de qualité %2.2f en utilisant un VBR contraint "
  
-@@ -834,7 +834,7 @@
+@@ -873,7 +873,7 @@
  "         %s%s%s \n"
  "at quality %2.2f\n"
  msgstr ""
@@ -45,7 +45,7 @@
  "         en %s%s%s \n"
  "à la qualité %2.2f\n"
  
-@@ -845,7 +845,7 @@
+@@ -884,7 +884,7 @@
  "         %s%s%s \n"
  "using bitrate management "
  msgstr ""

Modified: trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff	2006-01-16 22:13:58 UTC (rev 20)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-manpage_typos.diff	2006-01-16 22:23:41 UTC (rev 21)
@@ -1,7 +1,7 @@
 * Typos in manpages: Closes: #302150.
---- a/vorbiscomment/vorbiscomment.1
-+++ b/vorbiscomment/vorbiscomment.1
-@@ -55,7 +57,7 @@
+--- vorbis-tools-1.1.1.orig/vorbiscomment/vorbiscomment.1
++++ vorbis-tools-1.1.1/vorbiscomment/vorbiscomment.1
+@@ -57,7 +57,7 @@
  To edit those comments:
  
      vorbiscomment -l file.ogg > file.txt
@@ -10,8 +10,8 @@
      vorbiscomment -w -c file.txt file.ogg newfile.ogg
  
  To simply add a comment:
---- a/oggenc/man/oggenc.1
-+++ b/oggenc/man/oggenc.1
+--- vorbis-tools-1.1.1.orig/oggenc/man/oggenc.1
++++ vorbis-tools-1.1.1/oggenc/man/oggenc.1
 @@ -319,7 +319,7 @@
  .RS
  oggenc somefile.wav -t "The track title" -a "artist who performed this" -l

Modified: trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff
===================================================================
--- trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff	2006-01-16 22:13:58 UTC (rev 20)
+++ trunk/packages/vorbis-tools/debian/patches/for_upstream-oggenc_inputfile_vs_input.wav.diff	2006-01-16 22:23:41 UTC (rev 21)
@@ -1,8 +1,8 @@
 * Change input.wav with inputfile, since we accept flac-formated files.
   Closes: #262509.
---- a/oggenc/oggenc.c
-+++ b/oggenc/oggenc.c
-@@ -375,7 +375,7 @@
+--- vorbis-tools-1.1.1.orig/oggenc/oggenc.c
++++ vorbis-tools-1.1.1/oggenc/oggenc.c
+@@ -379,7 +379,7 @@
  {
  	fprintf(stdout, 
  		_("%s%s\n"