Merge lp:~kroq-gar78/ubuntu/quantal/vorbis-tools/vorbistagedit-fixes into lp:ubuntu/quantal/vorbis-tools

[Aditya V]

This merge request will fix three bugs in 'vorbistagedit': 1. allow support for .oga, .ogv, .ogx, and .spx files, 2. make '-v' option show version (as it says in --help), and 3. show usage and exit with code 1 if no arguments given

[Sebastien Bacher (seb128)]

Thank you for your bug report, is there any chance you could sent those changes back to upstream and Debian? They don't seem Ubuntu specific

[Sebastien Bacher (seb128)]

hey, do you think you could send that work to Debian as well?

[Aditya V (kroq-gar78)]

Ok, I'll forward it

[Stéphane Graber (stgraber)]

I merged your branch and uploaded it but as mentioned before, these changes really belong in Debian so I'd at like to see bugs opened on their BTS for these: http://bugs.debian.org/cgi-bin/pkgreport.cgi?repeatmerged=no&src=vorbis-tools

The rational for applying the changes in Ubuntu anyway is that the Debian maintainer doesn't seem too reactive (last upload in 2010) and we're already carrying a delta, but I'd like to see that delta gona with the next Debian upload.

I added a Debian task to all of your bugs. Please forward the patches to the Debian BTS, then link the LP bugs with the Debian BTS.

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-15 17:46:57 +0000
+++ debian/changelog	2012-06-02 17:50:24 +0000
@@ -1,3 +1,13 @@
+vorbis-tools (1.4.0-1ubuntu3) quantal; urgency=low
+
+  * debian/extra/vorbistagedit:
+    - allow support for .oga, .ogv, .ogx, and .spx files (LP: #313529)
+    - make '-v' option show version (LP: #1005273)
+    - show usage and exit with code 1 if no arguments given (LP: #1005278)
+  * debian/extra/vorbistagedit: add information about OGG extensions
+
+ -- Aditya Vaidya <[e-mail]>  Sun, 27 May 2012 15:45:45 -0500
+
 vorbis-tools (1.4.0-1ubuntu2) precise; urgency=low
 
   * debian/patches/fix_xiph_url.diff:
 
=== modified file 'debian/extra/vorbistagedit'
--- debian/extra/vorbistagedit	2010-04-05 14:05:24 +0000
+++ debian/extra/vorbistagedit	2012-06-02 17:50:24 +0000
@@ -19,12 +19,19 @@
 usage() {
   versioninfo
   echo
-  echo Usage: $ME file1.ogg [file2.ogg [file3.ogg ...]] >&2
-  echo
+  echo Usage: $ME file1 [file2 [file3 ...]] >&2
+  echo .oga, .ogg, .ogv, .ogx, and .spx are the >&2
+  echo supported file extensions >&2
+  echo 
   echo If no filenames are given, the list of filenames >&2
   echo is read from stdin, one per line. >&2
 }
 
+if [ $# -eq 0 ]; then
+  usage
+  exit 1
+fi
+
 for opt in $(getopt -n $ME -l version,help -o Vh? -- $@); do
   case $opt in
     --version|-V)
@@ -36,6 +43,7 @@
     --) :;;
     -*)
       echo "E: $ME: invalid argument: $opt" >&2
+      usage
       exit 1;;
     *) :;;
   esac
@@ -76,7 +84,7 @@
 
 for i in "$@"; do
   case "$i" in
-    *.ogg)
+    *.ogg|*.oga|*.ogv|*.ogx|*.spx)
       if [ ! -r "$i" ]; then
         echo "E: $ME: unreadable file: $i" >&2
         exit 2
 
=== modified file 'debian/extra/vorbistagedit.1'
--- debian/extra/vorbistagedit.1	2007-06-06 19:01:31 +0000
+++ debian/extra/vorbistagedit.1	2012-06-02 17:50:24 +0000
@@ -5,8 +5,8 @@
 
 .SH "SYNOPSIS"
 .B vorbistagedit
-.I file1.ogg 
-.BI [ \|file2.ogg \ \|[ \|file3.ogg\ ... \|] \| ]
+.I file1 
+.BI [ \|file2 \ \|[ \|file3\ ... \|] \| ]
 .PP
 .B vorbistagedit
 .BR [ \|--version | \-V | \-v\| ]
@@ -23,7 +23,9 @@
 allows batch editing of vorbis comments with an editor.\ If more than one OGG
 Vorbis file is specified,
 .B vorbistagedit
-opens a unique editor for all files given. 
+opens a unique editor for all files given. The supported file extensions for
+.B vorbistagedit
+are .oga, .ogg, .ogv, .ogx, and .spx.