[SCM] morituri/master: Add patches cherry-picked upstream: Make sure rip cd rip -U works. Modernize musicbrainz.org URLs. Make clearer what pycdio is needed for.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Nov 29 17:51:02 UTC 2015
The following commit has been merged in the master branch:
commit ab07b705a4cc4f9d858124ac8510155ee89c0c2f
Author: Jonas Smedegaard <dr at jones.dk>
Date: Sun Nov 29 17:19:59 2015 +0100
Add patches cherry-picked upstream: Make sure rip cd rip -U works. Modernize musicbrainz.org URLs. Make clearer what pycdio is needed for.
diff --git a/debian/patches/020141005~01f07c5.patch b/debian/patches/020141005~01f07c5.patch
new file mode 100644
index 0000000..b4d67c4
--- /dev/null
+++ b/debian/patches/020141005~01f07c5.patch
@@ -0,0 +1,18 @@
+Description: make sure rip cd rip -U works
+Origin: upstream, https://github.com/thomasvs/morituri/commit/01f07c5
+Author: Thomas Vander Stichele <thomas at apestaart.org>
+Forwarded: yes
+Last-Update: 2015-11-29
+
+--- a/morituri/rip/cd.py
++++ b/morituri/rip/cd.py
+@@ -123,7 +123,8 @@
+ "full table's AR URL %s differs from toc AR URL %s" % (
+ self.itable.getAccurateRipURL(), self.ittoc.getAccurateRipURL())
+
+- self.program.metadata.discid = self.ittoc.getMusicBrainzDiscId()
++ if self.program.metadata:
++ self.program.metadata.discid = self.ittoc.getMusicBrainzDiscId()
+
+ # result
+
diff --git a/debian/patches/020141102-0301~f08d0a2.patch b/debian/patches/020141102-0301~f08d0a2.patch
new file mode 100644
index 0000000..006de68
--- /dev/null
+++ b/debian/patches/020141102-0301~f08d0a2.patch
@@ -0,0 +1,50 @@
+Description: Remove traces of mm.musicbrainz.org.
+ See
+ http://chatlogs.musicbrainz.org/musicbrainz-devel/2014/2014-11/2014-11-02.html#T01-18-50-32205
+Origin: upstream, https://github.com/thomasvs/morituri/commit/f08d0a2
+Author: Frederik "Freso" S. Olesen <freso.dk at gmail.com>
+Forwarded: yes
+Last-Update: 2015-11-29
+
+--- a/morituri/image/table.py
++++ b/morituri/image/table.py
+@@ -383,7 +383,7 @@
+ return result
+
+ def getMusicBrainzSubmitURL(self):
+- host = 'mm.musicbrainz.org'
++ host = 'musicbrainz.org'
+
+ discid = self.getMusicBrainzDiscId()
+ values = self._getMusicBrainzValues()
+--- a/morituri/test/test_image_table.py
++++ b/morituri/test/test_image_table.py
+@@ -53,7 +53,7 @@
+
+ def testMusicBrainz(self):
+ # output from mb-submit-disc:
+- # http://mm.musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+
++ # http://musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+
+ # 15687+31841+51016+66616+81352+99559+116070+133243+149997+161710+
+ # 177832&tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-
+ # however, not (yet) in musicbrainz database
+--- a/morituri/test/test_image_toc.py
++++ b/morituri/test/test_image_toc.py
+@@ -230,7 +230,7 @@
+ self.assertEquals(self.toc.table.getMusicBrainzDiscId(),
+ "KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
+ self.assertEquals(self.toc.table.getMusicBrainzSubmitURL(),
+- "http://mm.musicbrainz.org/bare/cdlookup.html?toc="
++ "http://musicbrainz.org/bare/cdlookup.html?toc="
+ "1+12+195856+150+15687+31841+51016+66616+81352+99559+"
+ "116070+133243+149997+161710+177832&"
+ "tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
+@@ -276,7 +276,7 @@
+ # 164487 181780 209250 4440
+
+ def testMusicBrainz(self):
+- # URL to submit: http://mm.musicbrainz.org/bare/cdlookup.html?toc=1+11+
++ # URL to submit: http://musicbrainz.org/bare/cdlookup.html?toc=1+11+
+ # 197850+24320+44855+64090+77885+88095+104020+118245+129255+141765+
+ # 164487+181780&tracks=11&id=MAj3xXf6QMy7G.BIFOyHyq4MySE-
+ self.assertEquals(self.table.getMusicBrainzDiscId(),
diff --git a/debian/patches/020141102-0303~926ce46.patch b/debian/patches/020141102-0303~926ce46.patch
new file mode 100644
index 0000000..71fb12e
--- /dev/null
+++ b/debian/patches/020141102-0303~926ce46.patch
@@ -0,0 +1,81 @@
+Description: Use HTTPS for musicbrainz.org.
+Origin: upstream, https://github.com/thomasvs/morituri/commit/926ce46
+Author: Frederik "Freso" S. Olesen <freso.dk at gmail.com>
+Forwarded: yes
+Last-Update: 2015-11-29
+
+--- a/TODO
++++ b/TODO
+@@ -73,8 +73,8 @@
+ - burn ripped images
+ - use a temp dir, until the whole rip is good don't move it, so we easily find
+ half done rips
+- Compare http://www.musicbrainz.org/cdtoc/MAj3xXf6QMy7G.BIFOyHyq4MySE-
+- with http://www.musicbrainz.org/cdtoc/USC1utCZbTLZy80aHvQzJw4FASk-
++ Compare https://musicbrainz.org/cdtoc/MAj3xXf6QMy7G.BIFOyHyq4MySE-
++ with https://musicbrainz.org/cdtoc/USC1utCZbTLZy80aHvQzJw4FASk-
+ Almost same, but second is 2 seconds longer on last track, suggesting it
+ was calculated wrong (150 frame offset done wrong ?) Can't find it in
+ edit history though
+--- a/morituri/common/mbngs.py
++++ b/morituri/common/mbngs.py
+@@ -187,7 +187,7 @@
+
+ discMD.mbid = release['id']
+ discMD.mbidArtist = discCredit.getIds()
+- discMD.url = 'http://musicbrainz.org/release/' + release['id']
++ discMD.url = 'https://musicbrainz.org/release/' + release['id']
+
+ discMD.barcode = release.get('barcode', None)
+ lil = release.get('label-info-list', [{}])
+--- a/morituri/image/table.py
++++ b/morituri/image/table.py
+@@ -395,7 +395,7 @@
+ })
+
+ return urlparse.urlunparse((
+- 'http', host, '/bare/cdlookup.html', '', query, ''))
++ 'https', host, '/bare/cdlookup.html', '', query, ''))
+
+ def getFrameLength(self, data=False):
+ """
+--- a/morituri/test/test_image_table.py
++++ b/morituri/test/test_image_table.py
+@@ -53,7 +53,7 @@
+
+ def testMusicBrainz(self):
+ # output from mb-submit-disc:
+- # http://musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+
++ # https://musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+
+ # 15687+31841+51016+66616+81352+99559+116070+133243+149997+161710+
+ # 177832&tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-
+ # however, not (yet) in musicbrainz database
+@@ -73,7 +73,7 @@
+
+
+ class MusicBrainzTestCase(tcommon.TestCase):
+- # example taken from http://musicbrainz.org/doc/DiscIDCalculation
++ # example taken from https://musicbrainz.org/doc/DiscIDCalculation
+ # disc is Ettella Diamant
+
+ def setUp(self):
+--- a/morituri/test/test_image_toc.py
++++ b/morituri/test/test_image_toc.py
+@@ -230,7 +230,7 @@
+ self.assertEquals(self.toc.table.getMusicBrainzDiscId(),
+ "KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
+ self.assertEquals(self.toc.table.getMusicBrainzSubmitURL(),
+- "http://musicbrainz.org/bare/cdlookup.html?toc="
++ "https://musicbrainz.org/bare/cdlookup.html?toc="
+ "1+12+195856+150+15687+31841+51016+66616+81352+99559+"
+ "116070+133243+149997+161710+177832&"
+ "tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
+@@ -276,7 +276,7 @@
+ # 164487 181780 209250 4440
+
+ def testMusicBrainz(self):
+- # URL to submit: http://musicbrainz.org/bare/cdlookup.html?toc=1+11+
++ # URL to submit: https://musicbrainz.org/bare/cdlookup.html?toc=1+11+
+ # 197850+24320+44855+64090+77885+88095+104020+118245+129255+141765+
+ # 164487+181780&tracks=11&id=MAj3xXf6QMy7G.BIFOyHyq4MySE-
+ self.assertEquals(self.table.getMusicBrainzDiscId(),
diff --git a/debian/patches/020141102-1117~d81dd33.patch b/debian/patches/020141102-1117~d81dd33.patch
new file mode 100644
index 0000000..9095e02
--- /dev/null
+++ b/debian/patches/020141102-1117~d81dd33.patch
@@ -0,0 +1,48 @@
+Description: Resolve musicbrainz.org/{bare/cdlookup.html -> cdtoc/attach} redirect.
+Origin: upstream, https://github.com/thomasvs/morituri/commit/d81dd33
+Author: Frederik "Freso" S. Olesen <freso.dk at gmail.com>
+Forwarded: yes
+Last-Update: 2015-11-29
+
+--- a/morituri/image/table.py
++++ b/morituri/image/table.py
+@@ -395,7 +395,7 @@
+ })
+
+ return urlparse.urlunparse((
+- 'https', host, '/bare/cdlookup.html', '', query, ''))
++ 'https', host, '/cdtoc/attach', '', query, ''))
+
+ def getFrameLength(self, data=False):
+ """
+--- a/morituri/test/test_image_table.py
++++ b/morituri/test/test_image_table.py
+@@ -53,7 +53,7 @@
+
+ def testMusicBrainz(self):
+ # output from mb-submit-disc:
+- # https://musicbrainz.org/bare/cdlookup.html?toc=1+12+195856+150+
++ # https://musicbrainz.org/cdtoc/attach?toc=1+12+195856+150+
+ # 15687+31841+51016+66616+81352+99559+116070+133243+149997+161710+
+ # 177832&tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-
+ # however, not (yet) in musicbrainz database
+--- a/morituri/test/test_image_toc.py
++++ b/morituri/test/test_image_toc.py
+@@ -230,7 +230,7 @@
+ self.assertEquals(self.toc.table.getMusicBrainzDiscId(),
+ "KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
+ self.assertEquals(self.toc.table.getMusicBrainzSubmitURL(),
+- "https://musicbrainz.org/bare/cdlookup.html?toc="
++ "https://musicbrainz.org/cdtoc/attach?toc="
+ "1+12+195856+150+15687+31841+51016+66616+81352+99559+"
+ "116070+133243+149997+161710+177832&"
+ "tracks=12&id=KnpGsLhvH.lPrNc1PBL21lb9Bg4-")
+@@ -276,7 +276,7 @@
+ # 164487 181780 209250 4440
+
+ def testMusicBrainz(self):
+- # URL to submit: https://musicbrainz.org/bare/cdlookup.html?toc=1+11+
++ # URL to submit: https://musicbrainz.org/cdtoc/attach?toc=1+11+
+ # 197850+24320+44855+64090+77885+88095+104020+118245+129255+141765+
+ # 164487+181780&tracks=11&id=MAj3xXf6QMy7G.BIFOyHyq4MySE-
+ self.assertEquals(self.table.getMusicBrainzDiscId(),
diff --git a/debian/patches/020141102-1118~7bf7554.patch b/debian/patches/020141102-1118~7bf7554.patch
new file mode 100644
index 0000000..657a404
--- /dev/null
+++ b/debian/patches/020141102-1118~7bf7554.patch
@@ -0,0 +1,17 @@
+Description: Resolve musicbrainz.org/doc/ redirect.
+Origin: upstream, https://github.com/thomasvs/morituri/commit/7bf7554
+Author: Frederik "Freso" S. Olesen <freso.dk at gmail.com>
+Forwarded: yes
+Last-Update: 2015-11-29
+
+--- a/morituri/test/test_image_table.py
++++ b/morituri/test/test_image_table.py
+@@ -73,7 +73,7 @@
+
+
+ class MusicBrainzTestCase(tcommon.TestCase):
+- # example taken from https://musicbrainz.org/doc/DiscIDCalculation
++ # example taken from https://musicbrainz.org/doc/Disc_ID_Calculation
+ # disc is Ettella Diamant
+
+ def setUp(self):
diff --git a/debian/patches/020150905~4bfbc90.patch b/debian/patches/020150905~4bfbc90.patch
new file mode 100644
index 0000000..3679396
--- /dev/null
+++ b/debian/patches/020150905~4bfbc90.patch
@@ -0,0 +1,37 @@
+Description: Make clearer what `pycdio` is needed for
+Origin: upstream, https://github.com/thomasvs/morituri/commit/4bfbc90
+Author: JoeLametta <JoeLametta at users.noreply.github.com>
+Forwarded: yes
+Bug: https://github.com/thomasvs/morituri/issues/96
+Last-Update: 2015-11-29
+
+--- a/README.md
++++ b/README.md
+@@ -31,6 +31,7 @@
+ - python-setuptools, for plugin support
+ - python-cddb, for showing but not using disc info if not in musicbrainz
+ - pycdio, for drive identification (optional)
++ - Required for drive offset and caching behaviour to be stored in the config file
+
+ GETTING MORITURI
+ ----------------
+--- a/morituri/rip/drive.py
++++ b/morituri/rip/drive.py
+@@ -67,6 +67,7 @@
+
+ info = drive.getDeviceInfo(self.options.device)
+ if not info:
++ self.stdout.write('Drive caching behaviour not saved: could not get device info (requires pycdio).\n')
+ return
+
+ self.stdout.write(
+--- a/morituri/rip/offset.py
++++ b/morituri/rip/offset.py
+@@ -239,6 +239,7 @@
+
+ info = drive.getDeviceInfo(device)
+ if not info:
++ self.stdout.write('Offset not saved: could not get device info (requires pycdio).\n')
+ return
+
+ self.stdout.write('Adding read offset to configuration file.\n')
diff --git a/debian/patches/series b/debian/patches/series
index fbd1b09..15e222f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,8 @@
+020141005~01f07c5.patch
+020141102-0301~f08d0a2.patch
+020141102-0303~926ce46.patch
+020141102-1117~d81dd33.patch
+020141102-1118~7bf7554.patch
+020150905~4bfbc90.patch
1002_improve_manpage_sections.patch
2001_fix_python_hashbang.patch
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list