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

Proposed by kroq-gar78 on 2012-06-02
Status: Merged
Merged at revision: 11
Proposed branch: lp:~kroq-gar78/ubuntu/quantal/vorbis-tools/vorbistagedit-fixes
Merge into: lp:ubuntu/quantal/vorbis-tools
Diff against target: 83 lines (+26/-6)
3 files modified
debian/changelog (+10/-0)
debian/extra/vorbistagedit (+11/-3)
debian/extra/vorbistagedit.1 (+5/-3)
To merge this branch: bzr merge lp:~kroq-gar78/ubuntu/quantal/vorbis-tools/vorbistagedit-fixes
Reviewer Review Type Date Requested Status
Ubuntu branches 2012-06-02 Pending
Review via email: mp+108463@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Sebastien Bacher (seb128) wrote :

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) wrote :

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

kroq-gar78 (kroq-gar78) wrote :

Ok, I'll forward it

St├ęphane Graber (stgraber) wrote :

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.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2012-03-15 17:46:57 +0000
3+++ debian/changelog 2012-06-02 17:50:24 +0000
4@@ -1,3 +1,13 @@
5+vorbis-tools (1.4.0-1ubuntu3) quantal; urgency=low
6+
7+ * debian/extra/vorbistagedit:
8+ - allow support for .oga, .ogv, .ogx, and .spx files (LP: #313529)
9+ - make '-v' option show version (LP: #1005273)
10+ - show usage and exit with code 1 if no arguments given (LP: #1005278)
11+ * debian/extra/vorbistagedit: add information about OGG extensions
12+
13+ -- Aditya Vaidya <kroq.gar78@gmail.com> Sun, 27 May 2012 15:45:45 -0500
14+
15 vorbis-tools (1.4.0-1ubuntu2) precise; urgency=low
16
17 * debian/patches/fix_xiph_url.diff:
18
19=== modified file 'debian/extra/vorbistagedit'
20--- debian/extra/vorbistagedit 2010-04-05 14:05:24 +0000
21+++ debian/extra/vorbistagedit 2012-06-02 17:50:24 +0000
22@@ -19,12 +19,19 @@
23 usage() {
24 versioninfo
25 echo
26- echo Usage: $ME file1.ogg [file2.ogg [file3.ogg ...]] >&2
27- echo
28+ echo Usage: $ME file1 [file2 [file3 ...]] >&2
29+ echo .oga, .ogg, .ogv, .ogx, and .spx are the >&2
30+ echo supported file extensions >&2
31+ echo
32 echo If no filenames are given, the list of filenames >&2
33 echo is read from stdin, one per line. >&2
34 }
35
36+if [ $# -eq 0 ]; then
37+ usage
38+ exit 1
39+fi
40+
41 for opt in $(getopt -n $ME -l version,help -o Vh? -- $@); do
42 case $opt in
43 --version|-V)
44@@ -36,6 +43,7 @@
45 --) :;;
46 -*)
47 echo "E: $ME: invalid argument: $opt" >&2
48+ usage
49 exit 1;;
50 *) :;;
51 esac
52@@ -76,7 +84,7 @@
53
54 for i in "$@"; do
55 case "$i" in
56- *.ogg)
57+ *.ogg|*.oga|*.ogv|*.ogx|*.spx)
58 if [ ! -r "$i" ]; then
59 echo "E: $ME: unreadable file: $i" >&2
60 exit 2
61
62=== modified file 'debian/extra/vorbistagedit.1'
63--- debian/extra/vorbistagedit.1 2007-06-06 19:01:31 +0000
64+++ debian/extra/vorbistagedit.1 2012-06-02 17:50:24 +0000
65@@ -5,8 +5,8 @@
66
67 .SH "SYNOPSIS"
68 .B vorbistagedit
69-.I file1.ogg
70-.BI [ \|file2.ogg \ \|[ \|file3.ogg\ ... \|] \| ]
71+.I file1
72+.BI [ \|file2 \ \|[ \|file3\ ... \|] \| ]
73 .PP
74 .B vorbistagedit
75 .BR [ \|--version | \-V | \-v\| ]
76@@ -23,7 +23,9 @@
77 allows batch editing of vorbis comments with an editor.\ If more than one OGG
78 Vorbis file is specified,
79 .B vorbistagedit
80-opens a unique editor for all files given.
81+opens a unique editor for all files given. The supported file extensions for
82+.B vorbistagedit
83+are .oga, .ogg, .ogv, .ogx, and .spx.
84
85
86

Subscribers

People subscribed via source and target branches

to all changes: