Install ceo daemon

We need to split into different packages for the daemon and clients.

debian/.gitignore

@@ -1,5 +1,9 @@
 /ceo.substvars
-/ceo
+/ceo-common
+/ceo-clients
+/ceo-daemon
+/ceo-gui
 /files
 /*.debhelper
 /*.debhelper.log
+/*.substvars

debian/ceo-clients.manpages

@@ -0,0 +1,2 @@
+docs/addclub.1
+docs/addmember.1

debian/ceo-common.dirs

@@ -0,0 +1 @@
+etc/csc

debian/ceo-common.install

@@ -0,0 +1 @@
+etc/accounts.cf etc/kerberos.cf etc/ldap.cf etc/csc

debian/ceo-daemon.dirs

@@ -1,3 +1 @@
-usr/bin
-etc/csc
 etc/ldap/schema

debian/ceo-daemon.install

@@ -0,0 +1 @@
+etc/csc.schema etc/ldap/schema

debian/ceo-gui.manpages

@@ -0,0 +1 @@
+docs/ceo.1

debian/control

@@ -5,10 +5,29 @@ Maintainer: Systems Committee <syscom@csclub.uwaterloo.ca>
 Build-Depends: debhelper (>= 5.0.0), python-dev (>= 2.4), python-support (>= 0.3), libkrb5-dev, libldap2-dev, libsasl2-dev, libsctp-dev, libprotobuf-c0-dev, libacl1-dev
 Standards-Version: 3.8.2
 
-Package: ceo
-Architecture: any
-Depends: python-ldap, python-urwid, python-sqlobject, python-psycopg2, ${python:Depends}, ${shlibs:Depends}
-Description: Computer Science Club Administrative Utilities
+Package: ceo-common
+Architecture: all
+Description: Computer Science Club Common Files
  This package contains the CSC Electronic Office
- and other Computer Science Club administrative
- programs.
+ common files.
+
+Package: ceo-gui
+Architecture: all
+Depends: ceo-clients, python-ldap, python-urwid, python-sqlobject, python-psycopg2, ${python:Depends}, ${shlibs:Depends}
+Description: Computer Science Club Administrative GUI
+ This package contains the CSC Electronic Office
+ graphical user interface.
+
+Package: ceo-clients
+Architecture: any
+Depends: ceo-common, ${shlibs:Depends}
+Description: Computer Science Club Administrative Clients
+ This package contains the CSC Electronic Office
+ client programs.
+
+Package: ceo-daemon
+Architecture: any
+Depends: ceo-common, ${shlibs:Depends}
+Description: Computer Science Club Administrative Daemon
+ This package contains the CSC Electronic Office
+ daemon.

debian/docs

@@ -1 +0,0 @@
-docs/*

debian/install

@@ -1,2 +0,0 @@
-etc/accounts.cf.example etc/kerberos.cf.example etc/ldap.cf.example etc/csc
-etc/csc.schema etc/ldap/schema

debian/manpages

@@ -1 +0,0 @@
-docs/*.[0-9]

debian/rules

@@ -18,13 +18,14 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_installdirs
-	python setup.py -q install --no-compile -O0 --root=debian/ceo
-	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/ceo PREFIX=/usr install
-	
+	python setup.py -q install --no-compile -O0 --root=debian/ceo-gui
+	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/ceo-clients PREFIX=/usr install_clients
+	$(MAKE) -C src DESTDIR=$(CURDIR)/debian/ceo-daemon PREFIX=/usr install_daemon
+
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs 
+	dh_installchangelogs
 	dh_installdocs
 	dh_installexamples
 	dh_install

src/Makefile

@@ -48,11 +48,17 @@ config-test: config-test.o parser.o
 
 config.o: config.h config-vars.h
 
-install:
-	install -d $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/lib/ceod
-	install ceod $(DESTDIR)$(PREFIX)/sbin
+install_clients:
+	install -d $(DESTDIR)$(PREFIX)/bin $(DESTDIR)$(PREFIX)/lib/ceod
 	install addmember addclub $(DESTDIR)$(PREFIX)/bin
-	install ceoc op-adduser $(DESTDIR)$(PREFIX)/lib/ceod
+	install ceoc $(DESTDIR)$(PREFIX)/lib/ceod
+
+install_daemon:
+	install -d $(DESTDIR)$(PREFIX)/sbin $(DESTDIR)$(PREFIX)/lib/ceod
+	install ceod $(DESTDIR)$(PREFIX)/sbin
+	install op-adduser $(DESTDIR)$(PREFIX)/lib/ceod
+
+install: install_clients install_daemon
 
 $(NET_PROGS):    LDLIBS += $(NET_LIBS)
 $(NET_PROGS):    $(NET_OBJECTS)