Browse Source

Remove the question asking if it is ok to edit MAILTO address,

and move the default values into /usr/share/popularity-contest.conf.
suites/ascii
Petter Reinholdtsen 19 years ago
parent
commit
935fbb7125
  1. 5
      debian/changelog
  2. 7
      debian/config
  3. 1
      debian/cron.weekly
  4. 12
      debian/po/de.po
  5. 12
      debian/po/es.po
  6. 12
      debian/po/fr.po
  7. 21
      debian/po/ja.po
  8. 12
      debian/po/nl.po
  9. 37
      debian/po/no.po
  10. 12
      debian/po/pt_BR.po
  11. 12
      debian/po/templates.pot
  12. 71
      debian/postinst
  13. 2
      debian/rules
  14. 7
      debian/templates
  15. 38
      default.conf

5
debian/changelog

@ -8,8 +8,9 @@ popularity-contest (1.10) UNRELEASED; urgency=low
- Drop the intro note, and show the explanation as part of the
participate question. (Closes: #229573)
- Update Norwegian Bokmål debconf translation.
- Lower the priority from high to low for the question
asking if it is ok to edit MAILTO address. (Closes: #229288, #229111)
- Remove the question asking if it is ok to edit MAILTO address,
and move the default values into
/usr/share/popularity-contest.conf. (Closes: #229288, #229111)
* Bill Allombert
- Update server-side scripts to current popcon.debian.org version.

7
debian/config

@ -16,10 +16,3 @@ fi
db_input medium popularity-contest/participate || [ $? -eq 30 ]
db_go || true
# Ask if the old addresses should be changed to the new address.
if [ "$MAILTO" = "erich-survey@debian.org" -o \
"$MAILTO" = "apenwarr-survey@debian.org" ]; then
db_input low popularity-contest/update-mailto || [ $? -eq 30 ]
db_go || true
fi

1
debian/cron.weekly

@ -11,6 +11,7 @@ unset MY_HOSTID
unset PARTICIPATE
# get configuration information
. /usr/share/popularity-contest/default.conf
. /etc/popularity-contest.conf
# don't run if MAILTO address is blank!

12
debian/po/de.po

@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2003-06-24 21:20+0200\n"
"Last-Translator: Erich Schubert <erich@debian.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -80,16 +80,6 @@ msgstr ""
"(Hinweis: E-Mail-Server fügen eigene Rückverfolgungs-Angaben in die E-Mails "
"ein, während der Übertragung sind ihre Daten nicht anonym!)"
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr ""
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""
#~ msgid ""
#~ "If you choose to participate, the automatic submission script will run "
#~ "once every week automatically."

12
debian/po/es.po

@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2003-08-29 11:52+0100\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -81,16 +81,6 @@ msgstr ""
"rastreo, por lo que los datos no serán completamente anónimos durante la "
"transmisión)"
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr ""
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""
#~ msgid ""
#~ "If you choose to participate, the automatic submission script will run "
#~ "once every week automatically."

12
debian/po/fr.po

@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popularity-contest\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2003-06-17 10:26+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@ -81,16 +81,6 @@ msgstr ""
"qui leur sont propres. En conséquence, les données que vous envoyez ne "
"seront pas totalement anonymes pendant leur transfert)."
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr ""
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""
#~ msgid ""
#~ "If you choose to participate, the automatic submission script will run "
#~ "once every week automatically."

21
debian/po/ja.po

@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2004-01-25 21:13+0900\n"
"Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
"Language-Team: Japanese <debian-japanese@lists.debian.org>\n"
@ -53,7 +53,9 @@ msgstr ""
msgid ""
"If you choose to participate, the automatic submission script will run once "
"every week automatically, e-mailing statistics to the Debian developers."
msgstr "参加することを選ぶと、自動提出スクリプトが毎週 1 回自動的に実行され、Debian 開発者に統計が電子メールで送られます。"
msgstr ""
"参加することを選ぶと、自動提出スクリプトが毎週 1 回自動的に実行され、Debian "
"開発者に統計が電子メールで送られます。"
#. Description
#: ../templates:4
@ -73,13 +75,10 @@ msgstr ""
"(注意: 電子メールサーバは自身の追跡情報を追加し、通過中のデータは完全な匿名で"
"はありません)"
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr "宛先アドレスを最新のものに更新しますか?"
#~ msgid "Update mailto address to the current one?"
#~ msgstr "宛先アドレスを最新のものに更新しますか?"
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""
"popularity-contest のエントリを提出するメールアドレスが古くなっています。"
#~ msgid ""
#~ "The mail address used to submit popularity-contest entries is obsolete."
#~ msgstr ""
#~ "popularity-contest のエントリを提出するメールアドレスが古くなっています。"

12
debian/po/nl.po

@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popularity-contest\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2003-10-13 22:12+0100\n"
"Last-Translator: Bart Cornelis <cobaco@linux.be>\n"
"Language-Team: debian-l10n-dutch@lists.debian.org <debian-l10n-dutch@lists."
@ -81,16 +81,6 @@ msgstr ""
"(OPMERKING: email-servers voegen hun eigen volginformatie toe, dit betekent "
"dat uw gegevens niet volledig anoniem zijn tijdens het bezorgen.)"
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr ""
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""
#~ msgid ""
#~ "If you choose to participate, the automatic submission script will run "
#~ "once every week automatically."

37
debian/po/no.po

@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popularity-contest 1.8\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2004-01-25 12:33MET\n"
"Last-Translator: Petter Reinholdtsen <pere@hungry.com>\n"
"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
@ -33,9 +33,9 @@ msgid ""
"new users."
msgstr ""
"Denne informasjonen hjelper oss å ta beslutninger om hvilke pakker som bør "
"plasseres på den første Debian-CDen. I tillegg, så kan vi forbedre framtidige "
"versjoner av Debian slik at de mest populære pakkene er de som blir installert "
"automatisk for nye brukere."
"plasseres på den første Debian-CDen. I tillegg, så kan vi forbedre "
"framtidige versjoner av Debian slik at de mest populære pakkene er de som "
"blir installert automatisk for nye brukere."
#. Description
#: ../templates:4
@ -43,8 +43,9 @@ msgid ""
"If you choose to participate, the automatic submission script will run once "
"every week automatically, e-mailing statistics to the Debian developers."
msgstr ""
"Hvis du velger å delta, så vil et automatisk innsendings-skript kjøre automatisk "
"en gang i uka, og sende statistikken på email til Debian-utviklerne."
"Hvis du velger å delta, så vil et automatisk innsendings-skript kjøre "
"automatisk en gang i uka, og sende statistikken på email til Debian-"
"utviklerne."
#. Description
#: ../templates:4
@ -52,8 +53,8 @@ msgid ""
"You can always change your mind after making this decision: \"dpkg-"
"reconfigure popularity-contest\""
msgstr ""
"Du kan alltid endre mening etter å ha tatt denne avgjørelsen: "
"\"dpkg-reconfigure popularity-contest\""
"Du kan alltid endre mening etter å ha tatt denne avgjørelsen: \"dpkg-"
"reconfigure popularity-contest\""
#. Description
#: ../templates:4
@ -61,16 +62,14 @@ msgid ""
"(NOTE: e-mail servers add their own tracing information and your data won't "
"be completely anonymous while in transit.)"
msgstr ""
"(MERK: email-tjeneren legger inn deres egen sporings-informasjon, slik "
"at dine data ikke vil være fullstendig anonyme under sending.)"
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr "Oppdater mailto-adressen til den gjeldende adressen?"
"(MERK: email-tjeneren legger inn deres egen sporings-informasjon, slik at "
"dine data ikke vil være fullstendig anonyme under sending.)"
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr "Mail-adressen som brukes for å sende inn til popularity-contest er foreldet."
#~ msgid "Update mailto address to the current one?"
#~ msgstr "Oppdater mailto-adressen til den gjeldende adressen?"
#~ msgid ""
#~ "The mail address used to submit popularity-contest entries is obsolete."
#~ msgstr ""
#~ "Mail-adressen som brukes for å sende inn til popularity-contest er "
#~ "foreldet."

12
debian/po/pt_BR.po

@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: popularity-contest_1.3-1.1\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: 2003-04-06 13:40-0300\n"
"Last-Translator: André Luís Lopes <andrelop@ig.com.br>\n"
"Language-Team: Debian-BR Project <debian-l10n-portuguese@lists.debian.org>\n"
@ -81,16 +81,6 @@ msgstr ""
"rastreamento e seus dados não estarão completamente anônimos enquanto "
"estiverem em trânsito.)"
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr ""
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""
#~ msgid ""
#~ "If you choose to participate, the automatic submission script will run "
#~ "once every week automatically."

12
debian/po/templates.pot

@ -15,7 +15,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"POT-Creation-Date: 2004-01-25 12:26+0100\n"
"POT-Creation-Date: 2004-01-26 00:49+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -64,13 +64,3 @@ msgid ""
"(NOTE: e-mail servers add their own tracing information and your data won't "
"be completely anonymous while in transit.)"
msgstr ""
#. Description
#: ../templates:26
msgid "Update mailto address to the current one?"
msgstr ""
#. Description
#: ../templates:26
msgid "The mail address used to submit popularity-contest entries is obsolete."
msgstr ""

71
debian/postinst

@ -3,8 +3,6 @@
# Load debconf variables
. /usr/share/debconf/confmodule
OFFICIAL_MAILTO="survey@popcon.debian.org"
conffile=/etc/popularity-contest.conf
set -e
@ -14,9 +12,6 @@ if [ -e $conffile ] ; then
. $conffile
fi
if [ -z "$MAILTO" ] ; then
MAILTO="$OFFICIAL_MAILTO"
fi
if [ -z "$MY_HOSTID" ]; then
MY_HOSTID=`dd if=/dev/urandom bs=1k count=1 2>/dev/null | md5sum|sed 's/ -//'''`
fi
@ -32,64 +27,19 @@ else
PARTICIPATE="no"
fi
if [ "$MAILTO" = "erich-survey@debian.org" -o \
"$MAILTO" = "apenwarr-survey@debian.org" ]; then
db_get popularity-contest/update-mailto || true
if [ "true" = "$RET" ] ; then
MAILTO="$OFFICIAL_MAILTO"
fi
fi
generate_conffile() {
cat <<-EOF >$conffile
# Config file for Debian's popularity-contest package.
#
# To change this file, remove it and use:
# To change this file, use:
# dpkg-reconfigure popularity-contest
#
# You can also edit it by hand, if you so choose.
# MAILTO specifies the address to e-mail statistics to each week.
#
MAILTO="$MAILTO"
# See /usr/share/popularity-contest/default.conf for more info
# on the options.
# MY_HOSTID is a secret number that the popularity-contest receiver
# uses to keep track of your submissions. Whenever you send in a
# new entry, it overwrites the last one that had the same HOSTID.
#
# This key was generated automatically so you should normally just
# leave it alone.
#
MY_HOSTID="$MY_HOSTID"
# MAILFROM is the forged sender email address you want to use in
# email submitted to the popularity-contest. If this is commented
# out, no From: or Sender: lines will be added to the outgoing mail,
# and it will be your MTA's job to add them. This is usually what
# you want.
#
# If your MTA is misconfigured or impossible to configure correctly,
# and it always generates invalid From: and/or Sender: lines, you
# can force different results by setting MAILFROM here. This can
# cause problems with spam bouncers, so most people should leave it
# commented out.
#
EOF
if [ -z "$MAILFROM" ]; then
echo '#MAILFROM=root@nowhere.org' >> $conffile
else
echo "MAILFROM=$MAILFROM" >> $conffile
fi
cat <<-EOF >> $conffile
# PARTICIPATE can be one of "yes" or "no".
# If you don't want to participate in the contest, say "no"
# and we won't send messages.
#
# If this option is missing, the default is "no".
#
PARTICIPATE=$PARTICIPATE
EOF
# Make sure user nobody can read the file.
@ -101,9 +51,20 @@ case "$1" in
if [ ! -e $conffile ]; then
generate_conffile
else
# Replace if the value changed, to avoid changing the
# Replace only if the content changed, to avoid changing the
# config file date when no change was done.
if sed "s/^PARTICIPATE=.*$/PARTICIPATE=$PARTICIPATE/; s/^MAILTO=.*$/MAILTO=\"$MAILTO\"/" < $conffile > $conffile.new &&
# Commenting out the obsolete addresses, to use the
# default config from /usr/share/ on hosts where
# the old default was unchanged
if sed " \
s/^PARTICIPATE=.*$/PARTICIPATE=\"$PARTICIPATE\"/; \
s/^\(MAILTO=\"erich-survey@debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"apenwarr-survey@debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"survey@popcon.debian.org\"\)$/#\1/; \
" < $conffile > $conffile.new &&
! cmp $conffile $conffile.new > /dev/null; then
mv $conffile.new $conffile
# Make sure user nobody can read the file.

2
debian/rules

@ -24,8 +24,10 @@ install:
# Add here commands to install the package into debian/tmp.
install -d debian/tmp/usr/sbin/
install -d debian/tmp/etc/
install -d debian/tmp/usr/share/popularity-contest/
install popularity-contest debian/tmp/usr/sbin/
install popcon-largest-unused debian/tmp/usr/sbin/
install -m 644 default.conf debian/tmp/usr/share/popularity-contest/
# Build architecture-independent files here.
binary-indep: build install

7
debian/templates

@ -19,10 +19,3 @@ _Description: Participate in the Debian Package Popularity Contest?
.
(NOTE: e-mail servers add their own tracing information and your data
won't be completely anonymous while in transit.)
Template: popularity-contest/update-mailto
Type: boolean
Default: true
_Description: Update mailto address to the current one?
The mail address used to submit popularity-contest entries
is obsolete.

38
default.conf

@ -0,0 +1,38 @@
# Default config file for Debian's popularity-contest package.
#
# Local overrides are in /etc/popularity-contest.conf
# PARTICIPATE can be one of "yes" or "no".
# If you don't want to participate in the contest, say "no"
# and we won't send messages.
#
# If this option is missing, the default is "no".
#
PARTICIPATE="no"
# MAILTO specifies the address to e-mail statistics to each week.
#
MAILTO="survey@popcon.debian.org"
# MAILFROM is the forged sender email address you want to use in
# email submitted to the popularity-contest. If this is commented
# out, no From: or Sender: lines will be added to the outgoing mail,
# and it will be your MTA's job to add them. This is usually what
# you want.
#
# If your MTA is misconfigured or impossible to configure correctly,
# and it always generates invalid From: and/or Sender: lines, you
# can force different results by setting MAILFROM here. This can
# cause problems with spam bouncers, so most people should leave it
# commented out.
#
#MAILFROM="root@nowhere.org"
# MY_HOSTID is a secret number that the popularity-contest receiver
# uses to keep track of your submissions. Whenever you send in a
# new entry, it overwrites the last one that had the same HOSTID.
#
# This key was generated automatically so you should normally just
# leave it alone.
#
#MY_HOSTID="_ID_"
Loading…
Cancel
Save