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

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

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

Modified Files:
	changelog config control postinst templates 
Log Message:
Enable HTTP transport on new installs, while keeping it disabled for existing installs.  Adjust changelog to reflect this.

Index: changelog
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/changelog,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- changelog	7 Jul 2005 06:48:39 -0000	1.215
+++ changelog	7 Jul 2005 07:23:28 -0000	1.216
@@ -3,6 +3,8 @@
   * Add support for reporting using http POST to a list of URLs.
     Uploading using content-type text/plain, content-encoding
     x-gzip, with 30 second timeout. (Closes: #239097)
+  * HTTP submissions are enabled by default for new installs, but
+    disabled by default for upgrades.
   * New client script /usr/share/popularity-contest/popcon-upload.
   * New server CGI /usr/share/doc/popularity-contest/popcon.cgi.
   * Added simple FAQ entry about the http POST feature.
@@ -17,11 +19,13 @@
     method used.
   * debian/cron.weekly:
     - Try to run /usr/share/popularity-contest/popcon-upload if
-      USEHTTP is enabled, disabled by default.
+      USEHTTP is enabled
     - Do not send email if http POST method was successfull.
-    - Do not run sendmail if it is not available.  This will make it
-      possible to downgrade mail-transport-agent from Depend to
-      Recommends if we enable HTTP submissoin by default.
+    - Do not run sendmail if it is not available, to work without
+      mail-transport-agent.  Redused depend on mail-transport-agent to
+      recommends, as the default for new installs is HTTP, and
+      existing installations are expected to already have
+      mail-transport-agent installed.
   * Depend on ${misc:Depends} instead of debconf, to get the updated
     debconf dependency.
   * Rewrote popularity-contest to use dpkg-awk if dpkg-query is

Index: config
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/config,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- config	6 Jul 2005 14:48:37 -0000	1.9
+++ config	7 Jul 2005 07:23:28 -0000	1.10
@@ -2,10 +2,21 @@
 
 set -e
 
+conffile=/etc/popularity-contest.conf
+
 . /usr/share/debconf/confmodule
 
-if [ -f /etc/popularity-contest.conf ] ; then
-       . /etc/popularity-contest.conf
+if [ -f $conffile ] ; then
+       # Make sure the config file have the USEHTTP entry
+       if grep -q USEHTTP $conffile; then
+           :
+       else
+           # Assume existing installations do not want to use HTTP
+           # Changed below if the user asked for it.
+           echo "USEHTTP=\"no\"" >> $conffile
+       fi
+
+       . $conffile
        if [ yes = "$PARTICIPATE" ] ; then
                PARTICIPATE=true
        else

Index: control
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/control,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- control	5 Jul 2005 11:55:14 -0000	1.14
+++ control	7 Jul 2005 07:23:28 -0000	1.15
@@ -8,8 +8,8 @@
 
 Package: popularity-contest
 Architecture: all
-Depends: ${misc:Depends}, exim4 | mail-transport-agent, ${perl:Depends}
-Recommends: cron, mime-construct
+Depends: ${misc:Depends}, ${perl:Depends}
+Recommends: cron, exim4 | mail-transport-agent, mime-construct
 Suggests: anacron
 Provides: popcon
 Description: Vote for your favourite packages automatically

Index: postinst
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/postinst,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- postinst	4 Jul 2005 19:17:10 -0000	1.15
+++ postinst	7 Jul 2005 07:23:28 -0000	1.16
@@ -66,16 +66,6 @@
 	if [ ! -e $conffile ]; then
 	    generate_conffile
 	else
-	    # Make sure the config file have the USEHTTP entry if we
-	    # are to enable HTTP.
-	    if [ "yes" = "$USEHTTP" ] ; then
-		if grep -q USEHTTP $conffile; then
-		    :
-		else
-		    echo "USEHTTP=\"$USEHTTP\"" >> $conffile
-		fi
-	    fi
-
             OLDHOSTID="$MY_HOSTID";
             case $MY_HOSTID in
             # Workaround for bug #237874 triggered on hurd.  The

Index: templates
===================================================================
RCS file: /cvsroot/popcon/popularity-contest/debian/templates,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- templates	4 Jul 2005 06:54:04 -0000	1.13
+++ templates	7 Jul 2005 07:23:28 -0000	1.14
@@ -24,6 +24,6 @@
 
 Template: popularity-contest/use-http
 Type: boolean
-Default: false
+Default: true
 _Description: Use HTTP to submit reports?
  If you do not want to use HTTP, email is used instead.