Browse Source

Remove question about submission method (http/smtp). The HTTP

method is and should be the primary submit method for new
installations, and existing installations will continue to only
use SMTP.  This removes the unclear question. (Closes: #317527)
suites/ascii
Petter Reinholdtsen 16 years ago
parent
commit
8d7408cf2e
  1. 4
      debian/changelog
  2. 14
      debian/config
  3. 9
      debian/postinst
  4. 6
      debian/templates

4
debian/changelog

@ -18,6 +18,10 @@ popularity-contest (1.34) UNRELEASED; urgency=low
is. Based on patch from Thijs Kinkhorst. (Closes: #361840)
* Change the default HTTP submission setting, from no to yes. It is
well tested and work fine.
* Remove question about submission method (http/smtp). The HTTP
method is and should be the primary submit method for new
installations, and existing installations will continue to only
use SMTP. This removes the unclear question. (Closes: #317527)
[ Christian Perrier ]
- Updated Khmer by Khoem Sokhem. (Closes: #359672)

14
debian/config

@ -24,21 +24,7 @@ if [ -f $conffile ] ; then
PARTICIPATE=false
fi
db_set popularity-contest/participate "$PARTICIPATE"
if [ yes = "$USEHTTP" ] ; then
USEHTTP=true
else
USEHTTP=false
fi
db_set popularity-contest/use-http "$USEHTTP"
fi
db_input high popularity-contest/participate || [ $? -eq 30 ]
db_go || true
# Only ask about the method if the user want to participate.
db_get popularity-contest/participate || true
if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
db_input low popularity-contest/use-http || [ $? -eq 30 ]
db_go || true
fi

9
debian/postinst

@ -22,12 +22,6 @@ if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
else
PARTICIPATE="no"
fi
db_get popularity-contest/use-http || true
if [ "$RET" = "yes" ] || [ "$RET" = "YES" ] || [ "$RET" = "true" ]; then
USEHTTP="yes"
else
USEHTTP="no"
fi
# The md5 sum of an empty file
EMPTYID="d41d8cd98f00b204e9800998ecf8427e"
@ -55,7 +49,7 @@ generate_conffile() {
MY_HOSTID="$MY_HOSTID"
PARTICIPATE="$PARTICIPATE"
USEHTTP="$USEHTTP"
USEHTTP="yes"
EOF
# Make sure user nobody can read the file.
chmod a+r $conffile
@ -85,7 +79,6 @@ case "$1" in
sedopts=" \
s/^PARTICIPATE=.*$/PARTICIPATE=\"$PARTICIPATE\"/; \
s/^USEHTTP=.*$/USEHTTP=\"$USEHTTP\"/; \
s/^\(MAILTO=\"erich-survey@debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"apenwarr-survey@debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"survey@popcon.debian.org\"\)$/#\1/; \

6
debian/templates

@ -22,9 +22,3 @@ _Description: Generating unique host identifier failed
.
Please report this problem as a bug against the popularity-contest
package, and include information about your configuration.
Template: popularity-contest/use-http
Type: boolean
Default: true
_Description: Use HTTP to submit reports?
If you do not want to use HTTP, email is used instead.

Loading…
Cancel
Save