[Popcon-commits] cvs commit to popularity-contest/debian by pere

[popcon-commits@lists.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory quantz:/tmp/cvs-serv13457

Modified Files:
	changelog config templates 
Log Message:
Drop the intro note, and show the explanation as part of the participate question.

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- changelog	25 Jan 2004 11:24:59 -0000	1.34
+++ changelog	25 Jan 2004 11:27:57 -0000	1.35
@@ -5,6 +5,8 @@
       Moto. (Closes: #229538)
     - Make sure /etc/popularity-contest.conf is readable by user
       nobody, no matter the umask of root.
+    - Drop the intro note, and show the explanation as part of the
+      participate question.
 
  -- Petter Reinholdtsen <pere@debian.org>  Sun, 25 Jan 2004 09:44:44 +0100
 

Index: config
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/config,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config	22 Jan 2004 23:10:40 -0000	1.3
+++ config	25 Jan 2004 11:27:57 -0000	1.4
@@ -14,9 +14,6 @@
        db_set popularity-contest/participate "$PARTICIPATE"
 fi
 
-db_input medium popularity-contest/intro || [ $? -eq 30 ]
-db_go || true
-
 db_input medium popularity-contest/participate || [ $? -eq 30 ]
 db_go || true
 

Index: templates
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/templates,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- templates	23 Jan 2004 08:31:41 -0000	1.3
+++ templates	25 Jan 2004 11:27:57 -0000	1.4
@@ -1,6 +1,7 @@
-Template: popularity-contest/intro
-Type: note
-_Description: Debian Package Popularity Contest
+Template: popularity-contest/participate
+Type: boolean
+Default: false
+_Description: Participate in the Debian Package Popularity Contest?
  You can have your system anonymously e-mail the Debian developers with
  statistics about your most used Debian packages.
  .
@@ -9,21 +10,15 @@
  that the most popular packages are the ones which are installed
  automatically for new users.
  .
- If you choose to participate, the automatic submission script will run
- once every week automatically.
+ If you choose to participate, the automatic submission script will
+ run once every week automatically, e-mailing statistics to the Debian
+ developers.
  .
  You can always change your mind after making this decision:
  "dpkg-reconfigure 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/participate
-Type: boolean
-Default: false
-_Description: Do you want to participate?
- If you choose to participate, popularity-contest will run once every week
- automatically, e-mailing statistics to the Debian developers.
 
 Template: popularity-contest/update-mailto
 Type: boolean