From 92652a3af09007550c7e2205d6d5da56d80ec68c Mon Sep 17 00:00:00 2001 From: Michael Spang Date: Wed, 29 Jul 2009 11:25:13 -0400 Subject: [PATCH] Install ceo daemon We need to split into different packages for the daemon and clients. --- debian/.gitignore | 6 ++++- debian/ceo-clients.manpages | 2 ++ debian/ceo-common.dirs | 1 + debian/ceo-common.install | 1 + debian/{dirs => ceo-daemon.dirs} | 2 -- debian/ceo-daemon.install | 1 + debian/ceo-gui.manpages | 1 + debian/control | 31 +++++++++++++++++++----- debian/docs | 1 - debian/install | 2 -- debian/manpages | 1 - debian/rules | 9 ++++--- etc/{accounts.cf.example => accounts.cf} | 0 etc/{kerberos.cf.example => kerberos.cf} | 0 etc/{ldap.cf.example => ldap.cf} | 0 src/Makefile | 14 ++++++++--- 16 files changed, 51 insertions(+), 21 deletions(-) create mode 100644 debian/ceo-clients.manpages create mode 100644 debian/ceo-common.dirs create mode 100644 debian/ceo-common.install rename debian/{dirs => ceo-daemon.dirs} (50%) create mode 100644 debian/ceo-daemon.install create mode 100644 debian/ceo-gui.manpages delete mode 100644 debian/docs delete mode 100644 debian/install delete mode 100644 debian/manpages rename etc/{accounts.cf.example => accounts.cf} (100%) rename etc/{kerberos.cf.example => kerberos.cf} (100%) rename etc/{ldap.cf.example => ldap.cf} (100%) diff --git a/debian/.gitignore b/debian/.gitignore index 5e861a7..ae1abc1 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -1,5 +1,9 @@ /ceo.substvars -/ceo +/ceo-common +/ceo-clients +/ceo-daemon +/ceo-gui /files /*.debhelper /*.debhelper.log +/*.substvars diff --git a/debian/ceo-clients.manpages b/debian/ceo-clients.manpages new file mode 100644 index 0000000..58109bc --- /dev/null +++ b/debian/ceo-clients.manpages @@ -0,0 +1,2 @@ +docs/addclub.1 +docs/addmember.1 diff --git a/debian/ceo-common.dirs b/debian/ceo-common.dirs new file mode 100644 index 0000000..41eb93b --- /dev/null +++ b/debian/ceo-common.dirs @@ -0,0 +1 @@ +etc/csc diff --git a/debian/ceo-common.install b/debian/ceo-common.install new file mode 100644 index 0000000..b17f7ba --- /dev/null +++ b/debian/ceo-common.install @@ -0,0 +1 @@ +etc/accounts.cf etc/kerberos.cf etc/ldap.cf etc/csc diff --git a/debian/dirs b/debian/ceo-daemon.dirs similarity index 50% rename from debian/dirs rename to debian/ceo-daemon.dirs index 281c9b5..46d4416 100644 --- a/debian/dirs +++ b/debian/ceo-daemon.dirs @@ -1,3 +1 @@ -usr/bin -etc/csc etc/ldap/schema diff --git a/debian/ceo-daemon.install b/debian/ceo-daemon.install new file mode 100644 index 0000000..106cad9 --- /dev/null +++ b/debian/ceo-daemon.install @@ -0,0 +1 @@ +etc/csc.schema etc/ldap/schema diff --git a/debian/ceo-gui.manpages b/debian/ceo-gui.manpages new file mode 100644 index 0000000..cc4400f --- /dev/null +++ b/debian/ceo-gui.manpages @@ -0,0 +1 @@ +docs/ceo.1 diff --git a/debian/control b/debian/control index 46595da..0cf8410 100644 --- a/debian/control +++ b/debian/control @@ -5,10 +5,29 @@ Maintainer: Systems Committee 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. diff --git a/debian/docs b/debian/docs deleted file mode 100644 index a188e06..0000000 --- a/debian/docs +++ /dev/null @@ -1 +0,0 @@ -docs/* diff --git a/debian/install b/debian/install deleted file mode 100644 index 31aaae0..0000000 --- a/debian/install +++ /dev/null @@ -1,2 +0,0 @@ -etc/accounts.cf.example etc/kerberos.cf.example etc/ldap.cf.example etc/csc -etc/csc.schema etc/ldap/schema diff --git a/debian/manpages b/debian/manpages deleted file mode 100644 index afc0dc3..0000000 --- a/debian/manpages +++ /dev/null @@ -1 +0,0 @@ -docs/*.[0-9] diff --git a/debian/rules b/debian/rules index 2c1caf1..fbd2693 100755 --- a/debian/rules +++ b/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 diff --git a/etc/accounts.cf.example b/etc/accounts.cf similarity index 100% rename from etc/accounts.cf.example rename to etc/accounts.cf diff --git a/etc/kerberos.cf.example b/etc/kerberos.cf similarity index 100% rename from etc/kerberos.cf.example rename to etc/kerberos.cf diff --git a/etc/ldap.cf.example b/etc/ldap.cf similarity index 100% rename from etc/ldap.cf.example rename to etc/ldap.cf diff --git a/src/Makefile b/src/Makefile index 08aaa69..7d32aef 100644 --- a/src/Makefile +++ b/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)