On Mon, 2017-06-26 at 15:17 +0200, Bill Allombert wrote: > You second patch does not apply. Please do not change the comments > in the po files since they are autogenerated by po-debconf.
Hmm, it applies for me. Removed the po/pot changes in the attached patches. -- bye, pabs https://wiki.debian.org/PaulWise
From 547ba0d72a5d6cd74ea8e07aeddffd92b7735c2e Mon Sep 17 00:00:00 2001 From: Paul Wise <p...@debian.org> Date: Sun, 25 Oct 2015 13:26:26 +0800 Subject: [PATCH 1/2] Change the Linux Counter URL to the new domain. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index e040af9..1106040 100644 --- a/README +++ b/README @@ -97,7 +97,7 @@ RELATED PROJECTS ================ There are several projects trying to count users and machines. First and -foremost is the Linux Counter at http://counter.li.org/. It tries to +foremost is the Linux Counter at https://www.linuxcounter.net/. It tries to estimate the amount of Linux users worldwide. There are some popcon installations for other distributions: -- 2.11.0
From 80e2b18b755d35091abe817c6ca4603422a34a41 Mon Sep 17 00:00:00 2001 From: Paul Wise <p...@debian.org> Date: Sun, 25 Oct 2015 13:28:38 +0800 Subject: [PATCH 2/2] Use https instead of http in URLs where possible. --- README | 4 ++-- examples/bin/popcon.pl | 28 ++++++++++++++-------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/README b/README index 1106040..d15b8c6 100644 --- a/README +++ b/README @@ -126,12 +126,12 @@ FINDING THE SOURCE This package is being maintained in Subversion using Alioth. The project summary page is available from <URL:https://alioth.debian.org/projects/popcon/>. -The project home page is at <URL:http://popcon.alioth.debian.org/>. +The project home page is at <URL:https://popcon.alioth.debian.org/>. REPORTING BUGS ============== Report bugs into the Debian Bug Tracking System. See -<URL:http://bugs.debian.org/> for instructions. If you want to get in +<URL:https://bugs.debian.org/> for instructions. If you want to get in touch with the popularity contest maintainers, send an email to popcon-develop...@lists.alioth.debian.org. diff --git a/examples/bin/popcon.pl b/examples/bin/popcon.pl index 52912dc..8109822 100755 --- a/examples/bin/popcon.pl +++ b/examples/bin/popcon.pl @@ -63,14 +63,14 @@ sub htmlheader <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"> - <link href="http://www.debian.org/debian.css"; rel="stylesheet" type="text/css"> + <link href="https://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="https://www.debian.org/"; title="Debian Home"><img src="https://www.debian.org/Pics/openlogo-50.png"; alt="Debian" width="50" height="61"></a> </div> <!-- end logo --> <p class="section"><a href="/">POPCON</a></p> </div> <!-- end upperheader --> @@ -78,10 +78,10 @@ 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://www.debian.org/intro/about";>About Debian</a></li> + <li><a href="https://www.debian.org/distrib/";>Getting Debian</a></li> + <li><a href="https://www.debian.org/support";>Support</a></li> + <li><a href="https://www.debian.org/devel/";>Developers' Corner</a></li> </ul> </div> <!-- end navbar --> <p id="breadcrumbs"><a href="http://popcon.debian.org/";>Debian Popularity Contest</a> @@ -107,16 +107,16 @@ sub popconintro <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> + href="https://packages.debian.org/popularity-contest";>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><em>To participate in this survey, install the <a href="https://packages.debian.org/popularity-contest";>popularity-contest</a> package.</em> </p> <p></p> -<form method="GET" action="http://qa.debian.org/popcon.php";>Popcon statistics +<form method="GET" action="https://qa.debian.org/popcon.php";>Popcon statistics for source package <input type="text" size="30" maxlength="80" name="package"> <input type="submit" value="Go"> </form> <p> @@ -218,12 +218,12 @@ sub htmlfooter print HTML <<EOH; <div id="footer"> Made by <a href="mailto:ballombe\@debian.org">Bill Allombert</a>. Last generated on $date UTC. <br> -<a href="http://popcon.alioth.debian.org"; > Popularity-contest project </a> by Avery Pennarun, Bill Allombert and Petter Reinholdtsen. +<a href="https://popcon.alioth.debian.org"; > Popularity-contest project </a> by Avery Pennarun, Bill Allombert and Petter Reinholdtsen. <br> Debian theme by Stéphane Blondon, based on Debian template Copyright © 1997-2013 -<a href="http://www.spi-inc.org/";>SPI</a> and others; See <a href="http://www.debian.org/license"; rel="copyright">license terms</a><br> -Debian is a registered <a href="http://www.debian.org/trademark";>trademark</a> of Software in the Public Interest, Inc. +<a href="http://www.spi-inc.org/";>SPI</a> and others; See <a href="https://www.debian.org/license"; rel="copyright">license terms</a><br> +Debian is a registered <a href="https://www.debian.org/trademark";>trademark</a> of Software in the Public Interest, Inc. </div> </body> </html> @@ -302,7 +302,7 @@ sub print_pkg return unless (defined($pkg)); my $size=length $pkg; my $pkgt=substr($pkg,0,20); - print HTML "<a href=\"http://packages.debian.org/$pkg\";>$pkgt</a> ", + print HTML "<a href=\"https://packages.debian.org/$pkg\";>$pkgt</a> ", ' 'x(20-$size); } @@ -521,7 +521,7 @@ EOF my ($port)=split('-',$f); $port="$port/"; $port="kfreebsd-gnu/" if ($port eq "kfreebsd/"); - printf HTML "<a href=\"http://www.debian.org/ports/$port\";>%-16s</a> : %-10s <a href=\"stat/sub-$f.png\">graph</a>\n",$f,$arch{$f}; + printf HTML "<a href=\"https://www.debian.org/ports/$port\";>%-16s</a> : %-10s <a href=\"stat/sub-$f.png\">graph</a>\n",$f,$arch{$f}; } if (defined $arch{"unknown"}) { printf HTML "%-16s : %-10s <a href=\"stat/sub-unknown.png\">graph</a>\n","unknown",$arch{"unknown"} -- 2.11.0
signature.asc
Description: This is a digitally signed message part
![http://www.debian.org/Pics/openlogo-50.png"](http://www.debian.org/Pics/openlogo-50.png"){kind=link}
![https://www.debian.org/Pics/openlogo-50.png"](https://www.debian.org/Pics/openlogo-50.png"){kind=link}