@@ -22,12 +22,12 @@

 diff -ur pykolab-0.8.6.orig/share/templates/imapd.conf.tpl pykolab-0.8.6/share/templates/imapd.conf.tpl

 --- pykolab-0.8.6.orig/share/templates/imapd.conf.tpl  2016-11-18 12:24:34.000000000 +0100

 +++ pykolab-0.8.6/share/templates/imapd.conf.tpl   2016-11-18 13:34:48.872221218 +0100

-@@ -6,8 +6,8 @@

+@@ -7,8 +7,8 @@

  sasl_pwcheck_method: saslauthd

  sasl_mech_list: PLAIN LOGIN

  allowplaintext: no

 -tls_server_cert: /etc/pki/cyrus-imapd/cyrus-imapd.pem

--tls_server_key: /etc/pki/cyrus-imapd/cyrus-imapd.pem

+-tls_server_key: $tls_server_key

 +tls_server_cert: /etc/ssl/private/cyrus-imapd.pem

 +tls_server_key: /etc/ssl/private/cyrus-imapd.pem

  # uncomment this if you're operating in a DSCP environment (RFC-4594)

​

@@ -6,6 +6,7 @@

 Build-Depends:  autotools-dev,

                 debhelper (>= 7.0.50~),

                 dh-autoreconf,

+                dh-python,

                 gawk,

                 gettext,

                 intltool,

@@ -18,12 +19,12 @@

                 libxml-parser-perl,

                 libxml2,

                 mime-support,

-                python (>= 2.6~),

-                python-icalendar,

-                python-minimal,

-                python-nose,

-                python-six,

-                python-tzlocal,

+                python3,

+                python3-icalendar,

+                python3-minimal,

+                python3-nose,

+                python3-six,

+                python3-tzlocal,

                 univention-config-dev | bash (>= 1.0)

 Standards-Version: 3.9.3

 Homepage: http://www.kolab.org

@@ -33,17 +34,17 @@

 Package: pykolab

 Architecture: all

 Depends:    adduser (>= 3.11),

-            libpython2.7 | libpython2.6,

-            python,

-            python-icalendar,

-            python-mysqldb,

-            python-kolab,

-            python-ldap,

-            python-pyasn1,

-            python-pyasn1-modules,

-            python-pymysql,

-            python-six,

-            python-sqlalchemy,

+            libpython3.11 | libpython3.10 | libpython3.9,

+            python3,

+            python3-icalendar,

+            python3-mysqldb,

+            python3-kolab,

+            python3-ldap,

+            python3-pyasn1,

+            python3-pyasn1-modules,

+            python3-pymysql,

+            python3-six,

+            python3-sqlalchemy,

             ${misc:Depends},

             ${shlibs:Depends},

             ${ucs:Depends}

@@ -53,9 +54,9 @@

 Package: kolab-cli

 Architecture: all

 Depends:    pykolab (= ${binary:Version}),

-            python,

-            python-augeas,

-            python-cheetah,

+            python3,

+            python3-augeas,

+            python3-cheetah,

             ${misc:Depends},

             ${ucs:Depends}

 Description: Command-line utilities for Kolab

@@ -63,7 +64,7 @@

 Package: kolab-conf

 Architecture: all

-Depends: pykolab (= ${binary:Version}), kolab-ldap, ${python:Depends}, python, ${misc:Depends}, python-augeas, python-cheetah

+Depends: pykolab (= ${binary:Version}), kolab-ldap, ${python3:Depends}, python3, ${misc:Depends}, python3-augeas, python3-cheetah

 Description: Configuration management for Kolab

  This package includes configuration management utilities for

  Kolab Groupware

@@ -72,7 +73,7 @@

 Architecture: all

 Depends:    lsb-base (>= 3.0-6),

             pykolab (= ${binary:Version}),

-            python,

+            python3,

             sasl2-bin,

             ${misc:Depends}

 Description: SASL Authentication Daemon for Kolab

@@ -80,25 +81,25 @@

 Package: kolab-server

 Architecture: all

-Depends: pykolab (= ${binary:Version}), python, ${misc:Depends}, lsb-base (>= 3.0-6)

+Depends: pykolab (= ${binary:Version}), python3, ${misc:Depends}, lsb-base (>= 3.0-6)

 Description: Kolab Groupware Server

  Server daemon synchronizing the mutations between various

  Kolab Groupware components.

 Package: kolab-telemetry

 Architecture: all

-Depends: kolab-cli (= ${binary:Version}), python, ${misc:Depends}

+Depends: kolab-cli (= ${binary:Version}), python3, ${misc:Depends}

 Description: Kolab Telemetry Logging Capabilities

  Cyrus IMAP Telemetry logging handling capabilities for Kolab Groupware

 Package: kolab-xml

 Architecture: all

 Depends: pykolab (= ${binary:Version}),

-         python,

-         python-kolabformat,

+         python3,

+         python3-kolabformat,

          ${misc:Depends},

-         python-icalendar,

-         python-tzlocal

+         python3-icalendar,

+         python3-tzlocal

 Description: Kolab XML format wrapper for pykolab

  Kolab Format XML bindings wrapper for pykolab

@@ -106,13 +107,13 @@

 Architecture: all

 Depends: pykolab (= ${binary:Version}),

          kolab-xml (= ${binary:Version}),

-         python-gnupg,

-         python,

+         python3-gnupg,

+         python3,

          ${misc:Depends},

          lsb-base (>= 3.0-6),

-         python-dateutil,

-         python-icalendar,

-         python-tzlocal

+         python3-dateutil,

+         python3-icalendar,

+         python3-tzlocal

 Replaces: kolab-content-filter

 Provides: kolab-content-filter

 Description: Kolab Content-Filter

​

@@ -10,7 +10,7 @@

 export DH_VERBOSE=1

 %:

-   dh $@  --with python2 --with autotools-dev --with autoreconf

+   dh $@  --with python3 --with autotools-dev --with autoreconf

 override_dh_auto_test:

    dh_auto_test || echo “ignoring test failure”

@@ -20,8 +20,8 @@

    if  -x "$$(which univention-install-config-registry 2>/dev/null)" ; then \

        echo "usr/lib*/python*/*-packages/pykolab/plugins/sievemgmt/__init__.py" >> $(CURDIR)/debian/pykolab.install ; \

        echo "usr/lib*/python*/*-packages/pykolab/cli/sieve/" >> $(CURDIR)/debian/kolab-cli.install ; \

-       echo "ucs:Depends=python-sievelib" >> $(CURDIR)/debian/pykolab.substvars ; \

-       echo "ucs:Depends=python-sievelib" >> $(CURDIR)/debian/kolab-cli.substvars ; \

+       echo "ucs:Depends=python3-sievelib" >> $(CURDIR)/debian/pykolab.substvars ; \

+       echo "ucs:Depends=python3-sievelib" >> $(CURDIR)/debian/kolab-cli.substvars ; \

    fi

    dh_install

    if  -x "$$(which univention-install-config-registry 2>/dev/null)" ; then \

​

@@ -1,1 +1,1 @@

-7

+8

​

@@ -11,6 +11,7 @@

 Build-Depends:  autotools-dev,

                 debhelper (>= 7.0.50~),

                 dh-autoreconf,

+                dh-python,

                 gawk,

                 gettext,

                 intltool,

@@ -23,12 +24,12 @@

                 libxml-parser-perl,

                 libxml2,

                 mime-support,

-                python (>= 2.6~),

-                python-icalendar,

-                python-minimal,

-                python-nose,

-                python-six,

-                python-tzlocal,

+                python3,

+                python3-icalendar,

+                python3-minimal,

+                python3-nose,

+                python3-six,

+                python3-tzlocal,

                 univention-config-dev | bash (>= 1.0)

 Package-List:

  kolab-cli deb python optional

​