Prva inačica za buster

diff --git a/README.CARNet b/README.CARNET
similarity index 100%
rename from README.CARNet
rename to README.CARNET

diff --git a/debian/changelog b/debian/changelog
index 2752021..570ba21 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+carnet-debian (10+cn10u1) stable; urgency=low
+
+  * Prva inačica za CARNET Debian 10 (buster)
+
+ -- Zeljko Boros <Zeljko.Boros@carnet.hr>  Thu, 20 Aug 2020 14:50:16 +0200
+
+carnet-debian (9.0.3) stable; urgency=low
+
+  * php7-cn -> php7.0-cn
+
+ -- Zeljko Boros <Zeljko.Boros@CARNet.hr>  Fri, 29 Nov 2019 15:29:26 +0100
+
 carnet-debian (9.0.2) stable; urgency=low
 
   * php5-cn -> php7-cn

diff --git a/debian/control b/debian/control
index 0fb15d9..b45993c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: carnet-debian
 Section: misc
 Priority: optional
 Maintainer: Grupa za izradu paketa <paketi@carnet.hr>
-Uploaders: Valentin Vidic <Valentin.Vidic@CARNet.hr>, Zeljko Boros <Zeljko.Boros@carnet.hr>
+Uploaders: Zeljko Boros <Zeljko.Boros@carnet.hr>
 Build-Depends: debhelper (>= 9), po-debconf
 Standards-Version: 3.9.8
 
@@ -10,5 +10,6 @@ Package: carnet-debian
 Provides: carnet-debian-cn
 Architecture: all
 Depends: debconf, apt-cn, aptitude, ${misc:Depends}
-Description: Installer for CARNet Debian packages
- This is packages installer for CARNet Debian distribution. 
+Description: Instaler za CARNET-ove Debian pakete
+ Instaler za CARNET-ove pakete kojima standardni Debianov poslužitelj 
+ možete pretvoriti u poslužitelj pripremljen za CARNET-ove usluge

diff --git a/debian/docs b/debian/docs
index 8f6e250..db3c4b3 100644 (file)
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-README.CARNet
+README.CARNET

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index c5ec72a..a3748ce 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,14 +1,14 @@
 # SOME DESCRIPTIVE TITLE.
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the carnet-debian package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
+"Project-Id-Version: carnet-debian\n"
 "Report-Msgid-Bugs-To: carnet-debian@packages.debian.org\n"
-"POT-Creation-Date: 2011-09-13 11:13+0200\n"
+"POT-Creation-Date: 2020-08-20 15:07+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -40,7 +40,7 @@ msgstr ""
 #. Type: note
 #. Description
 #: ../templates:2001
-msgid "CARNetove pakete za Debian mozete instalirati slijedecom naredbom:"
+msgid "CARNetove pakete za Debian mozete instalirati sljedecom naredbom:"
 msgstr ""
 
 #. Type: note
@@ -59,6 +59,6 @@ msgstr ""
 #. Description
 #: ../templates:3001
 msgid ""
-"Odabrali ste oba FTP daemona, morate izabrati samo jedan (ili vsftpd-cn ili "
+"Odabrali ste oba FTP daemona, mozete odabrati samo jedan (ili vsftpd-cn ili "
 "proftpd-cn)."
 msgstr ""

diff --git a/debian/templates b/debian/templates
index acf883c..d80043c 100644 (file)
--- 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, 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 
+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.0-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.0-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.

diff --git a/install-carnet-debian b/install-carnet-debian
index 68b4799..69a50ba 100644 (file)
--- a/install-carnet-debian
+++ b/install-carnet-debian
@@ -5,7 +5,7 @@ set -e
 packages="`debconf-show carnet-debian | awk -F: /packages/'{print $2}' | tr -d ','`"
 
 if [ -z "$packages" ]; then
-  echo "CN: No packages for install."
+  echo "CN: Nema paketa odabranih za instalaciju."
 else
   # Need to be explicit about exim -> postfix transition
   if [ "${packages%postfix-cn*}" != "$packages" ] -o