séparation des packages debian:

- glasnost: la base
 - glasnost-gtk: l'interface gtk
 - glasnost-servers: les serveurs
 - glasnost-web: l'interface web
 - glasnost-web-extra-templates: l'interface web

debian/.cvsignore

@@ -1,8 +1,8 @@
-glasnost
 *.debhelper
 glasnost.substvars
 files
-glasnost-python2.1
-glasnost-python2.2
-glasnost-extra-templates
-
+glasnost
+glasnost-gtk
+glasnost-servers
+glasnost-web
+glasnost-web-extra-templates

debian/control

@@ -7,8 +7,8 @@ Standards-Version: 3.5.2
 
 Package: glasnost
 Architecture: all
-Depends:, debconf, python, apache | apache-ssl, libapache-mod-python, python-imaging, python-tal, python-xml
-Recommends: python-docutils, aspell, xsltproc, docbook, docbook-xsl
+Depends: python, python-imaging, python-tal, python-xml
+Recommends: glasnost-servers, glasnost-web
 Conflicts: eevote, glasnost-python2.1, glasnost-python2.2
 Replaces: eevote, glasnost-python2.1, glasnost-python2.2
 Description: A collaborative content management system with voting features
@@ -17,8 +17,23 @@ Description: A collaborative content management system with voting features
  .
  It evolved from a simple voting system to a complex content management system
  with many features (collaborative redaction, calendar...)
+ .
+ This package provides the basic framework.  You probably also want to install
+ the servers and an interface (either gtk or web).
 
-Package: glasnost-extra-templates
+Package: glasnost-gtk
+Architecture: all
+Depends: glasnost (= ${Source-Version}), python-gtk2
+Description: A collaborative content management system with voting features
+ Glasnost is the voting system originally developed by Easter-eggs for
+ in-house decision making and now also used in other places.
+ .
+ It evolved from a simple voting system to a complex content management system
+ with many features (collaborative redaction, calendar...)
+ .
+ This package provides the GTK+ GUI interface to Glasnost.
+
+Package: glasnost-servers
 Architecture: all
 Depends: glasnost (= ${Source-Version})
 Description: A collaborative content management system with voting features
@@ -28,5 +43,33 @@ Description: A collaborative content management system with voting features
  It evolved from a simple voting system to a complex content management system
  with many features (collaborative redaction, calendar...)
  .
- This package provides additional templates.
+ This package provides the Glasnost XML-RPC servers, where all the work is
+ done.
+
+Package: glasnost-web
+Architecture: all
+Depends: glasnost (= ${Source-Version}), apache | apache-ssl, libapache-mod-python, python-imaging, python-tal, python-xml
+Recommends: python-docutils, aspell, xsltproc, docbook, docbook-xsl
+Description: A collaborative content management system with voting features
+ Glasnost is the voting system originally developed by Easter-eggs for
+ in-house decision making and now also used in other places.
+ .
+ It evolved from a simple voting system to a complex content management system
+ with many features (collaborative redaction, calendar...)
+ .
+ This package provides the Web interface to Glasnost.
+
+Package: glasnost-web-extra-templates
+Architecture: all
+Depends: glasnost-web (= ${Source-Version})
+Conflicts: glasnost-extra-templates
+Replaces: glasnost-extra-templates
+Description: A collaborative content management system with voting features
+ Glasnost is the voting system originally developed by Easter-eggs for
+ in-house decision making and now also used in other places.
+ .
+ It evolved from a simple voting system to a complex content management system
+ with many features (collaborative redaction, calendar...)
+ .
+ This package provides additional templates for the web interface.
 

debian/glasnost-gtk.files

@@ -0,0 +1,2 @@
+/usr/bin/glasnost-gtk
+/usr/lib/glasnost/glasnost/gtk

debian/glasnost-servers.files

@@ -0,0 +1,3 @@
+/usr/lib/glasnost/servers
+/usr/lib/glasnost/glasnost/server
+/var/log/glasnost

debian/glasnost-web.files

@@ -0,0 +1,4 @@
+/usr/lib/glasnost/web
+/usr/lib/glasnost/glasnost/web
+/var/lib/glasnost/extensions/
+/var/lib/glasnost/templates/

debian/rules

@@ -49,20 +49,21 @@ install: build
 	# Add here commands to install the package into debian/glasnost.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/glasnost PREFIX=/usr GLASNOST=glasnost TEMPLATES='$(BASETEMPLATES)' PYTHON_VERSION=2.2
 		# note: python version is only specified to get to pygettext.py
-	$(MAKE) install-templates DESTDIR=$(CURDIR)/debian/glasnost-extra-templates PREFIX=/usr GLASNOST=glasnost 'TEMPLATES=$(TEMPLATES)'
+	$(MAKE) install-templates DESTDIR=$(CURDIR)/debian/glasnost-web-extra-templates PREFIX=/usr GLASNOST=glasnost 'TEMPLATES=$(TEMPLATES)'
 	for F in $(BASETEMPLATES); \
 	do \
 		echo $$F; \
-		rm -rf $(CURDIR)/debian/glasnost-extra-templates/var/lib/glasnost/templates/$$F; \
+		rm -rf $(CURDIR)/debian/glasnost-web-extra-templates/var/lib/glasnost/templates/$$F; \
 	done
 	cp config $(CURDIR)/debian/glasnost/etc/glasnost/
+	rm $(CURDIR)/debian/glasnost/usr/share/glasnost/config
 	find $(CURDIR)/debian/glasnost/ -name .htaccess -exec rm {} \;
 	# we'll recreate them debian compliant later
 	find $(CURDIR)/debian/glasnost/ -type l -exec rm -f {} \;
 	find $(CURDIR)/debian/glasnost/ -name '*.pyc' -exec rm -f {} \;
 	find $(CURDIR)/debian/glasnost* -name .cvsignore -exec rm -f {} \;
 	find $(CURDIR)/debian/glasnost* -name '.*' -type f -exec rm -r {} \;
-	-find $(CURDIR)/debian/glasnost* -name CVS -type d -exec rm -rf {} \;
+	-find $(CURDIR)/debian/glasnost* -name CVS -type d -exec rm -rf {} \; 2> /dev/null
 	rm $(CURDIR)/debian/glasnost/usr/share/glasnost/glasnost-start
 	# this is ugly but python 2.1 didn't have xmlrpclib.py
 	-mkdir -p $(CURDIR)/debian/glasnost/usr/lib/python2.1/site-packages/
@@ -72,11 +73,13 @@ install: build
 binary-indep: build install
 	dh_testdir
 	dh_testroot
+	dh_movefiles --sourcedir=./debian/glasnost/
+	-find ./debian/glasnost/ -type d -exec rmdir -p {} \; 2> /dev/null
 #	dh_installdebconf	
 	dh_installdocs
 	dh_installexamples
 #	dh_installlogrotate
-	dh_installinit
+	dh_installinit --init-script=glasnost
 	dh_installcron
 	dh_installman
 	dh_installinfo