Change popularity-contest to report the popularity-contest version

instead of the Debian release which is not reliable.

debian/changelog

@@ -7,8 +7,10 @@ popularity-contest (1.19) unreleased; urgency=low
     - French typo corrected
   * Bill Allombert
     - Update server-side scripts to current popcon.debian.org version.
+    - Change popularity-contest to report the popularity-contest version
+      instead of the Debian release which is not reliable.
 
- -- Christian Perrier <bubulle@debian.org>  Thu,  6 May 2004 06:36:02 +0200
+ -- Bill Allombert <ballombe@debian.org>  Fri, 14 May 2004 11:35:30 +0200
 
 popularity-contest (1.18) unstable; urgency=low
 

popanal.py

@@ -199,8 +199,8 @@ def read_submissions(stream):
 	    ewrite('#%s' % subcount)
 	    e = Submission(0, header['ID'], header['TIME'])
 
-            if header.has_key('DEBVER'):
-	        e.release = header['DEBVER']
+            if header.has_key('POPCONVER'):
+	        e.release = header['POPCONVER']
 	
             if header.has_key('ARCH'):
 	    	if header['ARCH']=='x86_64':

popularity-contest

@@ -58,14 +58,8 @@ if ( $HOSTID !~ /^([a-f0-9]{32})$/)
 my $debarch = `dpkg --print-installation-architecture`;
 chomp $debarch;
 
-# Fetch debian version number.  Example values are "3.0" and
-# "testing/unstable"
-my $debver;
-if ( -e "/etc/debian_version" && open(RELEASEFILE, "</etc/debian_version")) {
-    $debver = <RELEASEFILE>;
-    chomp $debver;
-    close(RELEASEFILE);
-}
+# Popcon release
+my $popconver=`dpkg-query --showformat='\${version}' --show popularity-contest`;
 
 # Initialise time computations
 
@@ -123,7 +117,7 @@ close PACKAGES;
 # add a header/footer.
 	
 print "POPULARITY-CONTEST-0 TIME:",time," ID:$HOSTID ".
-    "ARCH:$debarch DEBVER:$debver\n";
+    "ARCH:$debarch POPCONVER:$popconver\n";
 
 for (sort { $popcon{$b}[0] <=> $popcon{$a}[0] } keys %popcon)
 {