Drop patches that were applied upstream

4 files changed, 0 insertions, 158 deletions

diff --git a/debian/patches/Replace-deprecated-assertEquals-with-assertEqual.patch b/debian/patches/Replace-deprecated-assertEquals-with-assertEqual.patch
deleted file mode 100644
index 557ac07..0000000
--- a/debian/patches/Replace-deprecated-assertEquals-with-assertEqual.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 15 May 2020 10:01:39 +0100
-Subject: Replace deprecated assertEquals with assertEqual
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 1.0.1, commit:87ac21b443599021a5f28d99f3e9f4027b61f813
----
- test/test_rgio.py | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/test/test_rgio.py b/test/test_rgio.py
-index 8ac8ef2..da55389 100644
---- a/test/test_rgio.py
-+++ b/test/test_rgio.py
-@@ -15,19 +15,19 @@ class TestGetTagsObject(unittest.TestCase):
-         tags = self.reader_writer._get_tags_object(
-             str(DATA_PATH / "missing-headers.mp3")
-         )
--        self.assertEquals(tags.keys(), [])
-+        self.assertEqual(tags.keys(), [])
-         self.assertTrue(tags.filename.endswith("missing-headers.mp3"))
- 
-     def test_no_tags_mp3(self):
-         tags = self.reader_writer._get_tags_object(
-             str(DATA_PATH / "no-tags.mp3")
-         )
--        self.assertEquals(tags.keys(), [])
-+        self.assertEqual(tags.keys(), [])
-         self.assertTrue(tags.filename.endswith("no-tags.mp3"))
- 
-     def test_album_mp3(self):
-         tags = self.reader_writer._get_tags_object(
-             str(DATA_PATH / "album-tag.mp3")
-         )
--        self.assertEquals(tags.keys(), ["album"])
-+        self.assertEqual(tags.keys(), ["album"])
-         self.assertTrue(tags.filename.endswith("album-tag.mp3"))
diff --git a/debian/patches/Replace-link-to-replaygain.org.patch b/debian/patches/Replace-link-to-replaygain.org.patch
deleted file mode 100644
index f42bc46..0000000
--- a/debian/patches/Replace-link-to-replaygain.org.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Thu, 21 May 2020 10:28:07 +0100
-Subject: Replace link to replaygain.org
-
-replaygain.org doesn't seem to have been under the control of the author
-of the ReplayGain specification since 2015, and the Hydrogenaudio wiki
-appears to be the de facto reference now.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 1.0.1, commit:bf71bab02056987aa90ad20f90104188fd0a9f7e
----
- README.md | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/README.md b/README.md
-index 6a592b6..c278ab3 100755
---- a/README.md
-+++ b/README.md
-@@ -178,7 +178,7 @@ The manpages were originally written for the Debian project and are::
-  Copyright (c) 2012-2015 Felix Krull <f_krull@gmx.de>
- 
- 
--[1]: http://replaygain.org
-+[1]: https://wiki.hydrogenaud.io/index.php?title=ReplayGain
- [2]: http://mp3gain.sourceforce.net
- [3]: http://wiki.hydrogenaudio.org/index.php?title=ReplayGain_specification#ID3v2
- [4]: http://foobar2000.org
diff --git a/debian/patches/Use-GLib.MainLoop-instead-of-GObject.MainLoop.patch b/debian/patches/Use-GLib.MainLoop-instead-of-GObject.MainLoop.patch
deleted file mode 100644
index 93b2bc4..0000000
--- a/debian/patches/Use-GLib.MainLoop-instead-of-GObject.MainLoop.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-From: Simon McVittie <smcv@debian.org>
-Date: Fri, 15 May 2020 10:01:23 +0100
-Subject: Use GLib.MainLoop instead of GObject.MainLoop
-
-GObject.MainLoop is a compatibility alias for code ported from historical
-versions of pygobject, but GMainLoop is actually part of GLib rather
-than GObject.
-
-Signed-off-by: Simon McVittie <smcv@debian.org>
-Applied-upstream: 1.0.1, commit:47d04eb0a468b67339305d6280915dbeaa79a9a2
----
- rgain3/rgcalc.py            | 6 +++---
- rgain3/script/replaygain.py | 4 ++--
- test/test_rgcalc.py         | 4 ++--
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/rgain3/rgcalc.py b/rgain3/rgcalc.py
-index 82884c1..68d7f56 100755
---- a/rgain3/rgcalc.py
-+++ b/rgain3/rgcalc.py
-@@ -22,7 +22,7 @@ import gi
- 
- gi.require_version('Gst', '1.0')
- 
--from gi.repository import GObject, Gst  # noqa isort:skip
-+from gi.repository import GLib, GObject, Gst  # noqa isort:skip
- 
- from rgain3 import GainData, GainType, GSTError, util  # noqa isort:skip
- 
-@@ -43,7 +43,7 @@ class ReplayGain(GObject.GObject):
-      - instantiate the class, passing it a list of file names and optionally the
-        reference loudness level to use (defaults to 89 dB),
-      - connect to the signals the class provides,
--     - get yourself a glib main loop (e.g. ``GObject.MainLoop`` or the one from
-+     - get yourself a glib main loop (e.g. ``GLib.MainLoop`` or the one from
-        GTK),
-      - call ``replaygain_instance.start()`` to start processing,
-      - start your main loop to dispatch events and
-@@ -265,7 +265,7 @@ def calculate(*args, **kwargs):
-             rg,
-             ("all-finished", on_finished),
-             ("error", on_error),):
--        loop = GObject.MainLoop()
-+        loop = GLib.MainLoop()
-         rg.start()
-         loop.run()
-     if exc_slot[0] is not None:
-diff --git a/rgain3/script/replaygain.py b/rgain3/script/replaygain.py
-index 14662db..34d8276 100755
---- a/rgain3/script/replaygain.py
-+++ b/rgain3/script/replaygain.py
-@@ -19,7 +19,7 @@
- import os.path
- import sys
- 
--from gi.repository import GObject
-+from gi.repository import GLib
- 
- from rgain3 import rgcalc, rgio, util
- from rgain3.script import Error, common_options, init_gstreamer
-@@ -52,7 +52,7 @@ def calculate_gain(files, ref_level):
-                               ("track-started", on_trk_started),
-                               ("track-finished", on_trk_finished),
-                               ("error", on_error),):
--        loop = GObject.MainLoop()
-+        loop = GLib.MainLoop()
-         rg.start()
-         loop.run()
-     if exc_slot[0] is not None:
-diff --git a/test/test_rgcalc.py b/test/test_rgcalc.py
-index 0b12552..b4c32a3 100755
---- a/test/test_rgcalc.py
-+++ b/test/test_rgcalc.py
-@@ -5,7 +5,7 @@ import gi
- 
- gi.require_version("Gst", "1.0")
- 
--from gi.repository import GObject, Gst  # noqa isort:skip
-+from gi.repository import GLib, GObject, Gst  # noqa isort:skip
- 
- from rgain3 import GainType, rgcalc, util  # noqa isort:skip
- 
-@@ -63,7 +63,7 @@ class TestReplayGain(unittest.TestCase):
-         rg = rgcalc.ReplayGain(tracks)
- 
-         events = []
--        loop = GObject.MainLoop()
-+        loop = GLib.MainLoop()
- 
-         def event(*args):
-             """
diff --git a/debian/patches/series b/debian/patches/series
index b9acc36..83c3141 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
-Use-GLib.MainLoop-instead-of-GObject.MainLoop.patch
-Replace-deprecated-assertEquals-with-assertEqual.patch
-Replace-link-to-replaygain.org.patch
 setup.cfg-Only-run-functional-checks-during-Debian-packag.patch