[SCM] isrcsubmit/master: Patches for new upstream release

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6cf4470ef25cebc1ca0a0d31307bb53cecfada58
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Tue Mar 4 14:02:49 2014 +0100

    Patches for new upstream release
    
    extra-import.patch: Remove extra import discid, forwarded upstream
    libdiscid.patch: Replace discid with python_libdiscid in setup.py

diff --git a/debian/patches/extra-import.patch b/debian/patches/extra-import.patch
new file mode 100644
index 0000000..14bd287
--- /dev/null
+++ b/debian/patches/extra-import.patch
@@ -0,0 +1,15 @@
+Description: Remove extra import
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: https://github.com/JonnyJD/musicbrainz-isrcsubmit/pull/92
+Last-Update: 2014-03-04
+
+--- isrcsubmit-2.0.0~rc.1.orig/test_isrcsubmit.py
++++ isrcsubmit-2.0.0~rc.1/test_isrcsubmit.py
+@@ -12,7 +12,6 @@ import unittest
+ from io import TextIOWrapper, BytesIO
+ from subprocess import Popen
+ 
+-import discid
+ import musicbrainzngs
+ import isrcsubmit
+ 
diff --git a/debian/patches/libdiscid.patch b/debian/patches/libdiscid.patch
new file mode 100644
index 0000000..41a91f4
--- /dev/null
+++ b/debian/patches/libdiscid.patch
@@ -0,0 +1,26 @@
+Description: Replace discid with python-libdiscid
+ discid is not in the archive, but python-libdiscid is.
+Author: Sebastian Ramacher <sramacher at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-03-04
+
+--- a/setup.py
++++ b/setup.py
+@@ -49,7 +49,7 @@
+ 
+ args = {}
+ if have_setuptools:
+-    args["install_requires"] = ["discid >=1.0.0", "musicbrainzngs >=0.4"],
++    args["install_requires"] = ["python_libdiscid >=0.2", "musicbrainzngs >=0.4"],
+     # we load isrcsubmit on setup
+     args["setup_requires"] = args["install_requires"],
+ 
+@@ -99,7 +99,7 @@
+         author="Johannes Dewender",
+         author_email="brainz at JonnyJD.net",
+         url="https://github.com/JonnyJD/musicbrainz-isrcsubmit",
+-        requires=["discid(>=1.0.0)", "musicbrainzngs(>=0.4)"],
++        requires=["python_libdiscid(>=0.2)", "musicbrainzngs(>=0.4)"],
+         scripts=["isrcsubmit.py"],
+         license="GPLv3+",
+         classifiers=[
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..000e3be
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+libdiscid.patch
+extra-import.patch

-- 
isrcsubmit packaging