[SCM] morituri/master: Drop patches 1001 2001: Adopted upstream.
js at users.alioth.debian.org
js at users.alioth.debian.org
Sun Oct 19 20:10:18 UTC 2014
The following commit has been merged in the master branch:
commit e5f29a86e93e1dec21ea04d6155d1e5796f578be
Author: Jonas Smedegaard <dr at jones.dk>
Date: Thu Jul 17 14:05:37 2014 +0200
Drop patches 1001 2001: Adopted upstream.
diff --git a/debian/patches/1001_no_hardcode_python_binary.patch b/debian/patches/1001_no_hardcode_python_binary.patch
deleted file mode 100644
index 60e42ec..0000000
--- a/debian/patches/1001_no_hardcode_python_binary.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Description: Use autotools-resolved Python executable
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2013-01-15
-
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -18,10 +18,10 @@
- trial --coverage morituri.test
-
- coverage: _trial_temp/coverage
-- python misc/show-coverage.py `ls _trial_temp/coverage/morituri* | grep -v morituri.test | grep -v morituri.extern`
-+ $(PYTHON) misc/show-coverage.py `ls _trial_temp/coverage/morituri* | grep -v morituri.test | grep -v morituri.extern`
-
- pep8:
-- for file in $(SOURCES); do python misc/pep8.py --repeat $$file; done
-+ for file in $(SOURCES); do $(PYTHON) misc/pep8.py --repeat $$file; done
-
- clean-local:
- @rm -rf _trial_temp
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -24,7 +24,7 @@
- man_MANS = rip.1
-
- rip.1: $(top_srcdir)/morituri/extern/python-command/scripts/help2man $(top_srcdir)/morituri
-- PYTHONPATH=$(top_srcdir) python $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
-+ PYTHONPATH=$(top_srcdir) $(PYTHON) $(top_srcdir)/morituri/extern/python-command/scripts/help2man morituri.rip.main.Rip rip > rip.1
-
- clean-local:
- @rm -rf reference
diff --git a/debian/patches/2001_use_system_musicbrainzngs.patch b/debian/patches/2001_use_system_musicbrainzngs.patch
deleted file mode 100644
index 4b93acd..0000000
--- a/debian/patches/2001_use_system_musicbrainzngs.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Description: Use system-installed python-musicbrainzngs library
- ...and while at it, also avoid cloning external command.py command.
-Author: Jonas Smedegaard <dr at jones.dk>
-Last-Update: 2013-01-15
-
---- a/morituri/common/musicbrainzngs.py
-+++ b/morituri/common/musicbrainzngs.py
-@@ -223,7 +223,10 @@
- @rtype: list of L{DiscMetadata}
- """
- log.debug('musicbrainz', 'looking up results for discid %r', discid)
-- from morituri.extern.musicbrainzngs import musicbrainz
-+ from musicbrainzngs import musicbrainz
-+
-+ from morituri.configure import configure
-+ musicbrainz.set_useragent('morituri', configure.version)
-
- ret = []
-
---- a/morituri/extern/Makefile.am
-+++ b/morituri/extern/Makefile.am
-@@ -26,14 +26,4 @@
- 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
--
--musicbrainzngs/musicbrainz.py: all
---- a/morituri/common/program.py
-+++ b/morituri/common/program.py
-@@ -28,7 +28,7 @@
- import sys
- import time
-
--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
-
-@@ -238,11 +238,11 @@
-
- for _ in range(0, 4):
- try:
-- metadatas = musicbrainzngs.musicbrainz(mbdiscid,
-+ metadatas = ourmusicbrainzngs.musicbrainz(mbdiscid,
- record=self._record)
-- except musicbrainzngs.NotFoundException, e:
-+ except ourmusicbrainzngs.NotFoundException, e:
- break
-- except musicbrainzngs.MusicBrainzException, e:
-+ except ourmusicbrainzngs.MusicBrainzException, e:
- self._stdout.write("Warning: %r\n" % (e, ))
- time.sleep(5)
- continue
---- a/morituri/rip/debug.py
-+++ b/morituri/rip/debug.py
-@@ -193,8 +193,8 @@
- self.stdout.write('Please specify a MusicBrainz disc id.\n')
- return 3
-
-- from morituri.common import musicbrainzngs
-- metadatas = musicbrainzngs.musicbrainz(discId)
-+ from morituri.common import ourmusicbrainzngs
-+ metadatas = ourmusicbrainzngs.musicbrainz(discId)
-
- self.stdout.write('%d releases\n' % len(metadatas))
- for i, md in enumerate(metadatas):
---- a/morituri/common/Makefile.am
-+++ b/morituri/common/Makefile.am
-@@ -15,7 +15,7 @@
- gstreamer.py \
- log.py \
- logcommand.py \
-- musicbrainzngs.py \
-+ ourmusicbrainzngs.py \
- program.py \
- renamer.py \
- task.py
---- a/morituri/test/test_common_musicbrainzngs.py
-+++ b/morituri/test/test_common_musicbrainzngs.py
-@@ -6,7 +6,7 @@
-
- import unittest
-
--from morituri.common import musicbrainzngs
-+from morituri.common import ourmusicbrainzngs
-
-
- class MetadataTestCase(unittest.TestCase):
-@@ -19,6 +19,6 @@
- handle.close()
- discid = "wbjbST2jUHRZaB1inCyxxsL7Eqc-"
-
-- metadata = musicbrainzngs._getMetadata({}, response['release'], discid)
-+ metadata = ourmusicbrainzngs._getMetadata({}, response['release'], discid)
-
- self.failIf(metadata.release)
---- a/morituri/test/test_common_program.py
-+++ b/morituri/test/test_common_program.py
-@@ -7,7 +7,7 @@
- import unittest
-
- from morituri.result import result
--from morituri.common import program, accurip, musicbrainzngs
-+from morituri.common import program, accurip, ourmusicbrainzngs
- from morituri.rip import common as rcommon
-
-
-@@ -95,7 +95,7 @@
-
- def testStandardTemplateFilled(self):
- prog = program.Program()
-- md = musicbrainzngs.DiscMetadata()
-+ md = ourmusicbrainzngs.DiscMetadata()
- md.artist = md.sortName = 'Jeff Buckley'
- md.title = 'Grace'
- prog.metadata = md
-@@ -107,7 +107,7 @@
-
- def testIssue66TemplateFilled(self):
- prog = program.Program()
-- md = musicbrainzngs.DiscMetadata()
-+ md = ourmusicbrainzngs.DiscMetadata()
- md.artist = md.sortName = 'Jeff Buckley'
- md.title = 'Grace'
- prog.metadata = md
diff --git a/debian/patches/series b/debian/patches/series
index 6640dc9..1284ee4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-1001_no_hardcode_python_binary.patch
1002_improve_manpage_sections.patch
-2001_use_system_musicbrainzngs.patch
diff --git a/debian/rules b/debian/rules
index 3cdd1f5..f742a4a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -96,9 +96,3 @@ DEB_MAKE_CLEAN_TARGET = distclean
DEB_UPSTREAM_CRUFT_MOVE += morituri/configure/installed.py morituri/configure/uninstalled.py
pre-build::
ln -f -s -t morituri/configure ../../build/morituri/configure/installed.py ../../build/morituri/configure/uninstalled.py
-
-# Rename musicbrainzngs.py wrapper during build, to match patch 2001
-pre-build::
- [ -f morituri/common/ourmusicbrainzngs.py ] || mv morituri/common/musicbrainzngs.py morituri/common/ourmusicbrainzngs.py
-makefile-clean::
- [ -f morituri/common/musicbrainzngs.py ] || mv morituri/common/ourmusicbrainzngs.py morituri/common/musicbrainzngs.py
--
morituri packaging
More information about the pkg-multimedia-commits
mailing list