From: Zeljko Boros <Zeljko.Boros@carnet.hr>
Date: Wed, 20 Nov 2019 09:08:50 +0000 (+0100)
Subject: php5-cn -> php7-cn
X-Git-Tag: debian/9.0.2^0
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=801973dc7460810a9058201cc83ef7bbfa8028e5;p=carnet-debian.git

php5-cn -> php7-cn
---

diff --git a/debian/changelog b/debian/changelog
index 75d999e..2752021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+carnet-debian (9.0.2) stable; urgency=low
+
+  * php5-cn -> php7-cn
+  * malo promijenjen tekst kod odabira proftpd/vsftpd
+
+ -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Wed, 20 Nov 2019 10:01:39 +0100
+
 carnet-debian (9.0.1) stable; urgency=low
 
   * Izbacen squirrelmail iz ponude paketa
diff --git a/debian/templates b/debian/templates
index e589c69..acf883c 100644
--- a/debian/templates
+++ b/debian/templates
@@ -1,7 +1,7 @@
 Template: carnet-debian/packages
 Type: multiselect
-Choices: amavisd-cn, apache2-cn, apt-cn, bind9-cn, clamav-cn, dovecot-cn, fail2ban-cn, iptables-cn, kernel-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php5-cn, postfix-cn, proftpd-cn, spamassassin-cn, sysadmin-cn, vsftpd-cn, webalizer-cn, xinetd-cn 
-Default: amavisd-cn, apache2-cn, apt-cn, bind9-cn, clamav-cn, dovecot-cn, fail2ban-cn, iptables-cn, kernel-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php5-cn, postfix-cn, spamassassin-cn, sysadmin-cn, vsftpd-cn, webalizer-cn, xinetd-cn 
+Choices: amavisd-cn, apache2-cn, apt-cn, bind9-cn, clamav-cn, dovecot-cn, fail2ban-cn, iptables-cn, kernel-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php7-cn, postfix-cn, proftpd-cn, spamassassin-cn, sysadmin-cn, vsftpd-cn, webalizer-cn, xinetd-cn 
+Default: amavisd-cn, apache2-cn, apt-cn, bind9-cn, clamav-cn, dovecot-cn, fail2ban-cn, iptables-cn, kernel-cn, mailman-cn, monit-cn, munin-cn, mysql-cn, ntp-cn, openssh-cn, ossec-hids-cn, php7-cn, postfix-cn, spamassassin-cn, sysadmin-cn, vsftpd-cn, webalizer-cn, xinetd-cn 
 _Description: Koje pakete zelite?
  CARNet Debian donosi pakete za laksu konfiguraciju servisa na CARNetovom
  cvornom racunalu.
@@ -16,5 +16,5 @@ _Description: Instalacija CARNetovih paketa
 Template: carnet-debian/ftpd
 Type: note
 _Description: ProFTPD vs. vsftpd
- Odabrali ste oba FTP daemona, morate izabrati samo jedan (ili vsftpd-cn
+ Odabrali ste oba FTP daemona, mozete odabrati samo jedan (ili vsftpd-cn
  ili proftpd-cn).