Hello community, here is the log from the commit of package kopano for openSUSE:Factory checked in at 2018-01-19 11:52:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kopano (Old) and /work/SRC/openSUSE:Factory/.kopano.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kopano" Fri Jan 19 11:52:58 2018 rev:10 rq:564029 version:8.4.91.14 Changes: -------- --- /work/SRC/openSUSE:Factory/kopano/kopano.changes 2017-12-05 01:30:09.097487048 +0100 +++ /work/SRC/openSUSE:Factory/.kopano.new/kopano.changes 2018-01-19 11:53:08.195854841 +0100 @@ -1,0 +2,35 @@ +Sat Jan 6 00:06:11 UTC 2018 - [email protected] + +- Update to new upstream tag 8.4.91 + * Enhancements: + * server: new "server_listen" directive replacing "server_bind" + * server: stronger keep-alive + * server: further general performance improvements + * server: update PR_LOCAL_COMMIT_MAX on hard-deletes + * server: speed up contact and search folder querying + * server: skip some unnecessary attachment accesses + * spooler: introduce indexed_headers config directive + * search: pass "limit_results" to xapian to improve performance + * search: optionally index draft folders + * unixplugin: support multiple non_login_shells + * unixplugin: add /sbin/nologin as a non_login_shell (new + installs only) + * gateway: RFC 6154 support + * kopano-spamd: new program + * icalmapi: support URL, NICKNAME, PRODID in vcards + * Fixes: + * gateway: generate envelope using inetmapi if not present yet + * spooler: only evaluate rules that are explicitly enabled + using PR_RULE_STATE + * Changes: + * /etc/kopano is no longer prepopulated, create .cfg manually + if you need to override anything + * server: remove support for upgrading databases older than ZCP + 7.2 + * gateway: use threaded mode for reduced memory usage on + many-user systems (new installs only) + * gateway: the "imap_store_rfc822" config directive is removed + * server: the "counter_reset" config directive is removed + * spooler: the "always_send_utf8" config directive is removed + +------------------------------------------------------------------- Old: ---- 0001-build-fix-build-error-w.r.t.-gettimeofday.patch kopanocore-8.4.4.0.tar.xz New: ---- debian.python3-kopano.install debian.python3-mapi.install kopanocore-8.4.91.14.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kopano.spec ++++++ ++++ 876 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/kopano/kopano.spec ++++ and /work/SRC/openSUSE:Factory/.kopano.new/kopano.spec ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.211712702 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.215712514 +0100 @@ -1,5 +1,5 @@ pkgname=kopano -pkgver=8.4.4.0 +pkgver=8.4.91.14 pkgrel=0 pkgdesc='Kopano' arch=('x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.235711571 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.235711571 +0100 @@ -2,10 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://stash.kopano.io/scm/kc/kopanocore.git</param> - <param name="revision">kc-8.4.x</param> - <param name="filename">kopanocore</param> - <param name="parent-tag">kopanocore-8.4.4</param> - <param name="versionformat">8.4.4.@TAG_OFFSET@</param> + <param name="revision">kc-8.5.x</param> + <param name="parent-tag">kopanocore-8.4.91</param> + <param name="versionformat">8.4.91.@TAG_OFFSET@</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ build.collax ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.251710817 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.255710629 +0100 @@ -2,7 +2,7 @@ set -x source=kopanocore -version=8.4.4.0 +version=8.4.91.14 revnum=0 build=0 @@ -12,9 +12,7 @@ --docdir=/usr/share/kopano --mandir=/usr/share/man --infodir=/usr/share/info - --with-distro=cbs4 --disable-debug - --disable-static --with-searchscripts-prefix=/usr/share/kopano/searchscripts --with-userscript-prefix=/etc/kopano/userscripts --with-quotatemplate-prefix=/etc/kopano/quotamail ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.271709874 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.275709686 +0100 @@ -1,4 +1,4 @@ -kopano (8.4.4.0-0) unstable; urgency=low +kopano (8.4.91.14-0) unstable; urgency=low * Current release. ++++++ debian.control ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.311707990 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.311707990 +0100 @@ -3,13 +3,13 @@ Priority: optional Maintainer: Kopano Development <[email protected]> Build-Depends: debhelper (>= 4.0.0), binutils (>= 2.12.90.0.9), devscripts, - autotools-dev, g++, automake (>= 1:1.9) | automake1.9, autoconf (>= 2.59), + autotools-dev, g++ (>= 4.8), automake (>= 1:1.9) | automake1.9, autoconf (>= 2.59), libtool (>= 1.5), libtool-bin | libtool, pkg-config (>= 0.18), libssl-dev, libvmime-dev (>= 0.9.2), uuid-dev, php-dev | php5-dev | php7.0-dev, libmysqlclient15-dev | libmysqlclient-dev | libmariadb-client-lgpl-dev, libcurl3-dev | libcurl4-openssl-dev, gettext, libldap2-dev, m4, zlib1g-dev, fakeroot, libncurses5-dev, libncursesw5-dev, libxml2-dev, - libpam0g-dev, libkrb5-dev, + libpam0g-dev, libkrb5-dev, python3-dev, libicu-dev, libical-dev, swig, python-dev, gsoap (>= 2.8.49), libgoogle-perftools-dev, openssl, libs3-dev (>= 4.1) @@ -121,7 +121,7 @@ Package: kopano-dev Priority: extra Architecture: any -Depends: libkcfreebusy0 (= ${binary:Version}), libkchl0 (= ${binary:Version}), +Depends: libkcfreebusy0 (= ${binary:Version}), libkcicalmapi0 (= ${binary:Version}), libkcinetmapi0 (= ${binary:Version}), libmapi1 (= ${binary:Version}), libkcarchiver0 (= ${binary:Version}), @@ -233,6 +233,16 @@ module, you can create Python programs which use MAPI calls to interact with Kopano. +Package: python3-mapi +Architecture: any +Section: python +Replaces: libkcpyconv0, libkcpydirector0 +Depends: ${shlibs:Depends}, kopano-client (= ${binary:Version}) +Description: Python bindings for MAPI + Low-level (SWIG-generated) Python bindings for MAPI. Using this + module, you can create Python programs which use MAPI calls to + interact with Kopano. + Package: python-kopano Architecture: all Section: python @@ -243,18 +253,21 @@ do the low level work. Can be used for many common system administration tasks. +Package: python3-kopano +Architecture: all +Section: python +Depends: ${shlibs:Depends}, python3-mapi, python3-dateutil +Description: High-level Python bindings for Kopano + Object-Oriented Python bindings for Kopano. Uses python-mapi to + do the low level work. Can be used for many common system + administration tasks. + Package: libkcfreebusy0 Architecture: any Depends: ${shlibs:Depends} Description: Implementation of Free/Busy time scheduling RFC 5545 -Package: libkchl0 -Architecture: any -Depends: ${shlibs:Depends} -Description: RAII-based interface for libmapi - . - Package: libkcicalmapi0 Architecture: any Depends: ${shlibs:Depends} @@ -292,8 +305,8 @@ Architecture: any Depends: ${shlibs:Depends} Description: The Kopano Server library - This library contains the central server code which is responsible - for handling MAPI calls, storing it in the database, etc. + This library contains the central server code which is responsible for handling + RPC calls from libmapi, loading/storing objects in the database, etc. Package: libkcsoap0 Architecture: any @@ -325,4 +338,3 @@ Depends: ${shlibs:Depends} Description: Miscellaneous utility functions for Kopano Core . - ++++++ debian.kopano-client.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.395704031 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.399703842 +0100 @@ -1,2 +1,2 @@ -etc/mapi/kopano.inf +usr/lib/mapi.d/kopano.inf usr/lib/kopano/libkcclient.so ++++++ debian.kopano-contacts.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.491699507 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.491699507 +0100 @@ -1,2 +1,2 @@ -etc/mapi/zcontacts.inf +usr/lib/mapi.d/zcontacts.inf usr/lib/kopano/libkccontacts.so ++++++ debian.kopano-dagent.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.523697998 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.523697998 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-dagent etc/kopano/dagent.cfg lib/systemd/system/kopano-dagent.service usr/sbin/kopano-dagent ++++++ debian.kopano-dagent.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.543697056 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.547696867 +0100 @@ -1,9 +1,7 @@ #!/bin/sh chmod 750 /var/log/kopano || : chown -Rh kopano:kopano /var/log/kopano 2>/dev/null || : -chown -Rh kopano:kopano /var/lib/kopano/autorespond 2>/dev/null || : chown -Rh kopano:kopano /var/lib/kopano/dagent 2>/dev/null || : +chown -Rh kopano:kopano /var/lib/kopano/autorespond 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-dagent enable # find better solution ++++++ debian.kopano-dev.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.567695925 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.567695925 +0100 @@ -5,7 +5,6 @@ usr/include/mapi4linux usr/include/kopano usr/lib/libkcfreebusy.so -usr/lib/libkchl.so usr/lib/libkcicalmapi.so usr/lib/libkcinetmapi.so usr/lib/libmapi.so ++++++ debian.kopano-gateway.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.587694982 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.587694982 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-gateway etc/kopano/gateway.cfg lib/systemd/system/kopano-gateway.service usr/sbin/kopano-gateway ++++++ debian.kopano-gateway.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.603694228 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.603694228 +0100 @@ -3,5 +3,3 @@ chown -Rh kopano:kopano /var/log/kopano 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-gateway enable # find better solution ++++++ debian.kopano-ical.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.619693474 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.623693285 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-ical etc/kopano/ical.cfg lib/systemd/system/kopano-ical.service usr/sbin/kopano-ical ++++++ debian.kopano-ical.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.639692531 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.639692531 +0100 @@ -3,5 +3,3 @@ chown -Rh kopano:kopano /var/log/kopano 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-ical enable # find better solution ++++++ debian.kopano-monitor.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.695689892 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.699689704 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-monitor etc/kopano/monitor.cfg etc/kopano/quotamail/ lib/systemd/system/kopano-monitor.service ++++++ debian.kopano-monitor.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.711689138 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.715688950 +0100 @@ -3,5 +3,3 @@ chown -Rh kopano:kopano /var/log/kopano 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-monitor enable # find better solution ++++++ debian.kopano-presence.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.731688195 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.735688007 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-presence etc/kopano/presence.cfg lib/systemd/system/kopano-presence.service usr/sbin/kopano-presence ++++++ debian.kopano-presence.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.751687253 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.751687253 +0100 @@ -3,5 +3,3 @@ chown -Rh kopano:kopano /var/log/kopano 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-presence enable # find better solution ++++++ debian.kopano-search.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.771686311 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.771686311 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-search etc/kopano/search.cfg lib/systemd/system/kopano-search.service usr/sbin/kopano-search ++++++ debian.kopano-search.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.787685556 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.787685556 +0100 @@ -5,5 +5,3 @@ chown -Rh kopano:kopano /var/lib/kopano/search 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-search enable # find better solution ++++++ debian.kopano-server.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.803684802 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.807684614 +0100 @@ -1,10 +1,9 @@ -etc/init.d/kopano-server etc/kopano/userscripts etc/kopano/unix.cfg etc/kopano/server.cfg lib/systemd/system/kopano-server.service usr/sbin/kopano-server -usr/lib/libkcserver-[a-z]*.so +usr/lib/kopano/libkcserver-[a-z]*.so usr/share/kopano/ldap.propmap.cfg usr/share/kopano/ldap.openldap.cfg usr/share/kopano/ldap.active-directory.cfg ++++++ debian.kopano-server.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.823683860 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.823683860 +0100 @@ -6,5 +6,3 @@ chown root:kopano /etc/kopano/server.cfg #DEBHELPER# - -update-rc.d kopano-server enable # find better solution ++++++ debian.kopano-spooler.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.843682918 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.847682729 +0100 @@ -1,4 +1,3 @@ -etc/init.d/kopano-spooler etc/kopano/spooler.cfg lib/systemd/system/kopano-spooler.service usr/sbin/kopano-spooler ++++++ debian.kopano-spooler.postinst ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.855682352 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.859682163 +0100 @@ -4,5 +4,3 @@ chown -Rh kopano:kopano /var/lib/kopano/spooler 2>/dev/null || : #DEBHELPER# - -update-rc.d kopano-spooler enable # find better solution ++++++ debian.kopano-utils.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:11.871681597 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:11.875681409 +0100 @@ -7,9 +7,6 @@ usr/sbin/kopano-cli usr/sbin/kopano-mailbox-permissions usr/sbin/kopano-search-upgrade-findroots.py -usr/sbin/kopano-fix-ipm-subtree -usr/sbin/kopano-localize-folders -usr/sbin/kopano-recreate-systemfolders usr/libexec/kopano/mapitime usr/lib/python*/*/kopano_cli/ usr/share/man/man8/kopano-admin.8 ++++++ debian.python-kopano.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:12.047673303 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:12.047673303 +0100 @@ -1,2 +1,2 @@ -usr/lib/python*/*/kopano* -usr/lib/python*/*/zarafa* +usr/lib/python2*/*/kopano +usr/lib/python2*/*/zarafa ++++++ debian.python-mapi.install ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:12.067672361 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:12.071672172 +0100 @@ -1,6 +1,6 @@ -usr/lib/libkcpyconv-2.7.so -usr/lib/libkcpydirector-2.7.so -usr/lib/python*/*/{MAPICore,inetmapi,icalmapi,libfreebusy}.py -usr/lib/python*/*/_{MAPICore,inetmapi,icalmapi,libfreebusy}.so -usr/lib/python*/*/MAPI*.egg-info -usr/lib/python*/*/MAPI/ +usr/lib/libkcpyconv-2*.so +usr/lib/libkcpydirector-2*.so +usr/lib/python2*/*/{MAPICore,inetmapi,icalmapi,libfreebusy}.py +usr/lib/python2*/*/_{MAPICore,inetmapi,icalmapi,libfreebusy}.so +usr/lib/python2*/*/MAPI*.egg-info +usr/lib/python2*/*/MAPI/ ++++++ debian.python3-kopano.install ++++++ usr/lib/python3*/*/kopano ++++++ debian.python3-mapi.install ++++++ usr/lib/libkcpyconv-3*.so usr/lib/libkcpydirector-3*.so usr/lib/python3*/*/{MAPICore,inetmapi,icalmapi,libfreebusy}.py usr/lib/python3*/*/_{MAPICore,inetmapi,icalmapi,libfreebusy}.so usr/lib/python3*/*/MAPI*.egg-info usr/lib/python3*/*/MAPI/ ++++++ debian.rules ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:12.123669721 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:12.123669721 +0100 @@ -42,10 +42,9 @@ config.status: dh_testdir ./bootstrap.sh - echo debian7 workaround: - if ! pkg-config --exists python; then nopy=1; fi; echo nopy=$$nopy; \ - ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ - --with-distro=debian --prefix=/usr --localstatedir=/var \ + mkdir -p py2 && cd py2 && \ + ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --localstatedir=/var \ --sysconfdir=/etc --mandir=\$${prefix}/share/man \ --infodir=\$${prefix}/share/info \ --with-systemunitdir=/lib/systemd/system \ @@ -53,8 +52,20 @@ --with-quotatemplate-prefix=/etc/kopano/quotamail \ TCMALLOC_CFLAGS=" " \ TCMALLOC_LIBS="-ltcmalloc_minimal" --enable-epoll \ - $(CONFFLAG) --enable-release $${nopy+PYTHON_CFLAGS=`pkg-config python-2.7 --cflags` PYTHON_LIBS=`pkg-config python-2.7 --libs`} - dpkg-parsechangelog | perl -lne 'if(/^Version: ([\d\.~a-z]+)/i){print$$1;exit}' >version + PYTHON="python2" PYTHON_CFLAGS="$$(pkg-config python2 --cflags)" PYTHON_LIBS="$$(pkg-config python2 --libs)" \ + $(CONFFLAG) --enable-release + mkdir -p py3 && cd py3 && \ + ../configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --localstatedir=/var \ + --sysconfdir=/etc --mandir=\$${prefix}/share/man \ + --infodir=\$${prefix}/share/info \ + --with-systemunitdir=/lib/systemd/system \ + --with-userscript-prefix=/etc/kopano/userscripts \ + --with-quotatemplate-prefix=/etc/kopano/quotamail \ + TCMALLOC_CFLAGS=" " \ + TCMALLOC_LIBS="-ltcmalloc_minimal" --enable-epoll \ + PYTHON="python3" PYTHON_CFLAGS="$$(pkg-config python3 --cflags)" PYTHON_LIBS="$$(pkg-config python3 --libs)" \ + $(CONFFLAG) --enable-release # first entry point of dpkg-buildpackage clean: @@ -62,8 +73,9 @@ dh_testroot rm -f build-arch-stamp build-indep-stamp #CONFIGURE-STAMP# # Add here commands to clean up after the build process. - -$(MAKE) distclean - dh_clean + -$(MAKE) -C py2 distclean + -$(MAKE) -C py3 distclean + dh_clean # second entry point of dpkg-buildpackage build: build-arch build-indep @@ -72,8 +84,9 @@ build-arch-stamp: config.status # Add here commands to compile the arch part of the package. # compile kopano - $(MAKE) -j4 V=1 - cat common/include/kopano/ecversion.h + $(MAKE) -C py2 -j4 V=1 + $(MAKE) -C py3 -j4 V=1 + cat py2/common/include/kopano/ecversion.h touch build-arch-stamp build-indep: build-indep-stamp @@ -87,37 +100,36 @@ install-indep: dh_testdir dh_testroot - dh_clean -k -i + dh_clean -k -i # Add here commands to install the indep part of the package into # debian/<package>-doc. #INSTALLDOC# # because of the dh_clean and kopano-archiver-extra being arch independant, we need to install these files again - $(MAKE) DESTDIR=$(INSTDIR) install -C swig/python/kopano - $(MAKE) DESTDIR=$(INSTDIR) install -C swig/python/zarafa - $(MAKE) DESTDIR=$(INSTDIR) install -C po - $(MAKE) DESTDIR=$(INSTDIR) install-man1 - $(MAKE) DESTDIR=$(INSTDIR) install-man8 + $(MAKE) DESTDIR=$(INSTDIR) install -C py2/swig/python/kopano + $(MAKE) DESTDIR=$(INSTDIR) install -C py2/swig/python/zarafa + $(MAKE) DESTDIR=$(INSTDIR) install -C py2/po + $(MAKE) DESTDIR=$(INSTDIR) install-man1 -C py2 + $(MAKE) DESTDIR=$(INSTDIR) install-man8 -C py2 # and remove non za-sync files rm -f $(INSTDIR)/usr/share/man/man1/kopano* - dh_install -i --sourcedir=debian/tmp - install-arch: dh_testdir dh_testroot - dh_clean -k -s + dh_clean -k -s - # Add here commands to install the arch part of the package into + # Add here commands to install the arch part of the package into # debian/tmp. - $(MAKE) DESTDIR=$(INSTDIR) install PHP_SYSCONF_DIR=/usr/share/kopano/php/mapi + $(MAKE) -C py2 DESTDIR=$(INSTDIR) install PHP_SYSCONF_DIR=/usr/share/kopano/php/mapi + $(MAKE) -C py3 DESTDIR=$(INSTDIR)3 install PHP_SYSCONF_DIR=/usr/share/kopano/php/mapi mkdir -p ${INSTDIR}/var/lib/kopano/autorespond cp -av ${INSTDIR}/usr/share/doc/kopano/example-config/*.cfg ${INSTDIR}/etc/kopano/ rm -fv ${INSTDIR}/etc/kopano/ldap.cfg # since this is not linked to an initscript anymore, install the file ourselves. mkdir -p $(INSTDIR)/etc/default - install -o root -g root -m 644 debian/kopano-common.kopano.default $(INSTDIR)/etc/default/kopano + install -o root -g root -m 644 installer/linux/sysconfig.txt ${INSTDIR}/etc/default/kopano # link userscripts in /usr/share/kopano/userscripts mkdir -p $(INSTDIR)/usr/share/kopano/userscripts @@ -155,19 +167,19 @@ mkdir -p ${INSTDIR}/usr/share/doc/kopano-common gzip -c <RELNOTES.txt >${INSTDIR}/usr/share/doc/kopano-common/changelog.gz - # Build architecture independant packages using the common target. binary-indep: install-indep dh_testdir -i dh_testroot -i dh_installdirs -i -# dh_movefiles -i -# installs NEWS files + dh_install -Npython3-kopano -i --sourcedir=debian/tmp + dh_install -ppython3-kopano --remaining-packages -i --sourcedir=debian/tmp3 dh_installchangelogs -i dh_installdocs -i dh_compress -i dh_fixperms - dh_python2 --no-guessing-versions + dh_python2 -ppython-kopano -i --no-guessing-versions + dh_python3 -ppython3-kopano -i dh_installdeb -i dh_gencontrol -i dh_md5sums -i @@ -179,24 +191,10 @@ dh_testroot # install empty paths not present in 'make install' from <packagename>.dirs file, in actual package directory, not in tmp. dh_installdirs - dh_install --sourcedir=debian/tmp + dh_install -Npython3-mapi --sourcedir=debian/tmp + dh_install -ppython3-mapi --remaining-packages --sourcedir=debian/tmp3 dh_installchangelogs dh_installdocs -# dh_installexamples -# dh_installmenu -# dh_installdebconf -# dh_installlogrotate -# dh_installemacsen -# dh_installpam -# dh_installmime - cp -pv ${CURDIR}/installer/linux/kopano-dagent.init.debi ${CURDIR}/debian/kopano-dagent.kopano-dagent.init - cp -pv ${CURDIR}/installer/linux/kopano-gateway.init.debi ${CURDIR}/debian/kopano-gateway.kopano-gateway.init - cp -pv ${CURDIR}/installer/linux/kopano-ical.init.debi ${CURDIR}/debian/kopano-ical.kopano-ical.init - cp -pv ${CURDIR}/installer/linux/kopano-monitor.init.debi ${CURDIR}/debian/kopano-monitor.kopano-monitor.init - cp -pv ${CURDIR}/installer/linux/kopano-presence.init.debi ${CURDIR}/debian/kopano-presence.kopano-presence.init - cp -pv ${CURDIR}/installer/linux/kopano-search.init.debi ${CURDIR}/debian/kopano-search.kopano-search.init - cp -pv ${CURDIR}/installer/linux/kopano-server.init.debi ${CURDIR}/debian/kopano-server.kopano-server.init - cp -pv ${CURDIR}/installer/linux/kopano-spooler.init.debi ${CURDIR}/debian/kopano-spooler.kopano-spooler.init dh_installinit -R --name kopano-dagent dh_installinit -R --name kopano-gateway dh_installinit -R --name kopano-ical @@ -205,17 +203,12 @@ dh_installinit -R --name kopano-search dh_installinit -R --name kopano-server dh_installinit -R --name kopano-spooler -# dh_installcron -# dh_installinfo -# dh_installman dh_link dh_strip --dbg-package=kopano-dbg dh_compress -X.py -X.pl -Xusr/share/doc/kopano/kopano7-upgrade dh_fixperms -# dh_perl -# dh_python -# dh_pysupport - dh_python2 --no-guessing-versions + dh_python2 -ppython-mapi --no-guessing-versions + dh_python3 -ppython3-mapi dh_makeshlibs dh_installdeb dh_shlibdeps @@ -231,4 +224,4 @@ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-arch-real $(MAKE) -f debian/rules DH_OPTIONS=-i binary-indep -.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch +.PHONY: build clean binary-indep binary-arch binary install install-indep install-arch ++++++ kopano.dsc ++++++ --- /var/tmp/diff_new_pack.BSF9dI/_old 2018-01-19 11:53:12.155668213 +0100 +++ /var/tmp/diff_new_pack.BSF9dI/_new 2018-01-19 11:53:12.155668213 +0100 @@ -1,19 +1,20 @@ Format: 1.0 Source: kopano Architecture: any all -Version: 8.4.4.0-0 +Version: 8.4.91.14-0 DEBTRANSFORM-RELEASE: 1 Maintainer: Kopano Development <[email protected]> Homepage: https://kopano.com Standards-Version: 3.9.4 Build-Depends: debhelper (>= 4.0.0), binutils (>= 2.12.90.0.9), devscripts, - autotools-dev, g++, automake (>= 1:1.9) | automake1.9, autoconf (>= 2.59), + autotools-dev, g++ (>= 4.8), automake (>= 1:1.9) | automake1.9, autoconf (>= 2.59), libtool (>= 1.5), libtool-bin | libtool, pkg-config (>= 0.18), libssl-dev, - libvmime-dev (>= 0.9.2~), uuid-dev, php-dev | php4-dev | php5-dev, + libvmime-dev (>= 0.9.2), uuid-dev, php-dev | php4-dev | php5-dev, libmysqlclient15-dev | libmysqlclient-dev | libmariadb-client-lgpl-dev, libcurl3-dev | libcurl4-openssl-dev, gettext, libldap2-dev, m4, zlib1g-dev, fakeroot, libncurses5-dev, libncursesw5-dev, libxml2-dev, - libpam0g-dev, libkrb5-dev, + libpam0g-dev, libkrb5-dev, python3-dev, libicu-dev, libical-dev, swig, python-dev, - gsoap-dev (>= 2.8.39), libgoogle-perftools-dev, openssl, libs3-dev + gsoap (>= 2.8.49), libgoogle-perftools-dev, openssl, + libs3-dev (>= 4.1) Files: ++++++ kopanocore-8.4.4.0.tar.xz -> kopanocore-8.4.91.14.tar.xz ++++++ ++++ 90758 lines of diff (skipped)
