Index: /pykota/trunk/debian/control
===================================================================
--- /pykota/trunk/debian/control (revision 1350)
+++ /pykota/trunk/debian/control (revision 1592)
@@ -3,11 +3,17 @@
 Priority: extra
 Maintainer: Peter Hawkins <peterh@debian.org>
-Build-Depends-Indep: debhelper (>= 4.0.0), python, docbook-utils
+Build-Depends-Indep: debhelper (>= 4.0.0), python, docbook-utils, python-dev
 Standards-Version: 3.6.1
 
 Package: pykota
 Architecture: all
-Depends: ${python:Depends}, python-egenix-mxdatetime, cupsys | lprng, python-pygresql | python-ldap
+Depends: ${python:Depends}, python-egenix-mxdatetime, cupsys | lprng, python-pygresql | python-ldap, libapache-mod-python
 Recommends: snmp, netatalk
 Description: Print Quota/Accounting system for CUPS and LPRng
- FIXME: Description
+ PyKota is a complete GPLed Print Quota and Accounting Software Solution
+ for the Common UNIX Printing System (aka CUPS) and LPR Next Generation
+ (aka LPRng) on GNU/Linux and Unix-like operating systems, which offers
+ a great flexibility with regard to the page accounting methods it
+ supports. By default it works by directly querying the printers for the
+ number of pages they have printed, but you can easily plug your own
+ page accounting methods if you prefer.
Index: /pykota/trunk/debian/dirs
===================================================================
--- /pykota/trunk/debian/dirs (revision 1350)
+++ /pykota/trunk/debian/dirs (revision 1592)
@@ -1,5 +1,11 @@
 usr/bin
 usr/share/pykota
+usr/share/doc/pykota/logos
+usr/share/doc/pykota/initscripts/ldap
+usr/share/doc/pykota/initscripts/postgresql
 usr/lib/cups/backend
+usr/lib/cgi-bin
 etc/pykota
 etc/default
+etc/cron.daily
+var/www
Index: /pykota/trunk/debian/Makefile.docs
===================================================================
--- /pykota/trunk/debian/Makefile.docs (revision 1350)
+++ /pykota/trunk/debian/Makefile.docs (revision 1592)
@@ -5,11 +5,11 @@
 build: build-stamp
 build-stamp:
-       docbook2html pykota.sgml
-       touch build-stamp
+	docbook2html pykota.sgml
+	touch build-stamp
 
 install: build
-       mkdir -p $(DESTDIR)/usr/share/doc/pykota/html/
-       cp *.html $(DESTDIR)/usr/share/doc/pykota/html/
+	mkdir -p $(DESTDIR)/usr/share/doc/pykota/html/
+	cp *.html $(DESTDIR)/usr/share/doc/pykota/html/
 
 clean:
-       rm -f *.html build-stamp
+	rm -f *.html build-stamp
Index: /pykota/trunk/debian/changelog
===================================================================
--- /pykota/trunk/debian/changelog (revision 1350)
+++ /pykota/trunk/debian/changelog (revision 1592)
@@ -1,2 +1,14 @@
+pykota (1.19alpha29) unstable; urgency=low
+
+  * Update from CVS 
+
+ -- Sergio Gonz'alez Gonz'alez <sergio@hispalinux.es>  Mon,  5 Jul 2004 15:59:03 +0100
+
+pykota (1.19alpha20.cvs.20040611-1) unstable; urgency=low
+
+  * Update from CVS
+
+ -- Sergio Gonz'alez Gonz'alez <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/docs
===================================================================
--- /pykota/trunk/debian/docs (revision 1350)
+++ /pykota/trunk/debian/docs (revision 1592)
@@ -4,4 +4,2 @@
 TODO
 SECURITY
-initscripts/postgresql/README.postgresql
-initscripts/ldap/README.ldap
Index: /pykota/trunk/debian/rules
===================================================================
--- /pykota/trunk/debian/rules (revision 1350)
+++ /pykota/trunk/debian/rules (revision 1592)
@@ -5,43 +5,68 @@
 
 # Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+export DH_VERBOSE=1
 
-export DH_COMPAT=3
+export DH_COMPAT=1
 
 
 build: build-stamp
 build-stamp: 
-       dh_testdir
-
-       #/usr/bin/docbook-to-man debian/pykota.sgml > pykota.1
-       /usr/bin/python setup.py build
-       (cd docs; make -f ../debian/Makefile.docs build)
-
-       touch build-stamp
+	dh_testdir
+	
+	#/usr/bin/docbook-to-man debian/pykota.sgml > pykota.1
+	/usr/bin/python setup.py build
+	(cd docs; make -f ../debian/Makefile.docs build)
+	
+	touch build-stamp
 
 clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp
-
-       /usr/bin/python setup.py clean --all
-       (cd docs; make -f ../debian/Makefile.docs clean)
-       rm -f pykota/__init__.pyc pykota/version.pyc
-
-       dh_clean 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp
+	
+	/usr/bin/python setup.py clean --all
+	(cd docs; make -f ../debian/Makefile.docs clean)
+	rm -f pykota/__init__.pyc pykota/version.pyc
+	
+	dh_clean 
 
 install: build
-       dh_testdir
-       dh_testroot
-       dh_clean -k 
-       dh_installdirs
-
-       /usr/bin/python setup.py install --prefix=`pwd`/debian/pykota/usr --no-compile
-
-       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/etc/default/printquota $(CURDIR)/debian/pykota/etc/default/printquota
-
-       (cd docs; make -f ../debian/Makefile.docs install DESTDIR=$(CURDIR)/debian/pykota/)
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+	
+	/usr/bin/python setup.py install --prefix=`pwd`/debian/tmp/usr --no-compile
+	
+	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 -g www-data -o www-data cgi-bin/printquota.cgi $(CURDIR)/debian/tmp/usr/lib/cgi-bin/printquota.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/usr/share/doc/pykota/initscripts/ldap/pykota.schema
+	install -m 644 initscripts/ldap/README.ldap $(CURDIR)/debian/tmp/usr/share/doc/pykota/initscripts/ldap/README.ldap
+	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/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
+	(chown www-data.www-data $(CURDIR)/debian/tmp/usr/lib/cgi-bin/printquota.cgi)
+	(chmod 755 $(CURDIR)/debian/tmp/usr/share/pykota/*)
+	(cd docs; make -f ../debian/Makefile.docs install DESTDIR=$(CURDIR)/debian/tmp/)
 
 
@@ -52,32 +77,32 @@
 # Build architecture-independent files here.
 binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installchangelogs 
-       dh_installdocs
-       dh_installexamples
-#      dh_install
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-       dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-#      dh_strip
-       dh_compress
-       dh_fixperms
-#      dh_perl
-       dh_python
-#      dh_makeshlibs
-       dh_installdeb
-#      dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs 
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf       
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_installinit
+	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+#	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+	dh_python
+#	dh_makeshlibs
+	dh_installdeb
+#	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
Index: /pykota/trunk/setup.py
===================================================================
--- /pykota/trunk/setup.py (revision 1522)
+++ /pykota/trunk/setup.py (revision 1592)
@@ -24,4 +24,7 @@
 #
 # $Log$
+# Revision 1.45  2004/07/06 09:37:01  jalet
+# Integrated most of the Debian packaging work made by Sergio Gonz�z Gonz�z
+#
 # Revision 1.44  2004/06/05 22:03:49  jalet
 # Payments history is now stored in database
@@ -195,4 +198,7 @@
 ACTION_CONTINUE = 0
 ACTION_ABORT = 1
+
+#ETC_DIR = "./debian/tmp/etc/pykota/"
+ETC_DIR = "/etc/pykota/"
 
 def checkOldModule(path) :
@@ -256,10 +262,10 @@
         
     # checks if a configuration file is present in the new location
-    if not os.path.isfile("/etc/pykota/pykota.conf") :
-        if not os.path.isdir("/etc/pykota") :
+    if not os.path.isfile(os.path.join(ETC_DIR,"pykota.conf")) :
+        if not os.path.isdir(ETC_DIR) :
             try :
-                os.mkdir("/etc/pykota")
+                os.mkdir(ETC_DIR)
             except OSError, msg :    
-                sys.stderr.write("An error occured while creating the /etc/pykota directory.\n%s\n" % msg)
+                sys.stderr.write("An error occured while creating the etc/pykota directory.\n%s\n" % msg)
                 sys.exit(-1)
                 
@@ -271,5 +277,5 @@
             if answer[0:1].upper() == 'Y' :
                 try :
-                    os.rename("/etc/pykota.conf", "/etc/pykota/pykota.conf")
+                    os.rename("/etc/pykota.conf", os.path.join(ETC_DIR,"pykota.conf"))
                 except OSError :    
                     sys.stderr.write("ERROR : An error occured while moving /etc/pykota.conf to /etc/pykota/pykota.conf\nAborted !\n")
@@ -287,6 +293,6 @@
                 if answer[0:1].upper() == 'Y' :
                     try :
-                        shutil.copy("conf/pykota.conf.sample", "/etc/pykota/pykota.conf")        
-                        shutil.copy("conf/pykotadmin.conf.sample", "/etc/pykota/pykotadmin.conf")        
+                        shutil.copy("conf/pykota.conf.sample", os.path.join(ETC_DIR,"pykota.conf"))        
+                        shutil.copy("conf/pykotadmin.conf.sample", os.path.join(ETC_DIR,"pykotadmin.conf"))        
                     except IOError, msg :    
                         sys.stderr.write("WARNING : Problem while installing sample configuration files in /etc/pykota/, please do it manually.\n%s\n" % msg)
@@ -317,5 +323,5 @@
     from pykota.config import PyKotaConfig,PyKotaConfigError
     try :
-        conf = PyKotaConfig("/etc/pykota/")
+        conf = PyKotaConfig(ETC_DIR)
     except PyKotaConfigError, msg :    
         sys.stedrr.write("%s\nINSTALLATION ABORTED !\nPlease restart installation.\n" % msg)
@@ -375,6 +381,6 @@
             
     # change files permissions    
-    os.chmod("/etc/pykota/pykota.conf", 0644)
-    os.chmod("/etc/pykota/pykotadmin.conf", 0640)
+    os.chmod(os.path.join(ETC_DIR,"pykota.conf"), 0644)
+    os.chmod(os.path.join(ETC_DIR,"pykotadmin.conf"), 0640)
     
     # WARNING MESSAGE    
@@ -420,5 +426,5 @@
     data_files.append((directory, [ mofile ]))
     
-docdir = "/usr/share/doc/pykota"    
+docdir = "share/doc/pykota"    
 docfiles = ["README", "FAQ", "SECURITY", "COPYING", "LICENSE", "CREDITS", "TODO", "NEWS"]
 data_files.append((docdir, docfiles))
Index: /pykota/trunk/CREDITS
===================================================================
--- /pykota/trunk/CREDITS (revision 1586)
+++ /pykota/trunk/CREDITS (revision 1592)
@@ -110,4 +110,5 @@
     - Eduardo Gielamo Oliveira and Rodolfo Broco Manin : PCL page counter
     - Sergey Romanov : bug fix
+    - Sergio Gonz�z Gonz�z : More work on Debian packaging + Doc
 
 ==============================================================
Index: /pykota/trunk/pykota/version.py
===================================================================
--- /pykota/trunk/pykota/version.py (revision 1584)
+++ /pykota/trunk/pykota/version.py (revision 1592)
@@ -22,5 +22,5 @@
 #
 
-__version__ = "1.19alpha29_unofficial"
+__version__ = "1.19alpha30_unofficial"
 
 __doc__ = """PyKota : a complete Printing Quota Solution for CUPS and LPRng."""
Index: /pykota/trunk/NEWS
===================================================================
--- /pykota/trunk/NEWS (revision 1591)
+++ /pykota/trunk/NEWS (revision 1592)
@@ -22,4 +22,9 @@
 PyKota NEWS :
 
+    - 1.19alpha30 :
+    
+        - Integrated most of the Debian work from Sergio 
+          Gonz�z Gonz�z
+          
     - 1.19alpha29 : 
     
Index: /pykota/trunk/stylesheets/pykota.css
===================================================================
--- /pykota/trunk/stylesheets/pykota.css (revision 1525)
+++ /pykota/trunk/stylesheets/pykota.css (revision 1592)
@@ -19,4 +19,8 @@
 
 /* $Id$ */
+
+body {
+        background-color: #FFFFFF;
+     }
 
 .even {
