[SCM] morituri/master: Update patch 2001.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 62d0b2e92de1cb83bdb9ff58e738acf09f2b32a7
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Mon Jan 28 13:24:13 2013 +0100

    Update patch 2001.

diff --git a/debian/patches/2001_use_system_musicbrainzngs.patch b/debian/patches/2001_use_system_musicbrainzngs.patch
index 77058e6..8a8d899 100644
--- a/debian/patches/2001_use_system_musicbrainzngs.patch
+++ b/debian/patches/2001_use_system_musicbrainzngs.patch
@@ -5,7 +5,7 @@ Last-Update: 2013-01-15
 
 --- a/morituri/common/musicbrainzngs.py
 +++ b/morituri/common/musicbrainzngs.py
-@@ -219,7 +219,10 @@
+@@ -223,7 +223,10 @@
      @rtype: list of L{DiscMetadata}
      """
      log.debug('musicbrainz', 'looking up results for discid %r', discid)
@@ -19,7 +19,7 @@ Last-Update: 2013-01-15
  
 --- a/morituri/extern/Makefile.am
 +++ b/morituri/extern/Makefile.am
-@@ -26,28 +26,4 @@
+@@ -26,14 +26,4 @@
  	task/taskgtk.py \
  	task/gstreamer.py
  
@@ -31,35 +31,21 @@ Last-Update: 2013-01-15
 -	musicbrainzngs/mbxml.py
 -
 -
- EXTRA_DIST = log/test_log.py python-command/scripts/help2man
+ EXTRA_DIST = python-command/scripts/help2man
 -
 -musicbrainzngs/musicbrainz.py: all
--
--python-musicbrainz-ngs:
--	git clone git://github.com/thomasvs/python-musicbrainz-ngs.git
--
--python-musicbrainz-ngs-check:
--	if test ! -e $(top_srcdir)/morituri/extern/musicbrainzngs/musicbrainz.py; then echo cloning python-musicbrainz-ngs; make python-musicbrainz-ngs; fi
--
--python-command:
--	git clone git://github.com/thomasvs/python-command.git
--
--python-command-check:
--	if test ! -e $(top_srcdir)/morituri/extern/command/command.py; then echo cloning python-command; make python-command; fi
--
--all: python-musicbrainz-ngs-check python-command-check
 --- a/morituri/common/program.py
 +++ b/morituri/common/program.py
-@@ -27,7 +27,7 @@
- import os
+@@ -28,7 +28,7 @@
+ import sys
  import time
  
--from morituri.common import common, log, musicbrainzngs
-+from morituri.common import common, log, ourmusicbrainzngs
- from morituri.result import result
+-from morituri.common import common, log, musicbrainzngs, cache
++from morituri.common import common, log, ourmusicbrainzngs, cache
  from morituri.program import cdrdao, cdparanoia
  from morituri.image import image
-@@ -240,11 +240,11 @@
+ 
+@@ -238,11 +238,11 @@
  
          for _ in range(0, 4):
              try:
@@ -71,12 +57,12 @@ Last-Update: 2013-01-15
                  break
 -            except musicbrainzngs.MusicBrainzException, e:
 +            except ourmusicbrainzngs.MusicBrainzException, e:
-                 print "Warning:", e
+                 self._stdout.write("Warning: %r\n" % (e, ))
                  time.sleep(5)
                  continue
 --- a/morituri/rip/debug.py
 +++ b/morituri/rip/debug.py
-@@ -97,8 +97,8 @@
+@@ -193,8 +193,8 @@
              self.stdout.write('Please specify a MusicBrainz disc id.\n')
              return 3
  
@@ -89,7 +75,7 @@ Last-Update: 2013-01-15
          for i, md in enumerate(metadatas):
 --- a/morituri/common/Makefile.am
 +++ b/morituri/common/Makefile.am
-@@ -12,7 +12,7 @@
+@@ -15,7 +15,7 @@
  	gstreamer.py \
  	log.py \
  	logcommand.py \

-- 
morituri packaging