Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please unblock package debian-edu-config
OK, first the most honest part: I f***ed up. 2.10.61 was uploade well before
full freeze, fixing a list of bugs. I then wanted to fix two critical bugs
which prevented parts of the package from workign at all, and when
uploading, failed at primary school maths and thought it would get in before
the full freeze. This also prevented the migration of 2.10.61.
The upload's impact is limited to the Debian Edu pure blend. It fixes the
following issues, which are not all tracked as a bug in BTS:
* Fix handling of LDAP certificates on LTSP clients, especially
verification.
* Fix screen locking on LTSP clients with Xfce.
* Replace the old skolelinux popcon service with only the Debian one.
* Fix handling of LTSP client config from LDAP.
All these are bugs that would probably grant an unblock. Looking at the
situation described at the top, I kindly ask you to approve and unblock it
without adding it as separate bug reports belatedly.
Thanks!
unblock debian-edu-config/2.10.62
- -- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.19.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=nb_NO.UTF-8, LC_CTYPE=nb_NO.UTF-8 (charmap=UTF-8),
LANGUAGE=nb_NO:nb:no_NO:no:nn_NO:nn:da:sv:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-----BEGIN PGP SIGNATURE-----
iQKJBAEBCgBzFiEEPJ1UpHV1wCb7F/0mt5o8FqDE8pYFAlyIPugxGmh0dHBzOi8v
d3d3LmRvbWluaWstZ2VvcmdlLmRlL2dwZy1wb2xpY3kudHh0LmFzYyMcZG9taW5p
ay5nZW9yZ2VAaXQucGlyYXRlbnBhcnRlaS5kZQAKCRC3mjwWoMTylu1aD/9J4efC
SUM3sHLVU+0EpToTTVCcFDas2JGK23y81NjXZ7wXzl9T6m7v2Lr/xScZIEQFy0wp
MtJy2/6g3oVsYIFU7q2MpsTq917qcVugOLFqtAFB76+fxsY/saOyKDttOSnEpOcf
nnEOf9mJbXh6gVdlgbpTkkGN1ZUsVy8MAbGuENLLo9S1h70rsHGCkVW5mNmAqpWR
F3EIonLweCPcCAqJ5mcTxeW2g8ekHOSKiQmlxlDYreDpnHlGzTXN5rr+pm/uy48B
Z38c98ym1IwYeG0t7B+JfTlHJ/J/NekRZbYZ+yh9TC8B3VXXakqrs/O9HXv4upG6
jKsNNgBXxgEu+EO/JPS0HtKKeFy5A8u3oCZ0cTiHR2Zksyh3qVuk9Mo7xRVdx86D
7OgTvBcxIf43z5ZFPcrKSId5CVRLGDD4kPNSgCFFeZDHZM7gZidOqE6SmfdGaldK
gJIokBfKbEo2nyPYgA0z8ECppvImt6AYV2PK/m4eUCq6IonF/IbWidgb/tN6wc+3
UlLTA/9e4bJh009Gqmx/8jp4KxoZ1ASQCqe/ORJVghjhJQkA0i58n3iqB1CyuVot
icXMI17IkrY29XIUdoqRTaZxm9KC2c5x8nLn7qx/VnhPMe/FjfRo/HHs4GI69DS7
VqbOB3pqv/jyi2wp+m/onyvR9LMFBDNrALJGVA==
=dom6
-----END PGP SIGNATURE-----
diff -Nru debian-edu-config-2.10.60/cf3/cf.workarounds
debian-edu-config-2.10.62/cf3/cf.workarounds
--- debian-edu-config-2.10.60/cf3/cf.workarounds 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/cf3/cf.workarounds 2019-02-23
17:12:47.000000000 +0100
@@ -22,5 +22,13 @@
"/etc/resolvconf/update-libc.d/squid"
link_from => ln_s("/usr/share/debian-edu-config/squid.resolvconf"),
move_obstructions => "true";
+
+commands:
+
+ debian.xfce.(ltspclient|ltspserver).installation::
+ # Provide a screensaver as a workaround for #922718 (fixed in experimental
+ # but not in Buster). FIXME: Check if this is still needed for Bullseye.
+ "/usr/bin/apt-get install -y xscreensaver"
+ contain => in_shell;
}
diff -Nru debian-edu-config-2.10.60/debian/changelog
debian-edu-config-2.10.62/debian/changelog
--- debian-edu-config-2.10.60/debian/changelog 2019-02-12 15:00:57.000000000
+0100
+++ debian-edu-config-2.10.62/debian/changelog 2019-03-01 12:50:01.000000000
+0100
@@ -1,3 +1,32 @@
+debian-edu-config (2.10.62) unstable; urgency=medium
+
+ * get-ldap-ltsp-config: Fix detection of MAC address.
+ * get-ldap-ltsp-config: Fix extraction of ltspConfig from LDAP.
+ * update-hostname-from-ip: Always print hostname if -n is used.
+ * Add myself as Uploader.
+
+ -- Dominik George <naturesha...@debian.org> Fri, 01 Mar 2019 12:50:01 +0100
+
+debian-edu-config (2.10.61) unstable; urgency=medium
+
+ [ Wolfgang Schweer ]
+ * cf3/cf.workarounds:
+ - Provide Xfce screensaver for LTSP clients (workaround for bug #922718,
+ fixed in experimental but unlikely to be fixed in Buster).
+ * Improve LDAP server certificate check:
+ - tools/create-debian-edu-certs:
+ Make /etc/debian-edu/www/debian-edu-bundle.{crt,pem} downloadable.
+ - debian-edu-config.fetch-ldap-cert:
+ Verify the LDAP server cert using the downloaded Debian-Edu_rootCa one.
+ * testsuite/{ldap-client,ldap-server,sudo,webcache,webserver}:
+ - Fix scripts to match the recent configuration changes.
+
+ [ Holger Levsen ]
+ * www/index* and www/*.po: replace http://popcon.skolelinux.org with
+ https://popcon.debian.org as the former is unmaintained.
+
+ -- Holger Levsen <hol...@debian.org> Sun, 24 Feb 2019 18:28:43 +0100
+
debian-edu-config (2.10.60) unstable; urgency=medium
[ Wolfgang Schweer ]
diff -Nru debian-edu-config-2.10.60/debian/control
debian-edu-config-2.10.62/debian/control
--- debian-edu-config-2.10.60/debian/control 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/debian/control 2019-03-01 12:49:59.000000000
+0100
@@ -6,6 +6,7 @@
Holger Levsen <hol...@debian.org>,
Mike Gabriel <sunwea...@debian.org>,
Wolfgang Schweer <wschw...@arcor.de>,
+ Dominik George <naturesha...@debian.org>,
Standards-Version: 4.3.0
Rules-Requires-Root: no
Build-Depends: debhelper-compat (= 11)
diff -Nru debian-edu-config-2.10.60/debian/debian-edu-config.fetch-ldap-cert
debian-edu-config-2.10.62/debian/debian-edu-config.fetch-ldap-cert
--- debian-edu-config-2.10.60/debian/debian-edu-config.fetch-ldap-cert
2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/debian/debian-edu-config.fetch-ldap-cert
2019-02-23 17:12:47.000000000 +0100
@@ -22,6 +22,7 @@
. /lib/lsb/init-functions
CERTFILE=/etc/ssl/certs/debian-edu-server.crt
+BUNDLECRT=/etc/ssl/certs/debian-edu-bundle.crt
do_start() {
# Locate LDAP server
@@ -38,11 +39,13 @@
return 1
fi
[ "$VERBOSE" != no ] && log_action_begin_msg "Fetching LDAP SSL
certificate."
- /usr/share/debian-edu-config/tools/ldap-server-getcert $LDAPSERVER >
$CERTFILE.new
+ if curl -k https://www.intern/debian-edu-bundle.crt > $BUNDLECRT ; then
+ gnutls-cli --x509cafile $BUNDLECRT --save-cert=$CERTFILE.new
ldap.intern < /dev/null
+ fi
if test -s $CERTFILE.new ; then
mv $CERTFILE.new $CERTFILE
[ "$VERBOSE" != no ] && log_action_end_msg 0
- logger -t fetch-ldap-cert "Fetched LDAP SSL certificate from
$LDAPSERVER."
+ logger -t fetch-ldap-cert "Fetched and verified LDAP SSL
certificate from $LDAPSERVER."
else
rm $CERTFILE.new
log_action_end_msg 1
diff -Nru debian-edu-config-2.10.60/sbin/update-hostname-from-ip
debian-edu-config-2.10.62/sbin/update-hostname-from-ip
--- debian-edu-config-2.10.60/sbin/update-hostname-from-ip 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/sbin/update-hostname-from-ip 2019-03-01
12:38:30.000000000 +0100
@@ -120,17 +120,15 @@
SOURCE="hardware MAC address"
fi
-# Already got the correct host name?
-if [ "$HOSTNAME" = "$(uname -n)" ] ; then
- exit 0
-fi
-
if [ "$HOSTNAME" ]; then
if $onlyprint ; then
echo $HOSTNAME
exit 0
else
- sethostname "$HOSTNAME" "$SOURCE"
+ # Already got the correct host name?
+ if [ "$HOSTNAME" != "$(uname -n)" ] ; then
+ sethostname "$HOSTNAME" "$SOURCE"
+ fi
fi
else
exit 1
diff -Nru
debian-edu-config-2.10.60/share/debian-edu-config/tools/create-debian-edu-certs
debian-edu-config-2.10.62/share/debian-edu-config/tools/create-debian-edu-certs
---
debian-edu-config-2.10.60/share/debian-edu-config/tools/create-debian-edu-certs
2019-02-12 14:58:47.000000000 +0100
+++
debian-edu-config-2.10.62/share/debian-edu-config/tools/create-debian-edu-certs
2019-02-23 17:12:47.000000000 +0100
@@ -72,6 +72,7 @@
# available via web-server.
cp /etc/ssl/certs/debian-edu-bundle.crt /etc/debian-edu/www
cp /etc/ssl/certs/debian-edu-bundle.pem /etc/debian-edu/www
+ chmod 644 /etc/debian-edu/www/debian-edu-bundle.*
logger -t create-debian-edu-certs "Certs with both .crt and .pem extension
made available in /etc/debian-edu/www."
}
diff -Nru debian-edu-config-2.10.60/share/ltsp/get-ldap-ltsp-config
debian-edu-config-2.10.62/share/ltsp/get-ldap-ltsp-config
--- debian-edu-config-2.10.60/share/ltsp/get-ldap-ltsp-config 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/share/ltsp/get-ldap-ltsp-config 2019-03-01
12:50:01.000000000 +0100
@@ -76,7 +76,7 @@
setup_from_ldap() {
filter="(&(ltspConfig=*)$1)"
config="$(ldapsearch -h "$LDAP_HOST" -b "$BASE_DN" -x "$filter" ltspConfig
| \
- awk '/^ltspConfig: [^=]*=[^;]*$/ { print $2 }')"
+ grep -Po '(?<=^ltspConfig: ).*')"
if [ "$config" ] ; then
if eval "$config" ; then
echo "$config" >> $cachefile
@@ -88,7 +88,7 @@
}
lookup_mac_addrs() {
- PATH=/sbin:$PATH LANG=C ifconfig 2>/dev/null | grep -i hwaddr | awk
'{print $5}' | sort -u
+ PATH=/sbin:$PATH LANG=C ip link 2>/dev/null | grep -i link/ether | awk
'{print $2}' | sort -u
}
# Only check LDAP when the result can be cached
diff -Nru debian-edu-config-2.10.60/testsuite/ldap-client
debian-edu-config-2.10.62/testsuite/ldap-client
--- debian-edu-config-2.10.60/testsuite/ldap-client 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/testsuite/ldap-client 2019-02-23
17:12:47.000000000 +0100
@@ -51,7 +51,7 @@
done
# Verify that NSS is properly configured for netgroups in LDAP.
-if egrep -q '^netgroup: +files *.* +(ldap|sss)$' /etc/nsswitch.conf ; then
+if egrep -q '^netgroup: +nis *.* +(ldap|sss)$' /etc/nsswitch.conf ; then
success "NSS netgroup setting is correct in /etc/nsswitch.conf"
else
error "NSS netgroup setting is wrong in /etc/nsswitch.conf"
@@ -71,14 +71,14 @@
host -a -t srv _ldap._tcp | sed "s/^/info: SRV record from DNS: /"
host -a "$ldap_server" | sed "s/^/info: LDAP server from DNS: /"
-if [ -f /etc/ldap/ldap.conf ] ; then
- if egrep -q "^HOST (ldap|$ldap_server)" /etc/ldap/ldap.conf ; then
+if [ -f /etc/nslcd.conf ] ; then
+ if egrep -q "^uri (ldap|$ldap_server)" /etc/nslcd.conf ; then
:
else
error "ldap/ldap.conf misses definition of HOST ldap"
fi
else
- error "/etc/ldap/ldap.conf is missing."
+ error "/etc/nslcd.conf is missing."
fi
# test netgroups
@@ -150,25 +150,13 @@
error "Missing /usr/bin/ldapsearch "
fi
-pubcert=/etc/ldap/ssl/ldap-server-pubkey.pem
-privcert=/etc/ldap/ssl/slapd.pem
-sedextract='/-----BEGIN CERTIFICATE-----/,/-----END CERTIFICATE-----/p'
+pubcert=/etc/ssl/certs/debian-edu-server.crt
+cacert=/etc/ssl/certs/Debian-Edu_rootCA.crt
if [ -s $pubcert ] ; then
- if [ -f $privcert ] ; then
- # Only compare the public part
- if sed -n "$sedextract" < $privcert | \
- diff - $pubcert ; then
- success "Saved LDAP certificate matches slapd certificate"
+ if openssl verify -CAfile $cacert $pubcert; then
+ success "LDAP certificate matches rootCA certificate"
else
- error "Saved LDAP certificate do not matches slapd certificate"
- fi
- else
- if echo | openssl s_client -connect $ldap_server:ldaps 2>/dev/null | \
- sed -n "$sedextract" | diff - $pubcert ; then
- success "Fetched LDAP certificate matches slapd certificate"
- else
- error "Fetched LDAP certificate do not matches slapd certificate"
- fi
+ error "LDAP certificate doesn't match rootCA certificate"
fi
else
error "Missing LDAP certificate $pubcert"
@@ -220,7 +208,7 @@
if echo "$PROFILE" | egrep -q 'LTSP-Server' ; then
check_file_perm \
- /opt/ltsp/*/etc/ldap/ssl/ldap-server-pubkey.pem 644
+ /opt/ltsp/*/etc/ssl/certs/debian-edu-server.crt 644
fi
exit $RESULT
diff -Nru debian-edu-config-2.10.60/testsuite/ldap-server
debian-edu-config-2.10.62/testsuite/ldap-server
--- debian-edu-config-2.10.60/testsuite/ldap-server 2014-09-04
21:01:59.000000000 +0200
+++ debian-edu-config-2.10.62/testsuite/ldap-server 2019-02-23
17:12:47.000000000 +0100
@@ -36,7 +36,7 @@
RESULT=0
-for port in ldap ldaps ; do
+for port in ldap; do
netstat_check $port tcp slapd || RESULT=1
done
@@ -47,30 +47,17 @@
RESULT=1
fi
-if [ -f /etc/ldap/ssl/slapd.pem ] ; then
- openssl verify /etc/ldap/ssl/slapd.pem |
- sed "s%^%info: $0: slapd.pem: %"
-else
- echo "error: Missing /etc/ldap/ssl/slapd.pem"
- RESULT=1
-fi
-
-# If the client certificate exist, verify that it is identical to the
-# server certificate. If not, it was probably downloaded from the
-# wrong LDAP server.
-if [ -f /etc/ldap/ssl/ldap-server-pubkey.pem ] ; then
- if awk '/^-----BEGIN CERTIFICATE-----$/ { yes=1 }
- yes { print }
- /^-----END CERTIFICATE-----$/ { yes=0 }' /etc/ldap/ssl/slapd.pem |
- cmp -s /etc/ldap/ssl/ldap-server-pubkey.pem -
- then
- echo "success: Client certificate for LDAP server matches slapd cert."
+if [ -f /etc/ssl/certs/debian-edu-server.crt ] ; then
+ if [ -f /etc/ssl/certs/Debian-Edu_rootCA.crt ] ; then
+ openssl verify -CAfile /etc/ssl/certs/Debian-Edu_rootCA.crt
/etc/ssl/certs/debian-edu-server.crt |
+ sed "s%^%info: $0: debian-edu-server.crt: %"
+ echo "success: Certificate debian-edu-server.crt has been verified by
Debian-Edu_rootCA.crt."
else
- echo "error: Certificate in /etc/ldap/ssl/slapd.pem and
/etc/ldap/ssl/ldap-server-pubkey.pem differ."
- RESULT=1
+ echo "error: Certificate /etc/ssl/certs/Debian-Edu_rootCA.crt is
missing."
fi
else
- echo "warning: Missing /etc/ldap/ssl/ldap-server-pubkey.pem"
+ echo "error: Certificate /etc/ssl/certs/debian-edu-server.crt is missing."
+ RESULT=1
fi
echo "info: connection per ldap-client"
diff -Nru debian-edu-config-2.10.60/testsuite/sudo
debian-edu-config-2.10.62/testsuite/sudo
--- debian-edu-config-2.10.60/testsuite/sudo 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/testsuite/sudo 2019-02-23 17:12:47.000000000
+0100
@@ -18,10 +18,10 @@
echo "error: $0: sudoRole object for root missing in ldap"
fi
-if grep -q '^sudoers_base' /etc/ldap/ldap.conf ; then
- echo "success: $0: suduers_base is set in ldap.conf"
+if grep -q '^sudoers_base' /etc/sudo-ldap.conf ; then
+ echo "success: $0: suduers_base is set in sudo-ldap.conf"
else
- echo "error: $0: suduers_base is missing ldap.conf"
+ echo "error: $0: suduers_base is missing sudo-ldap.conf"
fi
if grep -q '^sudoers:.* ldap' /etc/nsswitch.conf ; then
diff -Nru debian-edu-config-2.10.60/testsuite/webcache
debian-edu-config-2.10.62/testsuite/webcache
--- debian-edu-config-2.10.60/testsuite/webcache 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/testsuite/webcache 2019-02-23
17:12:47.000000000 +0100
@@ -87,7 +87,7 @@
url=https://www.intern/
-if HEAD $HEADOPTS $url 2>&1 | grep -q 'certificate verify' ; then
+if HEAD $HEADOPTS $url 2>&1 | grep -q '200 OK' ; then
echo "success: $0: Valid response from '$url' using proxy '$http_proxy'."
else
echo "error: $0: Unable to connect to '$url' using proxy '$http_proxy'."
diff -Nru debian-edu-config-2.10.60/testsuite/webserver
debian-edu-config-2.10.62/testsuite/webserver
--- debian-edu-config-2.10.60/testsuite/webserver 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/testsuite/webserver 2019-02-23
17:12:47.000000000 +0100
@@ -25,7 +25,7 @@
server=www
# Wait for 10 seconds
-HEADOPTS="-t 10"
+HEADOPTS="-t 10 -S"
unset http_proxy || true
unset https_proxy || true
@@ -47,7 +47,7 @@
exit 1
else
url=https://$server/
- if HEAD $HEADOPTS $url 2>&1 | grep -q 'certificate verify' ; then
+ if HEAD $HEADOPTS $url 2>&1 | grep -q '200 OK' ; then
echo "success: $0: Apache is listening on '$url'."
else
echo "error: $0: Apache is not listening on '$url'."
@@ -55,7 +55,7 @@
for url in "https://$server/munin/"; "https://$server/sitesummary/"; \
"https://$server/debian-edu-doc/"; ; do
- if HEAD $HEADOPTS $url 2>&1 | grep -q 'certificate verify' ; then
+ if HEAD $HEADOPTS $url 2>&1 | grep -q '200 OK' ; then
echo "success: $0: URL '$url' is working."
else
echo "error: $0: URL '$url' is not working."
diff -Nru debian-edu-config-2.10.60/www/ca.po
debian-edu-config-2.10.62/www/ca.po
--- debian-edu-config-2.10.60/www/ca.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/ca.po 2019-02-23 17:12:47.000000000 +0100
@@ -211,9 +211,9 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Estadística de paquets de "
+"<a href=\"https://popcon.debian.org/\";>Estadística de paquets de "
"software en ús</a>"
# type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/da.po
debian-edu-config-2.10.62/www/da.po
--- debian-edu-config-2.10.60/www/da.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/da.po 2019-02-23 17:12:47.000000000 +0100
@@ -179,8 +179,8 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>Indsamlet pakkebrug</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>Indsamlet pakkebrug</a>"
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:54
diff -Nru debian-edu-config-2.10.60/www/de.po
debian-edu-config-2.10.62/www/de.po
--- debian-edu-config-2.10.60/www/de.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/de.po 2019-02-23 17:12:47.000000000 +0100
@@ -187,9 +187,9 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Statistik benutzter Pakete</a>"
+"<a href=\"https://popcon.debian.org/\";>Statistik benutzter Pakete</a>"
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:54
diff -Nru debian-edu-config-2.10.60/www/es_ES.po
debian-edu-config-2.10.62/www/es_ES.po
--- debian-edu-config-2.10.60/www/es_ES.po 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/es_ES.po 2019-02-23 17:12:47.000000000
+0100
@@ -215,9 +215,9 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Estadística de paquetes en "
+"<a href=\"https://popcon.debian.org/\";>Estadística de paquetes en "
"uso.</a>"
# type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/fr.po
debian-edu-config-2.10.62/www/fr.po
--- debian-edu-config-2.10.60/www/fr.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/fr.po 2019-02-23 17:12:47.000000000 +0100
@@ -187,8 +187,8 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>Utilisation des paquets</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>Utilisation des paquets</a>"
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:54
diff -Nru debian-edu-config-2.10.60/www/id.po
debian-edu-config-2.10.62/www/id.po
--- debian-edu-config-2.10.60/www/id.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/id.po 2019-02-23 17:12:47.000000000 +0100
@@ -181,9 +181,9 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Penggunaan paket yang terkumpul</a>"
+"<a href=\"https://popcon.debian.org/\";>Penggunaan paket yang terkumpul</a>"
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:54
diff -Nru debian-edu-config-2.10.60/www/index.html.ca
debian-edu-config-2.10.62/www/index.html.ca
--- debian-edu-config-2.10.60/www/index.html.ca 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.ca 2019-02-23 17:12:47.000000000
+0100
@@ -53,7 +53,7 @@
<li><a href="https://wiki.debian.org/DebianEdu";>Plana Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Llistes de
correu</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Estadística de
paquets de
+ <li><a href="https://popcon.debian.org/";>Estadística de paquets de
software en ús</a></li>
<li><a href="http://linuxsignpost.org/";>El Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Donatius
diff -Nru debian-edu-config-2.10.60/www/index.html.da
debian-edu-config-2.10.62/www/index.html.da
--- debian-edu-config-2.10.60/www/index.html.da 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.da 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>Internetside</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wikiside</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>E-post-lister</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Indsamlet pakkebrug</a></li>
+ <li><a href="https://popcon.debian.org/";>Indsamlet pakkebrug</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Giv en
donation til projektet</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.de
debian-edu-config-2.10.62/www/index.html.de
--- debian-edu-config-2.10.60/www/index.html.de 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.de 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>Homepage</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wiki-Seite</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>Mailinglisten</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Statistik benutzter
Pakete</a></li>
+ <li><a href="https://popcon.debian.org/";>Statistik benutzter
Pakete</a></li>
<li><a href="http://linuxsignpost.org/";>Der Linuxwegweiser</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Spende an
das Projekt</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.en
debian-edu-config-2.10.62/www/index.html.en
--- debian-edu-config-2.10.60/www/index.html.en 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.en 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>Web page</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wiki page</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Email
lists</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Collected package
usage</a></li>
+ <li><a href="https://popcon.debian.org/";>Collected package usage</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Donate to the
project</a></li>
</ul>
diff -Nru debian-edu-config-2.10.60/www/index.html.es_ES
debian-edu-config-2.10.62/www/index.html.es_ES
--- debian-edu-config-2.10.60/www/index.html.es_ES 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/index.html.es_ES 2019-02-23
17:12:47.000000000 +0100
@@ -52,7 +52,7 @@
<li><a href="http://www.skolelinux.org/";>Página web</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Páginas
Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Listas de
correo</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Estadística de
paquetes en
+ <li><a href="https://popcon.debian.org/";>Estadística de paquetes
en
uso.</a></li>
<li><a href="http://linuxsignpost.org/";>El Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Donativos
diff -Nru debian-edu-config-2.10.60/www/index.html.fr
debian-edu-config-2.10.62/www/index.html.fr
--- debian-edu-config-2.10.60/www/index.html.fr 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.fr 2019-02-23 17:12:47.000000000
+0100
@@ -51,7 +51,7 @@
<li><a href="https://wiki.debian.org/DebianEdu";>Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Listes de
diffusion</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Utilisation des
paquets</a></li>
+ <li><a href="https://popcon.debian.org/";>Utilisation des paquets</a></li>
<li><a href="http://linuxsignpost.org/";>Logiciels importants</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Don au
projet</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.id
debian-edu-config-2.10.62/www/index.html.id
--- debian-edu-config-2.10.60/www/index.html.id 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.id 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>Halaman web</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Halaman wiki</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>Milis</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Penggunaan paket yang
terkumpul</a></li>
+ <li><a href="https://popcon.debian.org/";>Penggunaan paket yang
terkumpul</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Menyumbang
ke proyek </a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.it
debian-edu-config-2.10.62/www/index.html.it
--- debian-edu-config-2.10.60/www/index.html.it 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.it 2019-02-23 17:12:47.000000000
+0100
@@ -52,7 +52,7 @@
<li><a href="https://wiki.debian.org/DebianEdu";>Pagina Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Liste di
discussione</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Pacchetti utilizzati</a></li>
+ <li><a href="https://popcon.debian.org/";>Pacchetti utilizzati</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Donate al
progetto</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.ja
debian-edu-config-2.10.62/www/index.html.ja
--- debian-edu-config-2.10.60/www/index.html.ja 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.ja 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>Webページ</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wikiページ</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>メールリスト</a></li>
- <li><a href="http://popcon.skolelinux.org/";>パッケージ稼働統計</a></li>
+ <li><a href="https://popcon.debian.org/";>パッケージ稼働統計</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>プロジェクトへの寄付</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.nl
debian-edu-config-2.10.62/www/index.html.nl
--- debian-edu-config-2.10.60/www/index.html.nl 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.nl 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>Webpagina</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wikipagina</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>E-maillijsten</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Statistieken over
pakketgebruik</a></li>
+ <li><a href="https://popcon.debian.org/";>Statistieken over
pakketgebruik</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Geef een
donatie aan het project</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.no_NB
debian-edu-config-2.10.62/www/index.html.no_NB
--- debian-edu-config-2.10.60/www/index.html.no_NB 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/index.html.no_NB 2019-02-23
17:12:47.000000000 +0100
@@ -51,7 +51,7 @@
<li><a href="http://www.skolelinux.org/no/";>Nettsider</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wikisider</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>E-postlister</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Innsamlet pakkebruk</a></li>
+ <li><a href="https://popcon.debian.org/";>Innsamlet pakkebruk</a></li>
<li><a href="http://linuxsignpost.org/";>Linux-veiviseren</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Doner til
prosjektet</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.pt
debian-edu-config-2.10.62/www/index.html.pt
--- debian-edu-config-2.10.60/www/index.html.pt 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.pt 2019-02-23 17:12:47.000000000
+0100
@@ -51,7 +51,7 @@
<li><a href="http://www.skolelinux.org/";>Página Web</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Página Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Listas de
Email</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Utilização de pacotes
recolhida</a></li>
+ <li><a href="https://popcon.debian.org/";>Utilização de pacotes
recolhida</a></li>
<li><a href="http://linuxsignpost.org/";>O Signpost de Linux</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Doações ao
projecto</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.pt_BR
debian-edu-config-2.10.62/www/index.html.pt_BR
--- debian-edu-config-2.10.60/www/index.html.pt_BR 2019-02-12
14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/index.html.pt_BR 2019-02-23
17:12:47.000000000 +0100
@@ -52,7 +52,7 @@
<li><a href="http://www.skolelinux.org/";>Página Web</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Página Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Listas de
Email</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Coleta utilização de
pacotes</a></li>
+ <li><a href="https://popcon.debian.org/";>Coleta utilização de
pacotes</a></li>
<li><a href="http://linuxsignpost.org/";>Sítio Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Doações
para o projeto</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.ro
debian-edu-config-2.10.62/www/index.html.ro
--- debian-edu-config-2.10.60/www/index.html.ro 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.ro 2019-02-23 17:12:47.000000000
+0100
@@ -51,7 +51,7 @@
<li><a href="https://wiki.debian.org/DebianEdu";>Wiki</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Liste de
discuții</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Utilizarea
pachetelor</a></li>
+ <li><a href="https://popcon.debian.org/";>Utilizarea pachetelor</a></li>
<li><a href="http://linuxsignpost.org/";>Programe importante</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Donează
pentru proiect</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.html.ru
debian-edu-config-2.10.62/www/index.html.ru
--- debian-edu-config-2.10.60/www/index.html.ru 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.ru 2019-02-23 17:12:47.000000000
+0100
@@ -51,7 +51,7 @@
<li><a href="http://www.skolelinux.org/";>Веб-страница</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Вики</a></li>
<li><a href="https://wiki.debian.org/DebianEdu/MailingLists";>Списки
рассылки</a></li>
- <li><a href="http://popcon.skolelinux.org/";>Статистика использования
пакетов</a></li>
+ <li><a href="https://popcon.debian.org/";>Статистика использования
пакетов</a></li>
<li><a href="http://linuxsignpost.org/";>The Linux Signpost</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>Пожертвование
diff -Nru debian-edu-config-2.10.60/www/index.html.zh
debian-edu-config-2.10.62/www/index.html.zh
--- debian-edu-config-2.10.60/www/index.html.zh 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.html.zh 2019-02-23 17:12:47.000000000
+0100
@@ -50,7 +50,7 @@
<li><a href="http://www.skolelinux.org/";>網頁</a></li>
<li><a href="https://wiki.debian.org/DebianEdu";>Wiki</a></li>
<li><a
href="https://wiki.debian.org/DebianEdu/MailingLists";>通訊論壇</a></li>
- <li><a href="http://popcon.skolelinux.org/";>套件使用度調查狀態</a></li>
+ <li><a href="https://popcon.debian.org/";>套件使用度調查狀態</a></li>
<li><a href="http://linuxsignpost.org/";>Linux 指示牌</a></li>
<li><a
href="http://www.linuxiskolen.no/slxdebianlabs/donations.html";>愛心捐助這個計劃</a></li>
diff -Nru debian-edu-config-2.10.60/www/index.pot
debian-edu-config-2.10.62/www/index.pot
--- debian-edu-config-2.10.60/www/index.pot 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/index.pot 2019-02-23 17:12:47.000000000
+0100
@@ -178,7 +178,7 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
#. type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/it.po
debian-edu-config-2.10.62/www/it.po
--- debian-edu-config-2.10.60/www/it.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/it.po 2019-02-23 17:12:47.000000000 +0100
@@ -210,8 +210,8 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>Pacchetti utilizzati</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>Pacchetti utilizzati</a>"
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/ja.po
debian-edu-config-2.10.62/www/ja.po
--- debian-edu-config-2.10.60/www/ja.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/ja.po 2019-02-23 17:12:47.000000000 +0100
@@ -179,8 +179,8 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>パッケージ稼働統計</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>パッケージ稼働統計</a>"
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:54
diff -Nru debian-edu-config-2.10.60/www/nl.po
debian-edu-config-2.10.62/www/nl.po
--- debian-edu-config-2.10.60/www/nl.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/nl.po 2019-02-23 17:12:47.000000000 +0100
@@ -206,9 +206,9 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Statistieken over pakketgebruik</a>"
+"<a href=\"https://popcon.debian.org/\";>Statistieken over pakketgebruik</a>"
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/no_NB.po
debian-edu-config-2.10.62/www/no_NB.po
--- debian-edu-config-2.10.60/www/no_NB.po 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/no_NB.po 2019-02-23 17:12:47.000000000
+0100
@@ -209,8 +209,8 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>Innsamlet pakkebruk</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>Innsamlet pakkebruk</a>"
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/pt_BR.po
debian-edu-config-2.10.62/www/pt_BR.po
--- debian-edu-config-2.10.60/www/pt_BR.po 2019-02-12 14:58:47.000000000
+0100
+++ debian-edu-config-2.10.62/www/pt_BR.po 2019-02-23 17:12:47.000000000
+0100
@@ -216,9 +216,9 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Coleta utilização de pacotes</a>"
+"<a href=\"https://popcon.debian.org/\";>Coleta utilização de pacotes</a>"
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/pt.po
debian-edu-config-2.10.62/www/pt.po
--- debian-edu-config-2.10.60/www/pt.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/pt.po 2019-02-23 17:12:47.000000000 +0100
@@ -211,9 +211,9 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Utilização de pacotes recolhida</a>"
+"<a href=\"https://popcon.debian.org/\";>Utilização de pacotes recolhida</a>"
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/ro.po
debian-edu-config-2.10.62/www/ro.po
--- debian-edu-config-2.10.60/www/ro.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/ro.po 2019-02-23 17:12:47.000000000 +0100
@@ -187,8 +187,8 @@
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>Utilizarea pachetelor</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>Utilizarea pachetelor</a>"
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:54
diff -Nru debian-edu-config-2.10.60/www/ru.po
debian-edu-config-2.10.62/www/ru.po
--- debian-edu-config-2.10.60/www/ru.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/ru.po 2019-02-23 17:12:47.000000000 +0100
@@ -210,9 +210,9 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
msgstr ""
-"<a href=\"http://popcon.skolelinux.org/\";>Статистика использования пакетов</"
+"<a href=\"https://popcon.debian.org/\";>Статистика использования пакетов</"
"a>"
# type: Content of: <html><body><div><ul><li>
diff -Nru debian-edu-config-2.10.60/www/zh.po
debian-edu-config-2.10.62/www/zh.po
--- debian-edu-config-2.10.60/www/zh.po 2019-02-12 14:58:47.000000000 +0100
+++ debian-edu-config-2.10.62/www/zh.po 2019-02-23 17:12:47.000000000 +0100
@@ -204,8 +204,8 @@
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
#: index.html.en:53
-msgid "<a href=\"http://popcon.skolelinux.org/\";>Collected package usage</a>"
-msgstr "<a href=\"http://popcon.skolelinux.org/\";>套件使用度調查狀態</a>"
+msgid "<a href=\"https://popcon.debian.org/\";>Collected package usage</a>"
+msgstr "<a href=\"https://popcon.debian.org/\";>套件使用度調查狀態</a>"
# type: Content of: <html><body><div><ul><li>
#. type: Content of: <html><body><div><ul><li>
