diff -Nur pykota-1.27.0.o/debian/changelog pykota-1.27.0/debian/changelog --- pykota-1.27.0.o/debian/changelog 2018-03-09 17:12:13.946141000 +0100 +++ pykota-1.27.0/debian/changelog 2018-03-09 15:51:18.000000000 +0100 @@ -1,3 +1,16 @@ +pykota (1.27.0-1) unstable; urgency=low + + * version bump + + -- Univention GmbH Fri, 09 Mar 2018 15:51:18 +0100 + +pykota (1.26-2) unstable; urgency=low + + * fixed quoting in storages/pgstorage.py + * fixed pykota-mysql.sql + + -- Univention GmbH Fri, 09 Mar 2018 15:51:18 +0100 + pykota (1.26+unofficial) unstable; urgency=low * Update from SVN. diff -Nur pykota-1.27.0.o/debian/compat pykota-1.27.0/debian/compat --- pykota-1.27.0.o/debian/compat 1970-01-01 01:00:00.000000000 +0100 +++ pykota-1.27.0/debian/compat 2018-03-09 15:51:18.000000000 +0100 @@ -0,0 +1 @@ +5 diff -Nur pykota-1.27.0.o/debian/control pykota-1.27.0/debian/control --- pykota-1.27.0.o/debian/control 2018-03-09 17:12:13.946141000 +0100 +++ pykota-1.27.0/debian/control 2018-03-09 16:41:35.810141000 +0100 @@ -2,14 +2,14 @@ Section: text Priority: extra Maintainer: Jerome Alet -Build-Depends-Indep: debhelper (>= 4.0.0), python, docbook-utils, python-dev +Build-Depends-Indep: debhelper (>= 4.0.0), python, docbook-utils, python-dev, python-support Standards-Version: 3.6.1 XS-Vcs-Svn: svn://svn.librelogiciel.com/pykota XS-Vcs-Browser: http://svn.librelogiciel.com/cgi-bin/viewcvs.cgi/pykota/ Package: pykota Architecture: all -Depends: python, python-egenix-mxdatetime, cupsys, python-pygresql | python-ldap | python-pysqlite2 | python-mysqldb, jaxml | python-jaxml, python-osd, python-reportlab, python-pysnmp4, python-imaging +Depends: python, python-egenix-mxdatetime, cups, python-pygresql | python-ldap | python-pysqlite2 | python-mysqldb, jaxml | python-jaxml, python-osd, python-reportlab, python-pysnmp4, python-imaging Recommends: qa-assistant, snmp, netatalk, python-psyco, npadmin, python-pam, python-chardet Description: Print Quota/Accounting system for CUPS PyKota is a full featured, internationalized, centralized and extensible diff -Nur pykota-1.27.0.o/debian/postinst pykota-1.27.0/debian/postinst --- pykota-1.27.0.o/debian/postinst 2018-03-09 17:12:13.946141000 +0100 +++ pykota-1.27.0/debian/postinst 2018-03-09 16:41:58.878141000 +0100 @@ -1,6 +1,10 @@ #!/bin/sh -e # $Id: postinst 3232 2007-07-24 10:56:50Z jerome $ +if which update-python-modules >/dev/null 2>&1; then + update-python-modules pykota.public pykota.private +fi + . /usr/share/debconf/confmodule /bin/chown -R pykota.pykota ~pykota diff -Nur pykota-1.27.0.o/debian/prerm pykota-1.27.0/debian/prerm --- pykota-1.27.0.o/debian/prerm 1970-01-01 01:00:00.000000000 +0100 +++ pykota-1.27.0/debian/prerm 2018-03-09 16:42:28.854141000 +0100 @@ -0,0 +1,7 @@ +#!/bin/sh + +if which update-python-modules >/dev/null 2>&1; then + update-python-modules -c pykota.public pykota.private +fi + +exit 0 diff -Nur pykota-1.27.0.o/debian/rules pykota-1.27.0/debian/rules --- pykota-1.27.0.o/debian/rules 2018-03-09 17:12:13.946141000 +0100 +++ pykota-1.27.0/debian/rules 2018-03-09 16:45:58.306141000 +0100 @@ -6,7 +6,10 @@ # Uncomment this to turn on verbose mode. export DH_VERBOSE=1 -export DH_COMPAT=1 +export DH_COMPAT=5 + +%: + dh $@ --with 'python_support' build: build-stamp @@ -36,49 +39,51 @@ dh_clean -k dh_installdirs - /usr/bin/python setup.py install --prefix=`pwd`/debian/tmp/usr --no-compile + /usr/bin/python setup.py install --prefix=`pwd`/debian/pykota/usr --no-compile + + dh_pysupport - install -m 644 conf/pykota.conf.sample $(CURDIR)/debian/tmp/etc/pykota/pykota.conf - install -m 640 conf/pykotadmin.conf.sample $(CURDIR)/debian/tmp/etc/pykota/pykotadmin.conf - install -m 644 debian/printquota.default $(CURDIR)/debian/tmp/etc/default/printquota - install -m 755 debian/pykota.cron.daily $(CURDIR)/debian/tmp/etc/cron.daily/pykota - - install -m 755 -g www-data -o www-data cgi-bin/printquota.cgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/printquota.cgi - install -m 755 -g www-data -o www-data cgi-bin/dumpykota.cgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/dumpykota.cgi - install -m 755 -g www-data -o www-data cgi-bin/pykotme.cgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/pykotme.cgi - install -m 644 stylesheets/pykota.css $(CURDIR)/debian/tmp/var/www/pykota.css - install -m 644 logos/pykotasmall.png $(CURDIR)/debian/tmp/var/www/pykota.png - install -m 644 initscripts/README $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/README - install -m 644 initscripts/ldap/pykota-sample.ldif $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/ldap/pykota-sample.ldif - install -m 644 initscripts/ldap/pykota.schema $(CURDIR)/debian/tmp/etc/ldap/schema/pykota.schema - install -m 644 initscripts/ldap/README.ldap $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/ldap/README.ldap - install -m 644 initscripts/sqlite/README.sqlite $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/sqlite/README.sqlite - install -m 644 initscripts/sqlite/pykota-sqlite.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/sqlite/pykota-sqlite.sql - install -m 644 initscripts/mysql/README.mysql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/mysql/README.mysql - install -m 644 initscripts/mysql/pykota-mysql.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/mysql/pykota-mysql.sql - install -m 644 initscripts/postgresql/README.postgresql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/README.postgresql - install -m 644 initscripts/postgresql/pykota-postgresql.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/pykota-postgresql.sql - install -m 644 initscripts/postgresql/upgrade-from-before-1.03.py $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/upgrade-from-before-1.03.py - install -m 644 initscripts/postgresql/upgrade-to-1.14.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.14.sql - install -m 644 initscripts/postgresql/upgrade-to-1.16.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.16.sql - install -m 644 initscripts/postgresql/upgrade-to-1.19.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.19.sql - install -m 644 initscripts/postgresql/upgrade-to-1.21.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.21.sql - install -m 644 initscripts/postgresql/upgrade-to-1.23.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.23.sql - install -m 644 initscripts/postgresql/VERYOLDpykota-upgrade-postgresql.sql $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/postgresql/VERYOLDpykota-upgrade-postgresql.sql - install -m 644 logos/pleaseupgrade.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pleaseupgrade.png - install -m 644 logos/pykotaofficialindexed.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykotaofficialindexed.png - install -m 644 logos/pykotaofficialindexedsmall.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykotaofficialindexedsmall.png - install -m 644 logos/pykotaofficial.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykotaofficial.png - install -m 644 logos/pykotaofficialsmall.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykotaofficialsmall.png - install -m 644 logos/pykota.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykota.png - install -m 644 logos/pykotasmall.png $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykotasmall.png - install -m 644 logos/pykota.xcf $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/pykota.xcf - install -m 644 logos/README $(CURDIR)/debian/tmp/usr/share/doc/pykota/logos/README - install -m 644 qa-assistant/pykota.xml $(CURDIR)/debian/tmp/usr/share/qa-assistant/data/pykota.xml - (chown www-data.www-data $(CURDIR)/debian/tmp/usr/lib/cgi-bin/printquota.cgi) - (chown www-data.www-data $(CURDIR)/debian/tmp/usr/lib/cgi-bin/dumpykota.cgi) - (chown www-data.www-data $(CURDIR)/debian/tmp/usr/lib/cgi-bin/pykotme.cgi) - (cd docs; make -f ../debian/Makefile.docs install DESTDIR=$(CURDIR)/debian/tmp/) + install -m 644 conf/pykota.conf.sample $(CURDIR)/debian/pykota/etc/pykota/pykota.conf + install -m 640 conf/pykotadmin.conf.sample $(CURDIR)/debian/pykota/etc/pykota/pykotadmin.conf + install -m 644 debian/printquota.default $(CURDIR)/debian/pykota/etc/default/printquota + install -m 755 debian/pykota.cron.daily $(CURDIR)/debian/pykota/etc/cron.daily/pykota + + install -m 755 -g www-data -o www-data cgi-bin/printquota.cgi $(CURDIR)/debian/pykota/usr/lib/cgi-bin/printquota.cgi + install -m 755 -g www-data -o www-data cgi-bin/dumpykota.cgi $(CURDIR)/debian/pykota/usr/lib/cgi-bin/dumpykota.cgi + install -m 755 -g www-data -o www-data cgi-bin/pykotme.cgi $(CURDIR)/debian/pykota/usr/lib/cgi-bin/pykotme.cgi + install -m 644 stylesheets/pykota.css $(CURDIR)/debian/pykota/var/www/pykota.css + install -m 644 logos/pykotasmall.png $(CURDIR)/debian/pykota/var/www/pykota.png + install -m 644 initscripts/README $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/README + install -m 644 initscripts/ldap/pykota-sample.ldif $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/ldap/pykota-sample.ldif + install -m 644 initscripts/ldap/pykota.schema $(CURDIR)/debian/pykota/etc/ldap/schema/pykota.schema + install -m 644 initscripts/ldap/README.ldap $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/ldap/README.ldap + install -m 644 initscripts/sqlite/README.sqlite $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/sqlite/README.sqlite + install -m 644 initscripts/sqlite/pykota-sqlite.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/sqlite/pykota-sqlite.sql + install -m 644 initscripts/mysql/README.mysql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/mysql/README.mysql + install -m 644 initscripts/mysql/pykota-mysql.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/mysql/pykota-mysql.sql + install -m 644 initscripts/postgresql/README.postgresql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/README.postgresql + install -m 644 initscripts/postgresql/pykota-postgresql.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/pykota-postgresql.sql + install -m 644 initscripts/postgresql/upgrade-from-before-1.03.py $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/upgrade-from-before-1.03.py + install -m 644 initscripts/postgresql/upgrade-to-1.14.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.14.sql + install -m 644 initscripts/postgresql/upgrade-to-1.16.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.16.sql + install -m 644 initscripts/postgresql/upgrade-to-1.19.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.19.sql + install -m 644 initscripts/postgresql/upgrade-to-1.21.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.21.sql + install -m 644 initscripts/postgresql/upgrade-to-1.23.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.23.sql + install -m 644 initscripts/postgresql/VERYOLDpykota-upgrade-postgresql.sql $(CURDIR)/debian/pykota/usr/share/doc/pykota/initscripts/postgresql/VERYOLDpykota-upgrade-postgresql.sql + install -m 644 logos/pleaseupgrade.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pleaseupgrade.png + install -m 644 logos/pykotaofficialindexed.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykotaofficialindexed.png + install -m 644 logos/pykotaofficialindexedsmall.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykotaofficialindexedsmall.png + install -m 644 logos/pykotaofficial.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykotaofficial.png + install -m 644 logos/pykotaofficialsmall.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykotaofficialsmall.png + install -m 644 logos/pykota.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykota.png + install -m 644 logos/pykotasmall.png $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykotasmall.png + install -m 644 logos/pykota.xcf $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/pykota.xcf + install -m 644 logos/README $(CURDIR)/debian/pykota/usr/share/doc/pykota/logos/README + install -m 644 qa-assistant/pykota.xml $(CURDIR)/debian/pykota/usr/share/qa-assistant/data/pykota.xml + (chown www-data.www-data $(CURDIR)/debian/pykota/usr/lib/cgi-bin/printquota.cgi) + (chown www-data.www-data $(CURDIR)/debian/pykota/usr/lib/cgi-bin/dumpykota.cgi) + (chown www-data.www-data $(CURDIR)/debian/pykota/usr/lib/cgi-bin/pykotme.cgi) + (cd docs; make -f ../debian/Makefile.docs install DESTDIR=$(CURDIR)/debian/pykota/) # Build architecture-dependent files here. @@ -108,7 +113,7 @@ dh_compress dh_fixperms # dh_perl - dh_python +# dh_python # dh_makeshlibs dh_installdeb # dh_shlibdeps