r842 - schooltool/trunk/debian

[Brian Sutherland]

Author: jinty-guest
Date: 2007-05-05 19:40:07 +0000 (Sat, 05 May 2007)
New Revision: 842

Added:
   schooltool/trunk/debian/site.zcml
Modified:
   schooltool/trunk/debian/changelog
   schooltool/trunk/debian/control
   schooltool/trunk/debian/rules
   schooltool/trunk/debian/schooltool.conf.default
Log:
Fixes and give the admin some control over zcml so we can have extensions.

Modified: schooltool/trunk/debian/changelog
===================================================================
--- schooltool/trunk/debian/changelog	2007-05-05 19:24:00 UTC (rev 841)
+++ schooltool/trunk/debian/changelog	2007-05-05 19:40:07 UTC (rev 842)
@@ -6,6 +6,7 @@
   * Update build depends.
   * Add XB-Python-Version to schooltool binary.
   * Fix to build with setuptools rather than zpkg.
+  * Give the administrator some control over zcml configuration.
 
  -- 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:24:00 UTC (rev 841)
+++ schooltool/trunk/debian/control	2007-05-05 19:40:07 UTC (rev 842)
@@ -3,8 +3,8 @@
 Section: web
 Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers at lists.alioth.debian.org>
 Uploaders: Brian Sutherland <jinty at web.de>, Fabio Tranchitella <kobold at debian.org>
-Build-Depends: debhelper
-Build-Depends-Indep: python, python-all-dev, debhelper (>= 5.0.39), python-central (>= 0.5), python-setuptools
+Build-Depends: debhelper (>= 5.0.39)
+Build-Depends-Indep: python, python-all-dev, python-central (>= 0.5), python-setuptools
 XS-Python-Version: 2.4
 Standards-Version: 3.7.2
 

Modified: schooltool/trunk/debian/rules
===================================================================
--- schooltool/trunk/debian/rules	2007-05-05 19:24:00 UTC (rev 841)
+++ schooltool/trunk/debian/rules	2007-05-05 19:40:07 UTC (rev 842)
@@ -43,12 +43,6 @@
 	dh_installdirs -i
 
 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
 	# move the server executable to the configuration package
 	install -m 755 -D -p debian/$(SERVER).py \
 		debian/$(SERVER)/usr/bin/$(SERVER)
@@ -59,6 +53,8 @@
 	    debian/$(SERVER)/etc/$(SERVER)/ssl-cert.cnf
 	install -m 644 -D -p debian/$(SERVER).conf.default \
 	    debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER).conf.default
+	install -m 644 -D -p debian/site.zcml \
+	    debian/$(SERVER)/etc/$(SERVER)/site.zcml
 	touch $@
 
 install-python%:

Modified: schooltool/trunk/debian/schooltool.conf.default
===================================================================
--- schooltool/trunk/debian/schooltool.conf.default	2007-05-05 19:24:00 UTC (rev 841)
+++ schooltool/trunk/debian/schooltool.conf.default	2007-05-05 19:40:07 UTC (rev 842)
@@ -4,7 +4,7 @@
 # for a detailed example with comments.
 
 # Site definition file:
-site-definition /usr/share/schooltool/zcml/site.zcml
+site-definition /etc/schooltool/site.zcml
 
 
 ## You can easily change the following settings using dpkg-reconfigure

Added: schooltool/trunk/debian/site.zcml
===================================================================
--- schooltool/trunk/debian/site.zcml	2007-05-05 19:24:00 UTC (rev 841)
+++ schooltool/trunk/debian/site.zcml	2007-05-05 19:40:07 UTC (rev 842)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configure xmlns="http://namespaces.zope.org/zope"
+           xmlns:browser="http://namespaces.zope.org/browser"
+           i18n_domain="schooltool">
+
+  <include files="package-includes/*-meta.zcml" />
+
+  <include package="schooltool" />
+
+  <include files="package-includes/*-configure.zcml" />
+
+  <!-- Provide local overrides of standard configurations-->
+  <includeOverrides files="package-includes/*-overrides.zcml" />
+
+</configure>


Property changes on: schooltool/trunk/debian/site.zcml
___________________________________________________________________
Name: svn:eol-style
   + native