diff --git a/bin/ceo b/bin/ceo index 7322493df..32d48f9a2 100755 --- a/bin/ceo +++ b/bin/ceo @@ -4,14 +4,13 @@ import sys, ldap from getpass import getpass import ceo.urwid.main import ceo.console.main -from ceo import ldapi, members, library +from ceo import ldapi, members def start(): try: if len(sys.argv) == 1: print "Reading config file...", members.configure() - library.configure() print "Connecting to LDAP..." members.connect(AuthCallback()) @@ -19,7 +18,6 @@ def start(): ceo.urwid.main.start() else: members.configure() - library.configure() members.connect(AuthCallback()) ceo.console.main.start() except ldap.LOCAL_ERROR, e: diff --git a/debian/changelog b/debian/changelog index 2e2af3102..594d1e734 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,27 @@ +ceo (0.5.27trusty1) trusty; urgency=high + + * Resolved issue from previous release which resulted in CEO not launching + + -- Zachary Seguin Fri, 19 Feb 2016 23:38:41 -0500 + +ceo (0.5.27jessie1) jessie; urgency=high + + * Resolved issue from previous release which resulted in CEO not launching + + -- Zachary Seguin Fri, 19 Feb 2016 23:38:41 -0500 + +ceo (0.5.27jessie) jessie; urgency=medium + + * "Library" now launches "librarian" + + -- Felix Bauckholt Fri, 19 Feb 2016 22:12:25 -0500 + +ceo (0.5.26trusty) trusty; urgency=medium + + * "Library" now launches "librarian" + + -- Felix Bauckholt Fri, 19 Feb 2016 22:07:37 -0500 + ceo (0.5.26) jessie; urgency=medium * Repackage for jessie diff --git a/debian/control b/debian/control index 0553c797b..4616eaf04 100644 --- a/debian/control +++ b/debian/control @@ -22,7 +22,7 @@ Package: ceo-python Architecture: all Replaces: ceo-gui Conflicts: ceo-gui -Depends: ceo-clients, python-ldap, python-urwid, python-sqlobject, python-protobuf, python-psycopg | python-psycopg2, python-mysqldb, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} +Depends: ceo-clients, library, python-ldap, python-urwid, python-sqlobject, python-protobuf, python-psycopg | python-psycopg2, python-mysqldb, ${python:Depends}, ${shlibs:Depends}, ${misc:Depends} Description: Computer Science Club Administrative GUI This package contains the CSC Electronic Office graphical user interface.