diff options
| author |  Benjamin Barenblat <bbaren@mit.edu> | 2015-01-19 20:03:56 -0500 |
|---|---|---|
| committer | Benjamin Barenblat <bbaren@mit.edu> | 2015-01-20 15:40:29 -0500 |
| commit | 6ed96fadd13e68c13b198d79c570d1a566b8d89a (patch) | |
| tree | ec349893e9bb725ec774a2efbfef4e585da1e3b8 | |
| parent | ff29fe0514e4aa09d6d72a2cc7470bbfdc5e3886 (diff) | |
Spell ‘psychedelic’ correctly
| -rw-r--r-- | debian/deadbeef.lintian-overrides | 1 | ||||
| -rw-r--r-- | debian/patches/junklib-spelling-psychedelic.diff | 41 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 43 insertions, 0 deletions
diff --git a/debian/deadbeef.lintian-overrides b/debian/deadbeef.lintian-overrides new file mode 100644 index 00000000..818f8299 --- /dev/null +++ b/debian/deadbeef.lintian-overrides @@ -0,0 +1 @@ +deadbeef: spelling-error-in-binary usr/bin/deadbeef Psychadelic Psychedelic diff --git a/debian/patches/junklib-spelling-psychedelic.diff b/debian/patches/junklib-spelling-psychedelic.diff new file mode 100644 index 00000000..817ffa6c --- /dev/null +++ b/debian/patches/junklib-spelling-psychedelic.diff @@ -0,0 +1,41 @@ +From: Alexey Yakovenko <wakeroid@gmail.com> +Description: junklib: use Psychedelic instead of Psychadelic + The ID3v1 standard misspells ‘psychedelic’ as ‘psychadelic’. This patch hides + this from the user; it will replace ‘psychadelic’ with ‘psychedelic’ when + reading, and it will write both as 67 (‘psychadelic’). +Origin: upstream, https://github.com/Alexey-Yakovenko/deadbeef/commit/51f377563cbb559dfcae5a6583961f22f0fe6af0 +Bug: https://code.google.com/p/ddb/issues/detail?id=1256 +--- a/junklib.c ++++ b/junklib.c +@@ -579,7 +579,7 @@ static const char *junk_genretbl[] = { + "Native American", + "Cabaret", + "New Wave", +- "Psychadelic", ++ "Psychedelic", + "Rave", + "Showtunes", + "Trailer", +@@ -1046,6 +1046,10 @@ junk_id3v1_write2 (int fd, playItem_t *i + break; + } + } ++ // workaround for the id3v1 std spelling error ++ if (genreid == 0xff && !strcasecmp (meta, "Psychadelic")) { ++ genreid = 67; ++ } + } + + pl_unlock (); +@@ -1146,7 +1150,11 @@ junk_id3v1_write (FILE *fp, playItem_t * + break; + } + } ++ // workaround for the id3v1 std spelling error ++ if (genreid == 0xff && !strcasecmp (meta, "Psychadelic")) { ++ genreid = 67; ++ } + } + + pl_unlock (); + diff --git a/debian/patches/series b/debian/patches/series index 9112f9cb..65379e4d 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1,2 @@ remove-interfering-maintainer-files.diff +junklib-spelling-psychedelic.diff |