merged contrib and main (still honors votes over insts)

2003-07-24 17:06:52 +00:00 · 2003-07-24 17:06:52 +00:00 · 762c0107f9
parent 4ad8f25184
commit 762c0107f9
2 changed files with 13376 additions and 13376 deletions
--- a/tasks/README
+++ b/tasks/README
@ -15,7 +15,7 @@ Popularity contest results:

 wget http://people.debian.org/~ballombe/popcon/main/by_vote
 wget http://people.debian.org/~ballombe/popcon/contrib/by_vote
- awk '/^[0-9]+ +[0-9a-z]/ {print $2}' by_vote by_vote.1
+ awk '/^[0-9]+ +[0-9a-z]/ {print $4 " " $2}' by_vote by_vote.1 | sort -nr | cut -d\  -f2

 -----

--- a/tasks/popularity-contest-sarge
+++ b/tasks/popularity-contest-sarge