This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=9587f37596bd197fcfc9f7ef0c63373f14d0a56a commit 9587f37596bd197fcfc9f7ef0c63373f14d0a56a (HEAD -> main) Author: Guillem Jover <[email protected]> AuthorDate: Fri Oct 14 22:54:22 2022 +0200 dselect: Clarify non-free section as optional not free software component Reword the existing note on the media method to clarify the non-free section might not be present in Debian media distributions, and mention the reasons why (due to its licensing). Add the same note to the file method, and clarify its method description. Closes: #30972 --- dselect/methods/file/desc.file | 4 ++-- dselect/methods/file/setup.sh | 10 ++++++++++ dselect/methods/media/setup.sh | 11 ++++++----- 3 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dselect/methods/file/desc.file b/dselect/methods/file/desc.file index a2ceaf363..5f5acf91e 100644 --- a/dselect/methods/file/desc.file +++ b/dselect/methods/file/desc.file @@ -1,8 +1,8 @@ Installation from a directory on the filesystem. The area you are installing from should contain the Packages.gz file -from each distribution area being installed (usually main, contrib -and non-free) as well as the corresponding binary/*/*.deb files. +from each distribution area being installed (usually main and optionally +contrib and non-free) as well as the corresponding binary/*/*.deb files. The easiest way to do get this is to make a (partial) copy of the distribution site's directory hierarchy, if possible. diff --git a/dselect/methods/file/setup.sh b/dselect/methods/file/setup.sh index b0a721df7..2f04aa2ea 100755 --- a/dselect/methods/file/setup.sh +++ b/dselect/methods/file/setup.sh @@ -185,6 +185,16 @@ find_area () { echo " Note: By default there is no 'local' directory. It is intended for packages you made yourself." + fi + if [ $2 = nf -a -z "$this_binary" ]; then + echo " +Note: most media distributions of Debian do not include programs available +in the 'non-free' directory of the distribution site. +This is because these programs are under licenses that do not allow source +modification or prevent distribution for profit on a media, or other +restrictions that make them not free software. +If you wish to install these programs you will have to get them from an +alternative source." fi while [ -z "$this_binary" ]; do defaultbinary="$4" diff --git a/dselect/methods/media/setup.sh b/dselect/methods/media/setup.sh index 761a75fea..aad55a111 100755 --- a/dselect/methods/media/setup.sh +++ b/dselect/methods/media/setup.sh @@ -356,11 +356,12 @@ find_area () { fi if [ $2 = nf -a -z "$this_binary" ]; then echo " -Note: most media distributions of Debian do not include programs -available in the 'non-free' directory of the distribution site. -This is because these programs have copyrights that prevent -distribution for profit on a media - that is they are not free software. -If you wish to install these programs you'll have to get them from an +Note: most media distributions of Debian do not include programs available +in the 'non-free' directory of the distribution site. +This is because these programs are under licenses that do not allow source +modification or prevent distribution for profit on a media, or other +restrictions that make them not free software. +If you wish to install these programs you will have to get them from an alternative source." fi while [ -z "$this_binary" ]; do -- Dpkg.Org's dpkg
