From 2ce97f44afbf89538c266d15268e3be43613d3a1 Mon Sep 17 00:00:00 2001
From: Bill Allombert <ballombe@debian.org>
Date: Wed, 30 Mar 2011 15:22:04 +0000
Subject: [PATCH] sync with popcon.debian.org version: rename
 all-popcon-results.txt.gz to all-popcon-results.gz to avoid issues with
 content negotiation.

---
 debian/changelog  | 3 +++
 popcon-process.sh | 8 ++++----
 popcon-stat.pl    | 6 +++---
 popcon.pl         | 4 ++--
 prepop.pl         | 2 +-
 5 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40ca5fa..e0aedeb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,9 @@ popularity-contest (1.52) UNRELEASED; urgency=low
     Patch from Vagrant Cascadian. Closes: #610876 
   * FAQ: document how to disable sending report by email. Thanks, Ryo Furue.
     Closes: #502159
+  * prepop.pl popcon-stat.pl popcon-process.sh popcon.pl:
+    - sync with popcon.debian.org version: rename all-popcon-results.txt.gz to
+      all-popcon-results.gz to avoid issues with content negotiation.
 
  -- Bill Allombert <ballombe@debian.org>  Sun, 20 Mar 2011 13:31:30 +0100
 
diff --git a/popcon-process.sh b/popcon-process.sh
index 50d1966..bdd5c93 100755
--- a/popcon-process.sh
+++ b/popcon-process.sh
@@ -35,12 +35,12 @@ find $DATADIR -type f -mtime +$DAYLIMIT -print0 | xargs -0 rm -f --
 # Generate statistics
 find $DATADIR -type f | xargs cat \
         | nice -15 $BINDIR/popanal.py >$LOGDIR/popanal.out 2>&1
-cp results $WEBDIR/all-popcon-results.txt
-gzip -f $WEBDIR/all-popcon-results.txt
-cp $WEBDIR/all-popcon-results.txt.gz $SUMMARYDIR/popcon-`date +"%Y-%m-%d"`.gz
+cp results $WEBDIR/all-popcon-results
+gzip -f $WEBDIR/all-popcon-results
+cp $WEBDIR/all-popcon-results.gz $SUMMARYDIR/popcon-`date +"%Y-%m-%d"`.gz
 
 cd ../popcon-stat
-find $SUMMARYDIR -type f -print | sort | $BINDIR/popcon-stat.pl
+find $SUMMARYDIR -type f -print | sort | $BINDIR/popcon-stat.pl >$LOGDIR/popstat.log 2>&1 
 
 cd ../popcon-web
 $BINDIR/popcon.pl >$LOGDIR/popcon.log 2>$LOGDIR/popcon.errors
diff --git a/popcon-stat.pl b/popcon-stat.pl
index da64baf..ba57176 100644
--- a/popcon-stat.pl
+++ b/popcon-stat.pl
@@ -102,7 +102,7 @@ sub submission_chart
   $obj->png ("$dirpng/submission$pngname.png", \@data);
 }
 
-submission_chart ("","0000-00-00",42,"");
+submission_chart ("","0000-00-00",63,"");
 submission_chart ("-1year",$oneyearago,14,"(last 12 months)");
 
 use Chart::Composite;
@@ -126,7 +126,7 @@ for $arch (@arch)
   $obj->set ('brush_size' => 3);
   $obj->set ('pt_size' => 7);
   $obj->set ('x_ticks' => 'vertical');
-  $obj->set ('skip_x_ticks' => 42);
+  $obj->set ('skip_x_ticks' => 63);
   $obj->set ('composite_info' => [ ['LinesPoints', [1]], ['LinesPoints', [2] ] ]); 
   $obj->png ("$dirpng/sub-$arch.png", \@data);
 }
@@ -164,5 +164,5 @@ sub release_chart
   $obj->set ('skip_x_ticks' => $ticks);
   $obj->png ("$dirpng/release$pngname.png", \@data);
 }
-release_chart ("","2004-05-14",42,"");
+release_chart ("","2004-05-14",63,"");
 release_chart ("-1year",$oneyearago,14,"(last 12 months)");
diff --git a/popcon.pl b/popcon.pl
index 2c5bd4d..cb6a27a 100755
--- a/popcon.pl
+++ b/popcon.pl
@@ -4,7 +4,7 @@ $results="../popcon-mail/results";
 $popcon="../www";
 my $mirrorbase = "/org/ftp.debian.org/ftp";
 my $docurlbase = "";
-%popconver=("1.28" => "sarge", "1.41" => "etch", "1.46" => "lenny");
+%popconver=("1.28" => "sarge", "1.41" => "etch", "1.46" => "lenny", "1.49" => "squeeze");
 %popver=();
 
 sub htmlheader
@@ -498,7 +498,7 @@ EOF
 <p>
 EOF
 
-	print HTML "<a href=\"all-popcon-results.txt.gz\">Raw popularity-contest results</a>\n";
+	print HTML "<a href=\"all-popcon-results.gz\">Raw popularity-contest results</a>\n";
 	&htmlfooter;
 	close HTML;
 }
diff --git a/prepop.pl b/prepop.pl
index 64d21dd..ba81e61 100755
--- a/prepop.pl
+++ b/prepop.pl
@@ -75,5 +75,5 @@ if ($state eq 'accept')
 {
         close REPORT;
         unlink $file; #Reject
-        print STDERR "Bad report $file\n";
+        print STDERR "Bad last report $file\n";
 }