From 6ed96fadd13e68c13b198d79c570d1a566b8d89a Mon Sep 17 00:00:00 2001
From: Benjamin Barenblat <bbaren@mit.edu>
Date: Mon, 19 Jan 2015 20:03:56 -0500
Subject: Spell ‘psychedelic’ correctly
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 debian/deadbeef.lintian-overrides                |  1 +
 debian/patches/junklib-spelling-psychedelic.diff | 41 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 43 insertions(+)
 create mode 100644 debian/deadbeef.lintian-overrides
 create mode 100644 debian/patches/junklib-spelling-psychedelic.diff

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
-- 
cgit v1.2.3