Bug#780605: unblock: abcde/2.6-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
[ Back from VAC! ]
Please unblock package abcde
We're stuck with version mismatches with eyeD3 - the current upstream
only supports a newer version than the one in Jessie. The NMUd fix for
#772778 in 2.6-1.1 was helpful, but incomplete. Another bug was filed
(#776908) which is another symptom of the same issue (inability to tag
MP3 files). I've just realised as I've got back that this bug didn't
have the right severity. I've just raised it to serious now.
I've backported the simple changes from the latest upstream code which
detects the version of eyeD3 and uses the appropriate syntax now, and
I uploaded this weeks ago as 2.6-2. It would be lovely if this version
would be allowed into Jessie. Debdiff attached.
unblock abcde/2.6-2
-- System Information:
Debian Release: 7.8
APT prefers stable
APT policy: (500, 'stable'), (500, 'oldstable')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u abcde-2.6/abcde abcde-2.6/abcde
--- abcde-2.6/abcde
+++ abcde-2.6/abcde
@@ -822,21 +822,27 @@
case "$ID3SYNTAX" in
id3);;
- eyed3)
+ eyed3*)
# FIXME # track numbers in mp3 come with 1/10, so we cannot
# happily substitute them with $TRACKNUM
- # FIXME as well! # Older versions of eyeD3 (< 0.7.0) expect
- # --set-encoding and --set-text-frame so perhaps some version
- # sniffing would be useful. Might also be better to simply cut
- # ties with the older eyeD3... Andrew.
- # eyeD3 --comment syntax is also different in < and >= 0.7.0
+ case "$ID3SYNTAX" in
+ eyed3_06) addopts=( \
+ ${ENCODING:+--set-encoding="$ENCODING"} \
+ ${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
+ ${COMMENTOUTPUT:+--comment=::"$COMMENTOUTPUT"} \
+ );;
+ *) addopts=( \
+ ${ENCODING:+--encoding="$ENCODING"} \
+ ${TPE2:+--text-frame=TPE2:"$TPE2"} \
+ ${COMMENTOUTPUT:+--comment "$COMMENTOUTPUT"} \
+ );;
+ esac
run_command tagtrack-$OUTPUT-$1 nice $ENCNICE $TAGGER $TAGGEROPTS \
- --comment="$COMMENTOUTPUT" -A "$DALBUM" \
+ -A "$DALBUM" \
-a "$TRACKARTIST" -t "$TRACKNAME" ${CDYEAR:+-Y "$CDYEAR"} \
-G "$GENREID" -n "${TRACKNUM:-$1}" \
+ "${addopts[@]}" \
${TRACKNUM:+-N "$TRACKS"} \
- ${ENCODING:+--set-encoding="$ENCODING"} \
- ${TPE2:+--set-text-frame=TPE2:"$TPE2"} \
"$ABCDETEMPDIR/track$1.$OUTPUT"
;;
# FIXME # Still not activated...
@@ -3321,10 +3327,7 @@
AACENCOPTS=
ID3OPTS=
-# FIXME # Older versions of eyeD3 (< 0.7.0) expect --set-encoding=utf16-LE
-# so perhaps some version sniffing would be useful. Or perhaps it might be
-# better to simply cut ties with the older eyeD3... Andrew.
-EYED3OPTS="--set-encoding utf16"
+EYED3OPTS=""
CDPARANOIAOPTS=
CDDA2WAVOPTS=
DAGRABOPTS=
@@ -3954,8 +3957,16 @@
TAGGEROPTS="$ID3OPTS"
else
TAGGER="$EYED3"
- TAGGEROPTS="$EYED3OPTS"
- ID3SYNTAX=eyed3
+ # 0.7 changed syntax
+ if $EYED3 --help 2>&1 | grep -q -- --set-encoding ; then
+ # only if it offers the --set-encoding, assume <= 0.6.x
+ ID3SYNTAX=eyed3_06
+ TAGGEROPTS="--set-encoding utf16-LE $EYED3OPTS"
+ else
+ # anything wrong, any failure, assume >= 0.7
+ ID3SYNTAX=eyed3
+ TAGGEROPTS="--encoding utf16 $EYED3OPTS"
+ fi
fi
# NOGAP is specific to lame. Other encoders fail ...
diff -u abcde-2.6/debian/changelog abcde-2.6/debian/changelog
--- abcde-2.6/debian/changelog
+++ abcde-2.6/debian/changelog
@@ -1,3 +1,13 @@
+abcde (2.6-2) unstable; urgency=medium
+
+ * Thanks to Andreas/Samuel for the previous upload attempting to fix
+ eyeD3 support, but it still seems buggy. :-(
+ * Instead, merge the upstream change that auto-detects the
+ version/syntax of eyeD3 on the system and uses the right set of
+ options. Closes: #776908
+
+ -- Steve McIntyre <93sam@debian.org> Tue, 17 Feb 2015 23:36:34 +0930
+
abcde (2.6-1.1) unstable; urgency=medium
* Non-maintainer upload.
Reply to: