Prva verzija za buster.

diff --git a/README.CARNet b/README.CARNET
similarity index 83%
rename from README.CARNet
rename to README.CARNET
index bed7f65..71ae74d 100644 (file)
--- a/README.CARNet
+++ b/README.CARNET
@@ -1,7 +1,7 @@
 apache2-cn
 ~~~~~~~~~~
 
-Ovaj paket donosi CARNetovu dodatnu konfiguraciju za paket apache2
+Ovaj paket donosi CARNETovu dodatnu konfiguraciju za paket apache2
 iz distribucije Debian 9 (stretch).
 
 Paket dodaje VirtualHost zapise za sljedece webove:
@@ -31,4 +31,4 @@ Apache2 moduli koji su automatski ukljuceni:
   * suexec
   * CGI
 
- -- Ivan Rako <Ivan.Rako@CARNet.hr>  Wed, 18 Jul 2018 15:38:14 +0200
+ -- Ivan Rako <Ivan.Rako@CARNET.hr>  Wed, 18 Jul 2018 15:38:14 +0200

diff --git a/carnet.conf b/carnet.conf
index 06e6189..9f195d5 100644 (file)
--- a/carnet.conf
+++ b/carnet.conf
@@ -1,9 +1,9 @@
-## Begin - Generated by CARNet package apache2-cn
+## Begin - Generated by CARNET package apache2-cn
 #
 #  REMOVE this whole block if you DON'T WANT apache2-cn
 #  to edit or undo your changes to this configuration file.
 #
-## End - Generated by CARNet package apache2-cn
+## End - Generated by CARNET package apache2-cn
 <IfModule mod_mime.c>
     AddDefaultCharset off
 

diff --git a/debian/changelog b/debian/changelog
index aed7efc..9bb1ccd 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apache2-cn (2.4.38+cn10u1) stable; urgency=low
+
+  * Prva verzija za Debian buster
+
+ -- Ivan Rako <Ivan.Rako@CARNET.hr>  Wed, 11 Nov 2020 13:26:49 +0100
+
 apache2-cn (2.4.25~cn1) stable; urgency=low
 
   * Ovisnost samo o paketu php7.0-cn.

diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10

diff --git a/debian/control b/debian/control
index 2a0459c..91077f2 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,14 @@
 Source: apache2-cn
 Section: httpd
 Priority: optional
-Maintainer: Ivan Rako <Ivan.Rako@CARNet.hr>
-Build-Depends: debhelper (>> 9), po-debconf
+Maintainer: Ivan Rako <Ivan.Rako@CARNET.hr>
+Build-Depends: debhelper (>> 10), po-debconf
 Standards-Version: 3.9.8
 Homepage: http://httpd.apache.org/
 
 Package: apache2-cn
 Architecture: all
-Depends: apache2 (>= 2.4.25-3+deb9u5), apache2-suexec-pristine (>= 2.4.25-3+deb9u5), php7.0-cn, carnet-tools-cn (>= 3.2.1), ssl-cert, procps, debconf (>= 1.5.56), postfix | mail-transport-agent, ${misc:Depends}
+Depends: apache2 (>= 2.4.38-3+deb10u4), apache2-suexec-pristine (>= 2.4.38-3+deb10u4), php7.3-cn, carnet-tools-cn (>= 3.3.0), ssl-cert, procps, debconf (>= 1.5.56), default-mta | mail-transport-agent | postfix, ${misc:Depends}
 Suggests: mod-security-cn, apache2-doc, ca-certificates, monit-cn
 Description: Apache HTTP Server - traditional non-threaded model
  Each Apache Multi-Processing Module provides a different "flavor" of
@@ -22,5 +22,5 @@ Description: Apache HTTP Server - traditional non-threaded model
  isolating each request, so that a problem with a single request will not
  affect any other.
  .
- This is a CARNet Debian package which configures a simple https enabled
- web service with PHP5.
+ This is a CARNET Debian package which configures a simple https enabled
+ web service with PHP7.3.

diff --git a/debian/copyright b/debian/copyright
index 235dba3..c54c749 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Copyright 2013-2016 CARNet
+Copyright 2013-2020 CARNET
 
 You are free to distribute this software package under the terms of the
 GNU General Public License.

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/postinst b/debian/postinst
index 136ac80..e6a7d40 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -8,7 +8,7 @@ set -e
 # Load Debconf
 . /usr/share/debconf/confmodule
 
-# Load CARNet Tools
+# Load CARNET Tools
 . /usr/share/carnet-tools/functions.sh
 
 PKG="apache2-cn"
@@ -52,7 +52,7 @@ cleanup () {
 
 # tag_conf()
 #
-#   Add CARNet package info lines to config's header.
+#   Add CARNET package info lines to config's header.
 #
 tag_conf () {
   local conf_file
@@ -60,19 +60,19 @@ tag_conf () {
 
   if [ -e "$conf_file" ]; then
    cat >> $conf_file <<EOF
-## Begin - Generated by CARNet package apache2-cn
+## Begin - Generated by CARNET package apache2-cn
 #
 #  REMOVE this whole block if you DON'T WANT apache2-cn
 #  to edit or undo your changes to this configuration file.
 #
-## End - Generated by CARNet package apache2-cn
+## End - Generated by CARNET package apache2-cn
 EOF
   fi
 }
 
 # chk_conf_tag ()
 #
-#   Check if configuration file has CARNet package info lines.
+#   Check if configuration file has CARNET package info lines.
 #   return:  $RET => 0 - tagged
 #                    1 - not tagged or file does not exists
 #                    2 - file exists, but it is not tagged
@@ -83,7 +83,7 @@ chk_conf_tag () {
   RET=1
 
   if [ -f "$conf_file" ]; then
-    if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" "$conf_file"; then
+    if egrep -q "^## Begin - Generated by CARNET package apache2-cn$" "$conf_file"; then
       RET=0
     else
       RET=2
@@ -133,13 +133,13 @@ install_conf() {
   conf="$CONFDIR/conf-available/$2.conf"
 
   if [ ! -e "$conf" ]; then
-    cp_echo "CN: Generating CARNet specific configuration."
+    cp_echo "CN: Generating CARNET specific configuration."
     cp "$conftmpl" "$conf"
   else
     cp_echo "CN: $conf already exists, left untouched." 1>&2
   fi
 
-  cp_echo "CN: Enabling CARNet specific configuration."
+  cp_echo "CN: Enabling CARNET specific configuration."
   a2enconf -m -q "$2"
   need_restart=1
 }
@@ -231,7 +231,7 @@ install_vhost() {
     out=$(mktemp $vhostdir/$venabled.XXXXXX)
     temp_files="${temp_files} ${out}"
 
-    # CARNet header.
+    # CARNET header.
     tag_conf "$out"
 
     if [ "$add_namevirthost" ]; then
@@ -517,7 +517,7 @@ if [ -e "$CONF" ]; then
 fi
 
 
-# Install CARNet specific configuration file.
+# Install CARNET specific configuration file.
 #
 install_conf carnet 000-carnet
 

diff --git a/debian/postrm b/debian/postrm
index 06719d3..c63c1f1 100755 (executable)
--- a/debian/postrm
+++ b/debian/postrm
@@ -40,7 +40,7 @@ purge_conf () {
   if [ -d "${dir}" ] && [ -n "$(ls -A ${dir}/)" ]; then
     for file in ${dir}/*.conf; do
       if [ -f "$file" ]; then
-        if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" "$file"; then
+        if egrep -q "^## Begin - Generated by CARNET package apache2-cn$" "$file"; then
           a2dis$ctype -p -f -q "`basename "$file" .conf`" || exit $?
           rm -f "$file"
         fi
@@ -49,7 +49,7 @@ purge_conf () {
   fi
 }
 
-# Configuration generated by this CARNet package.
+# Configuration generated by this CARNET package.
 echo "CN: Purging $PKG configuration for Apache2."
 purge_conf site ${CONFDIR}/sites-available
 purge_conf conf ${CONFDIR}/conf-available

diff --git a/debian/prerm b/debian/prerm
index d276961..63a0867 100755 (executable)
--- a/debian/prerm
+++ b/debian/prerm
@@ -29,7 +29,7 @@ disable_conf () {
   if [ -d "${dir}" ] && [ -n "$(ls -A ${dir}/)" ]; then
     for file in ${dir}/*.conf; do
       if [ -f "$file" ]; then
-        if egrep -q "^## Begin - Generated by CARNet package apache2-cn$" "$file"; then
+        if egrep -q "^## Begin - Generated by CARNET package apache2-cn$" "$file"; then
           a2dis$ctype -m -f -q "`basename "$file" .conf`"
           need_restart=1
         fi