Browse Source

merged suites/ascii into suites/unstable

suites/unstable
KatolaZ 3 years ago
parent
commit
c6f28ed993
  1. 67
      debian/changelog
  2. 13
      debian/control
  3. 1
      debian/postinst
  4. 1
      debian/rules
  5. 2
      debian/templates
  6. 11
      default.conf
  7. BIN
      devuan-popcon.gpg
  8. 31
      examples/bin/popcon.pl
  9. 10
      examples/cgi-bin/popcon.cgi

67
debian/changelog

@ -1,3 +1,21 @@
popularity-contest (1.64-5+devuan1.1) unstable; urgency=medium
* updated ascii version to use Devaun popcon
-- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Tue, 30 May 2017 22:30:04 +0100
popularity-contest (1.64-5+devuan1.1) unstable; urgency=medium
* merged changes from jessie
-- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Tue, 30 May 2017 22:22:26 +0100
popularity-contest (1.64-4+devuan.ascii) unstable; urgency=medium
* add git build dependency
-- Daniel Reurich <daniel@centurion.net.nz> Wed, 16 Mar 2016 23:12:12 +0000
popularity-contest (1.64-4+devuan.ceres) unstable; urgency=medium
* add git build dependency
@ -87,6 +105,55 @@ popularity-contest (1.62) unstable; urgency=low
-- Bill Allombert <ballombe@debian.org> Mon, 27 Apr 2015 17:10:46 +0200
popularity-contest (1.61-4+devuan1.2) unstable; urgency=medium
[ KatolaZ ]
* Correct keyring
-- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Fri, 19 May 2017 07:46:34 +0100
popularity-contest (1.61-4+devuan1.1) unstable; urgency=medium
[ KatolaZ ]
* small changes in debian/control
-- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Thu, 18 May 2017 10:44:31 +0100
popularity-contest (1.61-4+devuan1.1) unstable; urgency=medium
[ KatolaZ ]
* replaced email address and key IDs where necessary
* some more rebranding
-- Vincenzo (KatolaZ) Nicosia <katolaz@freaknet.org> Thu, 18 May 2017 10:41:15 +0100
popularity-contest (1.61-4+devuan) unstable; urgency=medium
* add git build dependency
-- Daniel Reurich <daniel@centurion.net.nz> Wed, 16 Mar 2016 23:24:38 +0000
popularity-contest (1.61-3+devuan) unstable; urgency=medium
* set source format to git
* added debian-popcon.gpg
* Revert "use gpg to import debian-popcon.gpg" * NB: we include debian-popcon.gpg This reverts commit 09e1906d37095a04a980fdebfef2abba2f78ea38.
-- Daniel Reurich <daniel@centurion.net.nz> Wed, 16 Mar 2016 22:43:36 +0000
popularity-contest (1.61-2+devuan) unstable; urgency=medium
* use gpg to import debian-popcon.gpg
-- Daniel Reurich <daniel@centurion.net.nz> Wed, 16 Mar 2016 21:26:32 +0000
popularity-contest (1.61-1+devuan) unstable; urgency=medium
* Update control file for Devuan release
-- Daniel Reurich <daniel@centurion.net.nz> Wed, 16 Mar 2016 12:42:12 +0000
popularity-contest (1.61) unstable; urgency=low
* Add support for IPv6. Closes: #730760. Thanks Bob Ham.

13
debian/control

@ -17,11 +17,10 @@ Suggests: anacron
Provides: popcon
Description: Vote for your favourite packages automatically
The popularity-contest package sets up a cron job that will
periodically anonymously submit to the Debian developers
statistics about the most used Debian packages on this system.
periodically anonymously submit to the Devuan developers
statistics about the most used packages on this system.
.
It also lets Devuan improve future versions of the distribution
so that the most popular packages are the ones which are
installed automatically for new users.
.
This information helps Debian make decisions such as which packages
should go on the first CD. It also lets Debian improve future versions
of the distribution so that the most popular packages are the ones which
are installed automatically for new users.

1
debian/postinst

@ -123,6 +123,7 @@ case "$1" in
s/^\(MAILTO=\"erich-survey@debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"apenwarr-survey@debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"survey@popcon.debian.org\"\)$/#\1/; \
s/^\(MAILTO=\"survey@popcon.devuan.org\"\)$/#\1/; \
"
if [ "$OLDHOSTID" != "$MY_HOSTID" ]; then
sedopts="$sedopts \

1
debian/rules

@ -30,6 +30,7 @@ install:
install popcon-largest-unused debian/popularity-contest/usr/sbin/
install -m 644 default.conf debian/popularity-contest/usr/share/popularity-contest/
install -m 644 debian-popcon.gpg debian/popularity-contest/usr/share/popularity-contest/
install -m 644 devuan-popcon.gpg debian/popularity-contest/usr/share/popularity-contest/
# Build architecture-independent files here.
binary-indep: build install

2
debian/templates

@ -9,7 +9,7 @@ _Description: Participate in the package usage survey?
.
If you choose to participate, the automatic submission script will
run once every week, sending statistics to the distribution developers.
The collected statistics can be viewed on http://popcon.debian.org/.
The collected statistics can be viewed on http://popcon.devuan.org/.
.
This choice can be later modified by running "dpkg-reconfigure
popularity-contest".

11
default.conf

@ -23,12 +23,15 @@ ENCRYPT="maybe"
# They should not be changed for proper operation with
# popcon.debian.org.
#
KEYRING="/usr/share/popularity-contest/debian-popcon.gpg"
POPCONKEY="4383FF7B81EEE66F"
#KEYRING="/usr/share/popularity-contest/debian-popcon.gpg"
#POPCONKEY="6672B9765BDF38A3"
KEYRING="/usr/share/popularity-contest/devuan-popcon.gpg"
POPCONKEY="983D40FCDA1FE63C"
# MAILTO specifies the address to e-mail statistics to each week.
#
MAILTO="survey@popcon.debian.org"
MAILTO="survey@popcon.devuan.org"
# MAILFROM is the forged sender email address you want to use in
# email submitted to the popularity-contest. If this is commented
@ -46,7 +49,7 @@ MAILTO="survey@popcon.debian.org"
# SUBMITURLS is a space separated list of where to submit
# popularity-contest reports using http.
SUBMITURLS="http://popcon.debian.org/cgi-bin/popcon.cgi"
SUBMITURLS="http://popcon.devuan.org/cgi-bin/popcon.cgi"
# USEHTTP enables http reporting. Set this to 'yes' to enable it.
USEHTTP="yes"

BIN
devuan-popcon.gpg

Binary file not shown.

31
examples/bin/popcon.pl

@ -60,16 +60,20 @@ sub htmlheader
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<title> Debian Popularity Contest </title>
<link rev="made" href="mailto:ballombe\@debian.org">
<title> Devuan Popularity Contest </title>
<!-- <link rev="made" href="mailto:ballombe\@debian.org">
<link href="http://www.debian.org/debian.css" rel="stylesheet" type="text/css">
-->
<link rel="shortcut icon" href="/favicon.ico">
</head>
<body>
<div id="header">
<div id="upperheader">
<div id="logo">
<a href="http://www.debian.org/" title="Debian Home"><img src="http://www.debian.org/Pics/openlogo-50.png" alt="Debian" width="50" height="61"></a>
<a href="http://www.devuan.org/" title="Devuan Home">
Devuan Home
<!-- <img src="http://www.debian.org/Pics/openlogo-50.png" alt="Devuan" width="50" height="61"> -->
</a>
</div> <!-- end logo -->
<p class="section"><a href="/">POPCON</a></p>
</div> <!-- end upperheader -->
@ -77,13 +81,12 @@ sub htmlheader
<div id="navbar">
<p class="hidecss"><a href="#content">Skip Quicknav</a></p>
<ul>
<li><a href="http://www.debian.org/intro/about">About Debian</a></li>
<li><a href="http://www.debian.org/distrib/">Getting Debian</a></li>
<li><a href="http://www.debian.org/support">Support</a></li>
<li><a href="http://www.debian.org/devel/">Developers' Corner</a></li>
<li><a href="https://devuan.org/os/">About Devuan</a></li>
<li><a href="http://www.devuan.org/distrib/">Getting Devuan</a></li>
<li><a href="https://devuan.org/os/development">Developers' Corner</a></li>
</ul>
</div> <!-- end navbar -->
<p id="breadcrumbs"><a href="http://popcon.debian.org/">Debian Popularity Contest</a>
<p id="breadcrumbs"><a href="http://popcon.devuan.org/">Devuan Popularity Contest</a>
&#x2F;
${report_label}</p>
</div> <!-- end header -->
@ -102,19 +105,19 @@ sub popconintro
&htmlheader($name, $sec);
print HTML <<"EOF";
<div id="content">
<h1>Debian Popularity Contest</h1>
<h1>Devuan Popularity Contest</h1>
<p> <em> The popularity contest project is an attempt to map the usage of
Debian packages. This site publishes the statistics gathered from report
sent by users of the <a
href="http://packages.debian.org/popularity-contest">popularity-contest</a>
Devuan packages. This site publishes the statistics gathered from report
sent by users of the
href="http://popcon.devuan.org">popularity-contest</a>
package. This package sends every week the list of packages installed and the
access time of relevant files to the server via email. Every day the server
anonymizes the result and publishes this survey.
For more information, read the <a href="${docurlbase}README">README</a> and the
<a href="${docurlbase}FAQ">FAQ</a>.
</em>
<p><em>To participate in this survey, install the <a href="http://packages.debian.org/popularity-contest">popularity-contest</a> package.</em> </p>
<p></p>
<p><em>To participate in this survey, install the <b>popularity-contest</b> package.</em> </p>
<p></p>
<form method="GET" action="http://qa.debian.org/popcon.php">Popcon statistics
for source package <input type="text" size="30" maxlength="80" name="package">
<input type="submit" value="Go">

10
examples/cgi-bin/popcon.cgi

@ -17,7 +17,7 @@ use strict;
use CGI;
use Compress::Zlib;
my $email='survey@popcon.debian.org';
my $email='survey@popcon.devuan.org';
my $directsave = 0; # Enable to store on disk instead of sending an email
my $basedir = "/var/lib/popcon";
@ -28,8 +28,8 @@ $ENV{PATH}="";
print "Content-Type: text/plain\n\n";
if (exists $ENV{REQUEST_METHOD} && $ENV{REQUEST_METHOD} ne "POST")
{
print "Debian Popularity-Contest HTTP-POST submission URL\n";
print "Visit http://popcon.debian.org/ for more info.\n";
print "Devuan Popularity-Contest HTTP-POST submission URL\n";
print "Visit http://popcon.devuan.org/ for more info.\n";
exit 0;
}
@ -92,9 +92,9 @@ EOF
print POPCON @entry;
close POPCON;
}
print "Thanks for your submission to Debian Popularity-Contest!\n";
print "Thanks for your submission to Devuan Popularity-Contest!\n";
print "DEBIAN POPCON HTTP-POST OK\n";
} else {
print "The submission to Debian Popularity-Contest failed!\n";
print "The submission to Devuan Popularity-Contest failed!\n";
}
exit 0;

Loading…
Cancel
Save