diff options
| -rw-r--r-- | debian/changelog | 9 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/patches/0001-Debianize-paths.patch (renamed from debian/patches/0001-Correct-path-for-docs.patch) | 13 | ||||
| -rw-r--r-- | debian/patches/0003-Remove-use-of-git.patch | 4 | ||||
| -rw-r--r-- | debian/patches/0004-Makefile-Don-t-run-flake8-when-running-offlinetest.patch | 2 | ||||
| -rw-r--r-- | debian/patches/0005-Skip-failing-tests.patch | 15 | ||||
| -rw-r--r-- | debian/patches/series | 3 |
7 files changed, 38 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 6c18058..1670e13 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +yt-dlp (2024.04.09-1) unstable; urgency=medium + + * New upstream version 2024.04.09. + - d/patches: Fix zsh's path, refresh remaining patches. + * d/p/0005-Skip-failing-tests.patch: Skip failing tests. + * Update Standards-Version to 4.7.0. + + -- Unit 193 <unit193@debian.org> Wed, 17 Apr 2024 03:26:07 -0400 + yt-dlp (2024.03.10-1~progress7.99u1) graograman-backports; urgency=medium * Initial reupload to graograman-backports. diff --git a/debian/control b/debian/control index 27ec4db..d6faaf2 100644 --- a/debian/control +++ b/debian/control @@ -17,7 +17,7 @@ Build-Depends: Build-Depends-Indep: python3 Rules-Requires-Root: no -Standards-Version: 4.6.2 +Standards-Version: 4.7.0 Vcs-Browser: https://git.progress-linux.org/packages/graograman-backports/yt-dlp Vcs-Git: https://git.progress-linux.org/packages/graograman-backports/yt-dlp XSBC-Original-Vcs-Browser: https://codeberg.org/Unit193/yt-dlp diff --git a/debian/patches/0001-Correct-path-for-docs.patch b/debian/patches/0001-Debianize-paths.patch index 754a265..54ba2fd 100644 --- a/debian/patches/0001-Correct-path-for-docs.patch +++ b/debian/patches/0001-Debianize-paths.patch @@ -1,16 +1,19 @@ -Description: Correct path for docs. +Description: Debianize paths. Author: Unit 193 <unit193@debian.org> Forwarded: not-needed --- - pyproject.toml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + pyproject.toml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) --- a/pyproject.toml +++ b/pyproject.toml -@@ -112,7 +112,7 @@ artifacts = ["/yt_dlp/extractor/lazy_ext +@@ -114,9 +114,9 @@ artifacts = ["/yt_dlp/extractor/lazy_ext + + [tool.hatch.build.targets.wheel.shared-data] "completions/bash/yt-dlp" = "share/bash-completion/completions/yt-dlp" - "completions/zsh/_yt-dlp" = "share/zsh/site-functions/_yt-dlp" +-"completions/zsh/_yt-dlp" = "share/zsh/site-functions/_yt-dlp" ++"completions/zsh/_yt-dlp" = "share/zsh/vendor-completions/_yt-dlp" "completions/fish/yt-dlp.fish" = "share/fish/vendor_completions.d/yt-dlp.fish" -"README.txt" = "share/doc/yt_dlp/README.txt" +"README.txt" = "share/doc/yt-dlp/README.txt" diff --git a/debian/patches/0003-Remove-use-of-git.patch b/debian/patches/0003-Remove-use-of-git.patch index f722b2f..1a32b99 100644 --- a/debian/patches/0003-Remove-use-of-git.patch +++ b/debian/patches/0003-Remove-use-of-git.patch @@ -14,6 +14,6 @@ Forwarded: not-needed # make pypi-files && python3 -m build -sn . -pypi-files: AUTHORS Changelog.md LICENSE README.md README.txt supportedsites \ +pypi-files: Changelog.md LICENSE README.md README.txt supportedsites \ - completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/* + completions yt-dlp.1 pyproject.toml setup.cfg devscripts/* test/* - .PHONY: all clean install test tar pypi-files completions ot offlinetest codetest supportedsites + .PHONY: all clean clean-all clean-test clean-dist clean-cache \ 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 3db4af3..5463e7b 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 @@ -14,7 +14,7 @@ Therefore, I'm disabling this. --- a/Makefile +++ b/Makefile -@@ -73,7 +73,7 @@ test: +@@ -76,7 +76,7 @@ test: $(PYTHON) -m pytest $(MAKE) codetest diff --git a/debian/patches/0005-Skip-failing-tests.patch b/debian/patches/0005-Skip-failing-tests.patch new file mode 100644 index 0000000..3dbe6e3 --- /dev/null +++ b/debian/patches/0005-Skip-failing-tests.patch @@ -0,0 +1,15 @@ +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 7fff434..eec4500 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ -0001-Correct-path-for-docs.patch +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 |