r841 - schooltool/trunk/debian

[Brian Sutherland]

Author: jinty-guest
Date: 2007-05-05 19:24:00 +0000 (Sat, 05 May 2007)
New Revision: 841

Modified:
   schooltool/trunk/debian/changelog
   schooltool/trunk/debian/control
   schooltool/trunk/debian/rules
Log:
Make it actually build.

Modified: schooltool/trunk/debian/changelog
===================================================================
--- schooltool/trunk/debian/changelog	2007-05-05 19:07:58 UTC (rev 840)
+++ schooltool/trunk/debian/changelog	2007-05-05 19:24:00 UTC (rev 841)
@@ -4,6 +4,8 @@
   * Don't do build time checking, this will never really be reliable anyway
     and makes the build dependencies extreme.
   * Update build depends.
+  * Add XB-Python-Version to schooltool binary.
+  * Fix to build with setuptools rather than zpkg.
 
  -- Brian Sutherland <brian at vanguardistas.net>  Sat,  5 May 2007 23:15:53 +0200
 

Modified: schooltool/trunk/debian/control
===================================================================
--- schooltool/trunk/debian/control	2007-05-05 19:07:58 UTC (rev 840)
+++ schooltool/trunk/debian/control	2007-05-05 19:24:00 UTC (rev 841)
@@ -12,6 +12,7 @@
 Section: web
 Architecture: all
 Depends: ${python:Depends}, adduser, ssl-cert, openssl, lsb-base, python-schooltool (= ${Source-Version}), ${misc:Depends}
+XB-Python-Version: ${python:Versions}
 Description: common platform for school administration
  SchoolTool is an open source school management information system.  It is
  a distributed client/server system.  The SchoolTool server presents two

Modified: schooltool/trunk/debian/rules
===================================================================
--- schooltool/trunk/debian/rules	2007-05-05 19:07:58 UTC (rev 840)
+++ schooltool/trunk/debian/rules	2007-05-05 19:24:00 UTC (rev 841)
@@ -17,8 +17,8 @@
 
 build-python%:
 	dh_testdir
-	python$* install.py -q build
-	# zpkg doesn't build translations, so we build them ourselves
+	python$* setup.py -q build
+	# setup.py doesn't build translations, so we build them ourselves
 	set -e; \
 	    for f in build/lib/schooltool/locales/*/*/*.po; do \
 		msgfmt -o $${f%.po}.mo $$f;\
@@ -45,10 +45,10 @@
 install: build install-pre $(PYVERS:%=install-python%)
 	#### Move some files installed into the server package###
 	# zcml configuration to usr/share
-	install -m 644 -D install-python$(SERVERPYVER)/schooltool-skel/etc/site.zcml \
-	    debian/$(SERVER)/usr/share/$(SERVER)/zcml/site.zcml
-	mv install-python$(SERVERPYVER)/schooltool-skel/etc/package-includes \
-	    debian/$(SERVER)/usr/share/$(SERVER)/zcml
+	#install -m 644 -D install-python$(SERVERPYVER)/schooltool-skel/etc/site.zcml \
+	#    debian/$(SERVER)/usr/share/$(SERVER)/zcml/site.zcml
+	#mv install-python$(SERVERPYVER)/schooltool-skel/etc/package-includes \
+	#    debian/$(SERVER)/usr/share/$(SERVER)/zcml
 	# move the server executable to the configuration package
 	install -m 755 -D -p debian/$(SERVER).py \
 		debian/$(SERVER)/usr/bin/$(SERVER)
@@ -62,10 +62,7 @@
 	touch $@
 
 install-python%:
-	python$* install.py -q install --no-compile --skip-build --home=install-python$*
-	# Python modules to to the python path, inside the python module package
-	install -d debian/$(PACKAGE)/usr/lib/python$*/site-packages 
-	mv install-python$*/lib/python/* debian/$(PACKAGE)/usr/lib/python$*/site-packages
+	python$* setup.py -q install --no-compile --skip-build --single-version-externally-managed --root debian/$(PACKAGE)
 	touch $@
 
 
@@ -83,7 +80,6 @@
 	dh_compress
 	dh_fixperms
 	dh_pycentral
-	dh_python
 	dh_installdeb
 	dh_gencontrol
 	dh_md5sums