Merging debian version 2024.05.26-1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

5 files changed, 15 insertions, 22 deletions

diff --git a/debian/changelog b/debian/changelog
index be7c021..3cfda3e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+yt-dlp (2024.05.26-1) unstable; urgency=medium
+
+  * New upstream version 2024.05.26.
+    - Drop patch fixed upstream, refresh remaining.
+
+ -- Unit 193 <unit193@debian.org>  Sun, 26 May 2024 21:43:13 -0400
+
 yt-dlp (2024.04.09-1~progress7.99u1) graograman-backports; urgency=medium
 
   * Uploading to graograman-updates, remaining changes:
diff --git a/debian/patches/0001-Debianize-paths.patch b/debian/patches/0001-Debianize-paths.patch
index 54ba2fd..24e2c5a 100644
--- a/debian/patches/0001-Debianize-paths.patch
+++ b/debian/patches/0001-Debianize-paths.patch
@@ -8,7 +8,7 @@ Forwarded: not-needed
 
 --- a/pyproject.toml
 +++ b/pyproject.toml
-@@ -114,9 +114,9 @@ artifacts = ["/yt_dlp/extractor/lazy_ext
+@@ -125,9 +125,9 @@ artifacts = ["/yt_dlp/extractor/lazy_ext
  
  [tool.hatch.build.targets.wheel.shared-data]
  "completions/bash/yt-dlp" = "share/bash-completion/completions/yt-dlp"
diff --git a/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch b/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch
index 5463e7b..0e12b31 100644
--- a/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch
+++ b/debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch
@@ -9,17 +9,19 @@ fashion to what -Werror does to GCC or other compilers.
 
 Therefore, I'm disabling this.
 ---
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 --- a/Makefile
 +++ b/Makefile
-@@ -76,7 +76,7 @@ test:
- 	$(PYTHON) -m pytest
+@@ -77,8 +77,8 @@ test:
+ 	$(PYTHON) -m pytest -Werror
  	$(MAKE) codetest
  
 -offlinetest: codetest
+-	$(PYTHON) -m pytest -Werror -m "not download"
 +offlinetest:
- 	$(PYTHON) -m pytest -k "not download"
++	$(PYTHON) -m pytest -m "not download"
  
  CODE_FOLDERS_CMD = find yt_dlp -type f -name '__init__.py' | sed 's,/__init__.py,,' | grep -v '/__' | sort
+ CODE_FOLDERS != $(CODE_FOLDERS_CMD)
diff --git a/debian/patches/0005-Skip-failing-tests.patch b/debian/patches/0005-Skip-failing-tests.patch
deleted file mode 100644
index 3dbe6e3..0000000
--- a/debian/patches/0005-Skip-failing-tests.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Skip a failing test
-Author: Unit 193 <unit193@debian.org>
-Bug: https://github.com/yt-dlp/yt-dlp/issues/9659
-Forwarded: not-needed
-
---- yt-dlp-2024.04.09.orig/test/test_networking.py
-+++ yt-dlp-2024.04.09/test/test_networking.py
-@@ -543,6 +543,7 @@ class TestHTTPRequestHandler(TestRequest
- 
-     @pytest.mark.parametrize('handler', ['Urllib', 'Requests', 'CurlCFFI'], indirect=True)
-     def test_connect_timeout(self, handler):
-+        pytest.skip(f'Skipping failing test.')
-         # nothing should be listening on this port
-         connect_timeout_url = 'http://10.255.255.255'
-         with handler(timeout=0.01) as rh:
diff --git a/debian/patches/series b/debian/patches/series
index eec4500..37a9d1a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-Debianize-paths.patch
 0003-Remove-use-of-git.patch
 0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch
-0005-Skip-failing-tests.patch