From c7b8f95323cfce1fcf32f41cda63224799a0b2c9 Mon Sep 17 00:00:00 2001
From: Alexei <alexeibendebury@gmail.com>
Date: Sat, 12 Dec 2015 10:45:49 -0800
Subject: [PATCH 1/4] Removed mentions of old musicbrainz ngs directory

---
 morituri/common/mbngs.py               | 2 +-
 morituri/common/program.py             | 2 +-
 morituri/extern/python-musicbrainz-ngs | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 delete mode 160000 morituri/extern/python-musicbrainz-ngs

diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index fa7d08e..93a2c0b 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -267,7 +267,7 @@ def musicbrainz(discid, country=None, record=False):
     @rtype: list of L{DiscMetadata}
     """
     log.debug('musicbrainz', 'looking up results for discid %r', discid)
-    from morituri.extern.musicbrainzngs import musicbrainz
+    import musicbrainz
 
     ret = []
 
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 082dc4a..0696e09 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -33,7 +33,7 @@ from morituri.program import cdrdao, cdparanoia
 from morituri.image import image
 
 from morituri.extern.task import task, gstreamer
-from morituri.extern.musicbrainzngs import musicbrainz
+import musicbrainz
 
 
 # FIXME: should Program have a runner ?
diff --git a/morituri/extern/python-musicbrainz-ngs b/morituri/extern/python-musicbrainz-ngs
deleted file mode 160000
index 4260ed5..0000000
--- a/morituri/extern/python-musicbrainz-ngs
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 4260ed51273babb909a27fe07d68923158d2e9ec

From 8f2158f26ad29aa740d1fda43f6a2ec7d36f4ecc Mon Sep 17 00:00:00 2001
From: Alexei <alexeibendebury@gmail.com>
Date: Sat, 12 Dec 2015 10:51:22 -0800
Subject: [PATCH 2/4] Fixed more references

---
 morituri/common/mbngs.py   | 2 +-
 morituri/common/program.py | 2 +-
 morituri/rip/main.py       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/morituri/common/mbngs.py b/morituri/common/mbngs.py
index 93a2c0b..405c083 100644
--- a/morituri/common/mbngs.py
+++ b/morituri/common/mbngs.py
@@ -267,7 +267,7 @@ def musicbrainz(discid, country=None, record=False):
     @rtype: list of L{DiscMetadata}
     """
     log.debug('musicbrainz', 'looking up results for discid %r', discid)
-    import musicbrainz
+    import musicbrainzngs
 
     ret = []
 
diff --git a/morituri/common/program.py b/morituri/common/program.py
index 0696e09..599cfd3 100644
--- a/morituri/common/program.py
+++ b/morituri/common/program.py
@@ -33,7 +33,7 @@ from morituri.program import cdrdao, cdparanoia
 from morituri.image import image
 
 from morituri.extern.task import task, gstreamer
-import musicbrainz
+import musicbrainzngs
 
 
 # FIXME: should Program have a runner ?
diff --git a/morituri/rip/main.py b/morituri/rip/main.py
index fc5b758..3358df8 100644
--- a/morituri/rip/main.py
+++ b/morituri/rip/main.py
@@ -35,7 +35,7 @@ def main(argv):
     h.validate()
 
     # set user agent
-    from morituri.extern.musicbrainzngs import musicbrainz
+    import musicbrainzngs
     musicbrainz.set_useragent("morituri", configure.version,
         'https://thomas.apestaart.org/morituri/trac')
 

From 66e2f3f45bd1631e4e2c6f489f35dd7a8dd1d423 Mon Sep 17 00:00:00 2001
From: Alexei <alexeibendebury@gmail.com>
Date: Sat, 12 Dec 2015 11:00:06 -0800
Subject: [PATCH 3/4] Removed bad make lines

---
 morituri/extern/Makefile.am | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/morituri/extern/Makefile.am b/morituri/extern/Makefile.am
index 327739b..68bdce4 100644
--- a/morituri/extern/Makefile.am
+++ b/morituri/extern/Makefile.am
@@ -34,20 +34,10 @@ task_PYTHON = \
 	task/taskgtk.py \
 	task/gstreamer.py
 
-musicbrainzngsdir = $(PYTHONLIBDIR)/morituri/extern/musicbrainzngs
-
-musicbrainzngs_PYTHON = \
-	musicbrainzngs/__init__.py \
-	musicbrainzngs/musicbrainz.py \
-	musicbrainzngs/mbxml.py
-
-
 EXTRA_DIST = python-command/scripts/help2man
 
 log:
 	make git-submodule
-musicbrainzngs:
-	make git-submodule
 
 git-submodule:
 	cd $(top_srcdir) && git submodule init && git submodule sync && git submodule update
@@ -55,4 +45,3 @@ git-submodule:
 .PHONY: git-submodule
 
 
-all-local: log musicbrainzngs

From 2a3d2bb70ffa78d93157c758aac01f9bf2683fcf Mon Sep 17 00:00:00 2001
From: Alexei <alexeibendebury@gmail.com>
Date: Sat, 12 Dec 2015 11:08:50 -0800
Subject: [PATCH 4/4] Removed dead link

---
 morituri/extern/musicbrainzngs | 1 -
 1 file changed, 1 deletion(-)
 delete mode 120000 morituri/extern/musicbrainzngs

diff --git a/morituri/extern/musicbrainzngs b/morituri/extern/musicbrainzngs
deleted file mode 120000
index 4040121..0000000
--- a/morituri/extern/musicbrainzngs
+++ /dev/null
@@ -1 +0,0 @@
-python-musicbrainz-ngs/musicbrainzngs
\ No newline at end of file