[SCM] bangarang packaging branch, master, updated. debian/2.0.1-1.retag-6-g9c00a50

[Ryan Kavanagh]

The following commit has been merged in the master branch:
commit 1dbfb2a7c7301377aad638ffe12643f7f776cb47
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Sun Dec 18 13:25:37 2011 -0500

    Drop 01_psychadelic_psychedelic.diff, applied upstream
---
 debian/patches/01_psychadelic_psychedelic.diff |   19 -------------------
 debian/patches/series                          |    1 -
 2 files changed, 0 insertions(+), 20 deletions(-)

diff --git a/debian/patches/01_psychadelic_psychedelic.diff b/debian/patches/01_psychadelic_psychedelic.diff
deleted file mode 100644
index b4523c4..0000000
--- a/debian/patches/01_psychadelic_psychedelic.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Fix a typo in filetags.
-Forwarded: https://gitorious.org/bangarang/bangarang/merge_requests/2258
-Author: Ryan Kavanagh <ryanakca at kubuntu.org>
-Origin: vendor
-Reviewed-By: Ryan Kavanagh <ryanakca at kubuntu.org>
-Last-Update: 2011-05-27
-Index: bangarang/src/platform/utilities/filetags.cpp
-===================================================================
---- bangarang.orig/src/platform/utilities/filetags.cpp	2011-05-27 08:02:28.602029205 -0400
-+++ bangarang/src/platform/utilities/filetags.cpp	2011-05-27 08:02:45.802114494 -0400
-@@ -717,7 +717,7 @@
-     genreDictionary[64] = "Native American";
-     genreDictionary[65] = "Cabaret";
-     genreDictionary[66] = "New Wave";
--    genreDictionary[67] = "Psychadelic";
-+    genreDictionary[67] = "Psychedelic";
-     genreDictionary[68] = "Rave";
-     genreDictionary[69] = "Showtunes";
-     genreDictionary[70] = "Trailer";
diff --git a/debian/patches/series b/debian/patches/series
index 661f0d7..211b479 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-01_psychadelic_psychedelic.diff
 02_QFSFileEngine_open.diff

-- 
bangarang packaging