Bug#209403: apt-setup: Change logic for asking about 'contrib'

[Dylan Thurston <dpt@exoskeleton.math.harvard.edu>]

Package: base-config
Version: 1.70
Severity: wishlist

In apt-setup, I think the logic for whether to ask about contrib should be
changed.   Currently, the logic follows this comment:
                # If they choose to use non-free, ask about contrib, with a
                # default of yes. Doesn't seem to make much sense to even ask,
		# otherwise.
On the contrary, I think that you should ask about contrib only if they said
'no' to the non-free question: there are packages in contrib that, e.g., only
have non-free build dependencies (OpenOffice is a notable example) and some
users may wish to install that.  On the other hand, if they said 'yes' to
non-free, I can't conceive of any reason why they would not also want contrib,
so I would suggest assuming 'yes' in this case.

(The priority should remain low and the default should be 'no', of course.)

Peace,
	Dylan

-- System Information:
Debian Release: testing/unstable
Architecture: i386
Kernel: Linux petunia 2.4.16 #2 Fri Dec 21 16:12:08 EST 2001 i686
Locale: LANG=C, LC_CTYPE=C

Versions of packages base-config depends on:
ii  adduser                 3.51             Add and remove users and groups
ii  apt                     0.5.10           Advanced front-end for dpkg
ii  bsdutils                1:2.11z-5        Basic utilities from 4.4BSD-Lite
ii  console-data            2002.12.04dbs-16 Keymaps, fonts, charset maps, fall
ii  console-tools           1:0.2.3dbs-41    Linux console and font utilities
ii  debconf                 1.3.13           Debian configuration management sy
ii  passwd                  1:4.0.3-10       Change and administer password and

-- debconf information:
  tzconfig/select_zone: 
  tzconfig/verify_choices: 
* apt-setup/another: false
  base-config/start-display-manager: true
  apt-setup/directory: /debian
* apt-setup/cd/another: false
  apt-setup/badedit: 
  apt-setup/baddir: 
  apt-setup/hostname: 
  tzconfig/gmt: true
  apt-setup/contrib: false
  apt-setup/non-us-failed: 
  tzconfig/geographic_area: 
  apt-setup/cd/dev: /dev/cdrom
  apt-setup/country: United States
  apt-setup/uri_type: cdrom
  apt-setup/not-mirror: 
  base-config/retry-ppp: true
  apt-setup/security-updates-failed: 
  base-config/pkgsel-short: done
  apt-setup/cd/bad: 
  base-config/intro: 
  apt-setup/security-updates: true
  base-config/run-tasksel: true
  base-config/stop-ppp: true
  apt-setup/mirror: http.us.debian.org
  base-config/install-problem: true
  tzconfig/change_timezone: false
  base-config/pkgsel: 
  apt-setup/non-free: false
  apt-setup/non-us: true
  base-config/login: 
  base-config/run-dselect: false
  apt-setup/http_proxy: 
  base-config/dselect: 
* base-config/remove-pcmcia: true
  apt-setup/badsource: 
* base-config/use-ppp: false
  base-config/get-hostname: ${HOSTNAME}
  base-config/login-with-tty: 
  apt-setup/distribution: stable
  base-config/invalid-hostname: