diff -Nru youtube-dl-2021.12.17/debian/changelog youtube-dl-2021.12.17/debian/changelog --- youtube-dl-2021.12.17/debian/changelog 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/changelog 2023-01-03 22:21:53.000000000 +0000 @@ -1,3 +1,20 @@ +youtube-dl (2021.12.17-2) unstable; urgency=low + + [ Andres Salomon ] + * Add myself as an uploader. + * Drop our build-dep on python3-nose, along with most of the other + build-deps (closes: #1018674). + * Depend upon the yt-dlp package, and stop actually building youtube-dl. + Youtube-dl is in maintenance mode upstream, and active development is + happening with the yt-dlp fork (closes: #994151). + * Document the above in a NEWS entry. + * Move to section oldlibs. + + [ Andreas Tille ] + * Fix watch file + + -- Andres Salomon Tue, 03 Jan 2023 17:21:53 -0500 + youtube-dl (2021.12.17-1) unstable; urgency=medium * Recommends: python3-pycryptodome diff -Nru youtube-dl-2021.12.17/debian/control youtube-dl-2021.12.17/debian/control --- youtube-dl-2021.12.17/debian/control 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/control 2023-01-03 22:21:53.000000000 +0000 @@ -1,20 +1,10 @@ Source: youtube-dl Maintainer: Andreas Tille -Section: web +Uploaders: Andres Salomon +Section: oldlibs Priority: optional Build-Depends: - bash-completion, debhelper-compat (= 13), - dh-exec, - dh-python, - flake8 , - pandoc, - python3-nose , - python3-pkg-resources, - python3-setuptools, - zip -Build-Depends-Indep: - python3 Rules-Requires-Root: no Standards-Version: 4.6.0 Vcs-Browser: https://salsa.debian.org/debian/youtube-dl @@ -24,9 +14,8 @@ Package: youtube-dl Architecture: all Depends: - python3-pkg-resources, - ${misc:Depends}, - ${python3:Depends} + yt-dlp, + ${misc:Depends} Recommends: aria2 | wget | curl, ca-certificates, @@ -38,7 +27,7 @@ Suggests: libfribidi-bin | bidiv, phantomjs -Description: downloader of videos from YouTube and other sites +Description: download videos from YouTube and other sites (transitional package) youtube-dl is a small command-line program to download videos from YouTube.com and other sites that don't provide direct links to the videos served. diff -Nru youtube-dl-2021.12.17/debian/NEWS youtube-dl-2021.12.17/debian/NEWS --- youtube-dl-2021.12.17/debian/NEWS 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/NEWS 2023-01-03 22:21:53.000000000 +0000 @@ -1,3 +1,29 @@ +youtube-dl (2021.12.17-2) unstable; urgency=low + + The youtube-dl project has been forked, and new development is + happening under the yt-dlp project. We plan to completely remove + the youtube-dl package after the Debian 12 (bookworm) release. + + For the bookworm release, we're turning youtube-dl into an empty + package that depends on yt-dlp. Most package dependencies in Debian + are already aware of yt-dlp and will happily use it if available. However, + *USER SCRIPTS WILL BREAK AND NEED TO BE MANUALLY UPDATED BY ADMINS & USERS!* + We are not providing any kind of wrapper script, symlink, or wrapper + module due to behavioral changes and namespace issues between the two + programs. + + In the vast majority of cases, you can simply replace "youtube-dl" + with "yt-dlp" in scripts. However, if you were using a bunch of + arguments, had config files, were using the downloaded files in other + programs/scripts, or just want to revert behavior, be sure to read the + yt-dlp man page section "Differences in default behavior". Passing the + argument "--compat-options youtube-dl" to yt-dlp may be enough to + revert behavior, but yt-dlp will still have some subtle differences. + + Be sure to test your scripts thoroughly with yt-dlp! + + -- Andres Salomon Tue, 03 Jan 2023 17:21:53 -0500 + youtube-dl (2015.06.04.1-1) unstable; urgency=medium Starting with Debian's version 2015.06.04.1-1, the handling of video diff -Nru youtube-dl-2021.12.17/debian/rules youtube-dl-2021.12.17/debian/rules --- youtube-dl-2021.12.17/debian/rules 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/rules 2022-12-15 09:24:11.000000000 +0000 @@ -1,21 +1,33 @@ #!/usr/bin/make -f #export DH_VERBOSE = 1 -export PYBUILD_NAME = youtube_dl -export PATH := $(CURDIR)/debian/utils:$(PATH) +#export PYBUILD_NAME = youtube_dl +#export PATH := $(CURDIR)/debian/utils:$(PATH) %: - dh $@ --with python3 --buildsystem=pybuild --with bash-completion + dh $@ -override_dh_auto_configure: - PREFIX=/usr SYSCONFDIR=/etc make - rm youtube-dl - -override_dh_clean: - make clean - dh_clean +override_dh_auto_build: + @echo hi mom! + +override_dh_auto_install: + @echo hi dad! + +override_dh_auto_clean: + @echo + +#%: +# dh $@ --with python3 --buildsystem=pybuild --with bash-completion +# +#override_dh_auto_configure: +# PREFIX=/usr SYSCONFDIR=/etc make +# rm youtube-dl +# +#override_dh_clean: +# make clean +# dh_clean override_dh_auto_test: -ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS))) +ifeq (1,0) make offlinetest PYTHON=python3 endif diff -Nru youtube-dl-2021.12.17/debian/watch youtube-dl-2021.12.17/debian/watch --- youtube-dl-2021.12.17/debian/watch 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/watch 2022-12-14 23:18:58.000000000 +0000 @@ -1,4 +1,3 @@ version=4 -opts="dversionmangle=s/\+dfsg\d*$//,pgpsigurlmangle=s/$/.sig/" \ -https://github.com/ytdl-org/youtube-dl/releases \ - (?:.*?/)?v?youtube-dl-(\d[\d.]*)\.tar\.gz +opts="dversionmangle=s/\+dfsg\d*$//,pgpsigurlmangle=s/$/.sig/,filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%@PACKAGE@-$1.tar.gz%" \ +https://github.com/ytdl-org/youtube-dl/tags (?:.*?/)?v?(\d[\d.]*)\.tar\.gz diff -Nru youtube-dl-2021.12.17/debian/youtube-dl.docs youtube-dl-2021.12.17/debian/youtube-dl.docs --- youtube-dl-2021.12.17/debian/youtube-dl.docs 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/youtube-dl.docs 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -README.txt diff -Nru youtube-dl-2021.12.17/debian/youtube-dl.install youtube-dl-2021.12.17/debian/youtube-dl.install --- youtube-dl-2021.12.17/debian/youtube-dl.install 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/youtube-dl.install 1970-01-01 00:00:00.000000000 +0000 @@ -1,3 +0,0 @@ -#!/usr/bin/dh-exec -youtube-dl.fish usr/share/fish/completions -youtube-dl.zsh => usr/share/zsh/vendor-completions/_youtube-dl diff -Nru youtube-dl-2021.12.17/debian/youtube-dl.manpages youtube-dl-2021.12.17/debian/youtube-dl.manpages --- youtube-dl-2021.12.17/debian/youtube-dl.manpages 2021-12-19 15:37:43.000000000 +0000 +++ youtube-dl-2021.12.17/debian/youtube-dl.manpages 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -youtube-dl.1