Index: pykota/trunk/debian/control
===================================================================
--- pykota/trunk/debian/control (revision 1592)
+++ pykota/trunk/debian/control (revision 1812)
@@ -8,6 +8,6 @@
 Package: pykota
 Architecture: all
-Depends: ${python:Depends}, python-egenix-mxdatetime, cupsys | lprng, python-pygresql | python-ldap, libapache-mod-python
-Recommends: snmp, netatalk
+Depends: ${python:Depends}, python-egenix-mxdatetime, cupsys | lprng, python-pygresql | python-ldap, libapache-mod-python, jaxml, python-osd
+Recommends: snmp, netatalk, python-psyco
 Description: Print Quota/Accounting system for CUPS and LPRng
  PyKota is a complete GPLed Print Quota and Accounting Software Solution
Index: pykota/trunk/debian/dirs
===================================================================
--- pykota/trunk/debian/dirs (revision 1592)
+++ pykota/trunk/debian/dirs (revision 1812)
@@ -3,4 +3,5 @@
 usr/share/doc/pykota/logos
 usr/share/doc/pykota/initscripts/ldap
+usr/share/doc/pykota/initscripts/mysql
 usr/share/doc/pykota/initscripts/postgresql
 usr/lib/cups/backend
@@ -9,3 +10,4 @@
 etc/default
 etc/cron.daily
+etc/ldap/schema
 var/www
Index: pykota/trunk/debian/pykota.templates
===================================================================
--- pykota/trunk/debian/pykota.templates (revision 1812)
+++ pykota/trunk/debian/pykota.templates (revision 1812)
@@ -0,0 +1,40 @@
+Template: pykota/database_caching_mechanism
+Type: note
+Description: Activate the database caching mechanism
+ You can now activate the database caching mechanism which
+ is disabled by default. It is especially recommended with
+ the LDAP backend. You can now disable the preservation of
+ the complete job history which is enabled by default. It
+ is probably more useful with the LDAP backend.
+ .
+ Please look at the configuration file /etc/pykota/pykota.conf
+ to learn how to do.
+
+Template: pykota/upgrading_1.19alpha17
+Type: note
+Description: Upgrading from a pre-1.19alpha17 to >=1.19alpha17
+ Warning: if you ar upgrading from a pre-1.19alpha17 to
+ 1.19alpha17 or above and use the postgreSQL backend,
+ then you have to modify your database schema using
+ /usr/share/doc/pykota/initscripts/postgresql/upgrade-to-1.19.sql
+ .
+ Please read documentation in
+ /usr/share/doc/pykota/initscripts/postgresql/ to learn
+ how to do.
+ .
+ You don't have anything special to do if this is your
+ first installation or if you are already running
+ version 1.19alpha17 or above.
+
+Template: pykota/upgrading_1.19alpha10
+Type: note
+Description: Upgrading from a pre-1.19alpha10 to >=1.19alpha10
+ Warning: if you are upgrading from a pre-1.19alpha10
+ to 1.19alpha10 or above you **MUST** modify your
+ /etc/pykota/pykota.conf file because "accounter"
+ and "requester" directives supported values have
+ changed.
+ .
+ You don't have anything special to do if this is your
+ first installation or if you are already running
+ version 1.19alpha10 or above.
Index: pykota/trunk/debian/changelog
===================================================================
--- pykota/trunk/debian/changelog (revision 1664)
+++ pykota/trunk/debian/changelog (revision 1812)
@@ -1,5 +1,24 @@
+pykota (1.20alpha24) unstable; urgency=low
+
+  * Update from CVS. 
+
+ -- Sergio Gonz�z Gonz�z <sergio.gonzalez@hispalinux.es>  Wed, 13 Oct 2004 01:29:44 +0200
+
+pykota (1.20alpha23) unstable; urgency=low
+
+  * Update from CVS.
+  * Added debconf support.
+  * Slightly reorganized the directory debian.
+  * Move pykota.schema to /etc/ldap/schema.
+  * Modified a bit the script setup.py to improve the build process of Debian
+    package.
+  * Add python-psyco as Recommends
+  * Add jaxml and python-osd as Depends
+
+ -- Sergio Gonz�z Gonz�z <sergio.gonzalez@hispalinux.es>  Mon, 11 Oct 2004 11:59:15 +0200
+
 pykota (1.19) unstable; urgency=low
 
-  * Update from CVS
+  * Update from CVS.
   
  -- Jerome Alet <alet@librelogiciel.com>  Wed,  28 Jul 2004 15:59:03 +0100
@@ -7,13 +26,13 @@
 pykota (1.19alpha29) unstable; urgency=low
 
-  * Update from CVS 
+  * Update from CVS.
 
- -- Sergio Gonz'alez Gonz'alez <sergio@hispalinux.es>  Mon,  5 Jul 2004 15:59:03 +0100
+ -- Sergio Gonz�z Gonz�z <sergio.gonzalez@hispalinux.es>  Mon,  5 Jul 2004 15:59:03 +0100
 
 pykota (1.19alpha20.cvs.20040611-1) unstable; urgency=low
 
-  * Update from CVS
+  * Update from CVS.
 
- -- Sergio Gonz'alez Gonz'alez <sergio.gonzalez@hispalinux.es>  Fri, 11 Jun 2004 17:10:04 +0100
+ -- Sergio Gonz�z Gonz�z <sergio.gonzalez@hispalinux.es>  Fri, 11 Jun 2004 17:10:04 +0100
 
 pykota (1.16.cvs.20040119-1) unstable; urgency=low
Index: pykota/trunk/debian/pykota.cron.daily
===================================================================
--- pykota/trunk/debian/pykota.cron.daily (revision 1812)
+++ pykota/trunk/debian/pykota.cron.daily (revision 1812)
@@ -0,0 +1,14 @@
+#! /bin/sh
+
+# check if print quota package is available
+test -x /usr/bin/warnpykota || exit 0
+
+# check if warnpyquota run is configured
+test -f /etc/default/printquota || exit 0
+. /etc/default/printquota
+
+if [ "$run_warnpykota" = "true" ]; then
+        /usr/bin/warnpykota
+fi
+
+exit 0
Index: pykota/trunk/debian/printquota.default
===================================================================
--- pykota/trunk/debian/printquota.default (revision 1812)
+++ pykota/trunk/debian/printquota.default (revision 1812)
@@ -0,0 +1,4 @@
+# Configuration for print quota scripts
+#
+# Set to "true" if warnpykota should be run in cron.daily
+run_warnpykota="false"
Index: pykota/trunk/debian/rules
===================================================================
--- pykota/trunk/debian/rules (revision 1669)
+++ pykota/trunk/debian/rules (revision 1812)
@@ -41,6 +41,6 @@
 	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/etc/default/printquota $(CURDIR)/debian/tmp/etc/default/printquota
-	install -m 755 debian/etc/pykota.cron.daily $(CURDIR)/debian/tmp/etc/cron.daily/pykota
+	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
@@ -49,6 +49,8 @@
 	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/usr/share/doc/pykota/initscripts/ldap/pykota.schema
+	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/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
@@ -85,5 +87,5 @@
 #	dh_install
 #	dh_installmenu
-#	dh_installdebconf       
+	dh_installdebconf       
 #	dh_installlogrotate
 #	dh_installemacsen
Index: pykota/trunk/debian/pykota.config
===================================================================
--- pykota/trunk/debian/pykota.config (revision 1812)
+++ pykota/trunk/debian/pykota.config (revision 1812)
@@ -0,0 +1,17 @@
+#/bin/sh -e
+#
+#
+
+# Source debconf library.
+. /usr/share/debconf/confmodule
+
+#db_title "Print Quota/Accounting system for CUPS and LPRng, PyKota"
+
+db_input medium pykota/database_caching_mechanism || true
+db_go
+
+db_input medium pykota/upgrading_1.19alpha17 || true
+db_go
+
+db_input medium pykota/upgrading_1.19alpha10 || true
+db_go
