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

[pere at cvs.alioth.debian.org]

Update of /cvsroot/popcon/popularity-contest/debian
In directory haydn:/tmp/cvs-serv15840/debian

Modified Files:
	changelog config postinst templates 
Log Message:
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)


Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.286
retrieving revision 1.287
diff -u -d -r1.286 -r1.287
--- changelog	29 Jul 2006 07:35:40 -0000	1.286
+++ changelog	29 Jul 2006 07:48:37 -0000	1.287
@@ -18,6 +18,10 @@
     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)

Index: config
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/config,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- config	7 Jul 2005 07:54:56 -0000	1.11
+++ config	29 Jul 2006 07:48:37 -0000	1.12
@@ -24,21 +24,7 @@
                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

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- postinst	7 Jul 2005 07:23:28 -0000	1.16
+++ postinst	29 Jul 2006 07:48:37 -0000	1.17
@@ -22,12 +22,6 @@
 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 @@
 		
 		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 @@
 
 	    sedopts=" \
 		s/^PARTICIPATE=.*$/PARTICIPATE=\"$PARTICIPATE\"/;   \
-		s/^USEHTTP=.*$/USEHTTP=\"$USEHTTP\"/;   \
 		s/^\(MAILTO=\"erich-survey at debian.org\"\)$/#\1/;    \
 		s/^\(MAILTO=\"apenwarr-survey at debian.org\"\)$/#\1/; \
 		s/^\(MAILTO=\"survey at popcon.debian.org\"\)$/#\1/;   \

Index: templates
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/templates,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- templates	28 Jul 2006 21:16:28 -0000	1.15
+++ templates	29 Jul 2006 07:48:37 -0000	1.16
@@ -22,9 +22,3 @@
  .
  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.