--- debathena-olc-9.4.0.orig/debian/compat
+++ debathena-olc-9.4.0/debian/compat
@@ -0,0 +1 @@
+4
--- debathena-olc-9.4.0.orig/debian/control.in
+++ debathena-olc-9.4.0/debian/control.in
@@ -0,0 +1,23 @@
+Source: debathena-olc
+Section: debathena/net
+Priority: extra
+Maintainer: Debian-Athena Project <debathena@mit.edu>
+Build-Depends: @cdbs@, comerr-dev, lesstif2-dev, libkrb5-dev, libhesiod-dev, libzephyr-dev, libzephyr3-krb, libncurses-dev, libreadline5-dev | libreadline-dev, debathena-discuss, debathena-machtype
+Standards-Version: 3.7.2
+
+Package: debathena-olc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-attach, debathena-machtype
+Description: The Athena Online Consultant system
+ The Online Consultant system enables a variety of styles of interaction 
+ with the Athena Online Consultants.
+
+Package: debathena-olc-server
+Architecture: any
+Replaces: debathena-olc (<= 0.0.20060315)
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-discuss, debathena-discuss-server, debathena-machtype
+Description: The Athena Online Consultant system
+ The Online Consultant system enables a variety of styles of interaction 
+ with the Athena Online Consultants.
+ .
+ This package contains the OLC server.
--- debathena-olc-9.4.0.orig/debian/copyright
+++ debathena-olc-9.4.0/debian/copyright
@@ -0,0 +1,20 @@
+The Athena source code was obtained from the Athena CVS repository at
+/afs/dev.mit.edu/source, and is licensed as follows:
+
+  Copyright 1996 by the Massachusetts Institute of Technology.
+
+  Permission to use, copy, modify, and distribute this
+  software and its documentation for any purpose and without
+  fee is hereby granted, provided that the above copyright
+  notice appear in all copies and that both that copyright
+  notice and this permission notice appear in supporting
+  documentation, and that the name of M.I.T. not be used in
+  advertising or publicity pertaining to distribution of the
+  software without specific, written prior permission.
+  M.I.T. makes no representations about the suitability of
+  this software for any purpose.  It is provided "as is"
+  without express or implied warranty.
+
+This Debian package was created as part of the Debian-Athena Project
+<http://web.mit.edu/debathena/www/> of the MIT Student Information
+Processing Board, and is released to the public domain.
--- debathena-olc-9.4.0.orig/debian/control
+++ debathena-olc-9.4.0/debian/control
@@ -0,0 +1,23 @@
+Source: debathena-olc
+Section: debathena/net
+Priority: extra
+Maintainer: Debian-Athena Project <debathena@mit.edu>
+Build-Depends: cdbs (>= 0.4.23-1.1), autotools-dev, debhelper (>= 4.2.0), autoconf, quilt, patchutils (>= 0.2.25), cdbs (>= 0.4.27-1), comerr-dev, lesstif2-dev, libkrb5-dev, libhesiod-dev, libzephyr-dev, libzephyr3-krb, libncurses-dev, libreadline5-dev | libreadline-dev, debathena-discuss, debathena-machtype
+Standards-Version: 3.7.2
+
+Package: debathena-olc
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-attach, debathena-machtype
+Description: The Athena Online Consultant system
+ The Online Consultant system enables a variety of styles of interaction 
+ with the Athena Online Consultants.
+
+Package: debathena-olc-server
+Architecture: any
+Replaces: debathena-olc (<= 0.0.20060315)
+Depends: ${shlibs:Depends}, ${misc:Depends}, debathena-discuss, debathena-discuss-server, debathena-machtype
+Description: The Athena Online Consultant system
+ The Online Consultant system enables a variety of styles of interaction 
+ with the Athena Online Consultants.
+ .
+ This package contains the OLC server.
--- debathena-olc-9.4.0.orig/debian/rules
+++ debathena-olc-9.4.0/debian/rules
@@ -0,0 +1,14 @@
+#!/usr/bin/make -f
+
+DEB_AUTO_UPDATE_DEBIAN_CONTROL = 1
+DEB_AUTO_UPDATE_AUTOCONF = 1
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+
+DEB_CONFIGURE_EXTRA_FLAGS += --with-machtype=/bin/machtype --with-dspipe=/usr/bin/dspipe --with-motif --with-krb4=$(shell krb5-config --prefix krb4) --with-hesiod --with-zephyr
+DEB_DH_INSTALL_SOURCEDIR = $(DEB_DESTDIR)
+
+clean::
+	find . -name Makefile -exec rm -f {} \;
+	rm -f include/config.h configure
--- debathena-olc-9.4.0.orig/debian/patches/series
+++ debathena-olc-9.4.0/debian/patches/series
@@ -0,0 +1 @@
+olc-no-athena-paths.patch
--- debathena-olc-9.4.0.orig/debian/patches/olc-no-athena-paths.patch
+++ debathena-olc-9.4.0/debian/patches/olc-no-athena-paths.patch
@@ -0,0 +1,226 @@
+Index: debathena-olc-9.4.0/browser/motif/callbacks.c
+===================================================================
+--- debathena-olc-9.4.0.orig/browser/motif/callbacks.c	2007-02-04 02:27:15.000000000 -0500
++++ debathena-olc-9.4.0/browser/motif/callbacks.c	2007-02-04 02:29:24.000000000 -0500
+@@ -468,7 +468,7 @@
+       /* At Athena, we use attach to mount the stock answer filesystem; your */
+       /* method may differ at other sites */
+       if (stat(file, &buf))
+-	system("/bin/athena/attach -n -q olc-stock");	/* attach filsys */
++	system("/bin/attach -n -q olc-stock");	/* attach filsys */
+       if (stat(file, &buf))
+ 	{
+ 	  fprintf(stderr, "%s: Unable to attach olc-stock filesystem.\n",
+Index: debathena-olc-9.4.0/include/browser/cref.h
+===================================================================
+--- debathena-olc-9.4.0.orig/include/browser/cref.h	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/include/browser/cref.h	2007-02-04 02:29:24.000000000 -0500
+@@ -88,7 +88,7 @@
+ #define	FALLBACK_PROMPT	"browser> "	/* Prompt string. */
+ 
+ /* Default path/extension for the configuration files. */
+-#define BROWSER_CONFIG_PATH "/usr/athena/lib/olc:/mit/olc-stock/config:/mit/library/config"
++#define BROWSER_CONFIG_PATH "/etc/olc:/mit/olc-stock/config:/mit/library/config"
+ #define BROWSER_CONFIG_EXT  ".cfg"
+ 
+ #define  CONTENTS	".index"	/* Where the contents are kept. */
+Index: debathena-olc-9.4.0/include/olc/olc.h
+===================================================================
+--- debathena-olc-9.4.0.orig/include/olc/olc.h	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/include/olc/olc.h	2007-02-04 02:29:24.000000000 -0500
+@@ -68,7 +68,7 @@
+ #define OLC_FALLBACK_TITLE   "consultant"   /* consultant title if no config */
+ 
+ /* Default path for the incarnation configuration files. */
+-#define OLC_CONFIG_PATH "/usr/athena/lib/olc:/mit/olta/config:/mit/library/config"
++#define OLC_CONFIG_PATH "/etc/olc:/mit/olta/config:/mit/library/config"
+ #define OLC_CONFIG_EXT  ".cfg"
+ 
+ #define OLC_DEFAULT_HELP_EXT	".help"
+Index: debathena-olc-9.4.0/include/olc/olc_tty.h
+===================================================================
+--- debathena-olc-9.4.0.orig/include/olc/olc_tty.h	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/include/olc/olc_tty.h	2007-02-04 02:29:24.000000000 -0500
+@@ -23,9 +23,9 @@
+ 
+ #include <mit-copyright.h>
+ 
+-#define DEFAULT_EDITOR "/usr/athena/bin/emacs"
++#define DEFAULT_EDITOR "/usr/bin/sensible-editor"
+ #define NO_EDITOR      "NO_EDITOR"
+-#define DEFAULT_PAGER  "more"
++#define DEFAULT_PAGER  "/usr/bin/sensible-pager"
+ 
+ /* t_acl.c */
+ ERRCODE t_set_acl (REQUEST *Request , char *acl , int flag );
+Index: debathena-olc-9.4.0/include/server_defines.h
+===================================================================
+--- debathena-olc-9.4.0.orig/include/server_defines.h	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/include/server_defines.h	2007-02-04 02:29:24.000000000 -0500
+@@ -48,9 +48,9 @@
+ #define RES_STATS_FILE		OLXX_STAT_DIR "/res_stats"
+ 
+ #if defined (OLTA) || defined (OWL)
+-#define LUMBERJACK_LOC          "/usr/athena/etc/lumberjack." OLXX_SERVICE
++#define LUMBERJACK_LOC          "/usr/sbin/lumberjack." OLXX_SERVICE
+ #else
+-#define LUMBERJACK_LOC		"/usr/athena/etc/lumberjack"
++#define LUMBERJACK_LOC		"/usr/sbin/lumberjack"
+ #endif
+ 
+ #ifdef HAVE_ZEPHYR
+Index: debathena-olc-9.4.0/lib/olc.cfg
+===================================================================
+--- debathena-olc-9.4.0.orig/lib/olc.cfg	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/lib/olc.cfg	2007-02-04 02:29:25.000000000 -0500
+@@ -27,7 +27,7 @@
+ 
+ ### support for "help" command
+ # Directory where the help files live.                      [required for help]
+-help_dir          "/usr/athena/lib/olc/olc_help"
++help_dir          "/usr/share/olc/olc_help"
+ 
+ # "Main" help file (eg. for "help" with no arguments).   [default: client name]
+ help_name         "olc"
+@@ -40,10 +40,10 @@
+ stock_dir         "/mit/olc-stock/stock_answers"
+ 
+ # Stock answers browser executable.                [required for stock answers]
+-stock_browser     "/usr/athena/bin/olc_browser"
++stock_browser     "/usr/bin/olc_browser"
+ 
+ # Command(s) to make the stock answers available.   [optional, may be repeated]
+-stock_attach      "/bin/athena/attach olc-stock"
++stock_attach      "/bin/attach olc-stock"
+ 
+ # "Magic" file used to determine if the answers are attached or not.
+ #                                                  [required for stock answers]
+Index: debathena-olc-9.4.0/lib/olcr.cfg
+===================================================================
+--- debathena-olc-9.4.0.orig/lib/olcr.cfg	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/lib/olcr.cfg	2007-02-04 02:29:25.000000000 -0500
+@@ -26,7 +26,7 @@
+ 
+ ### support for "help" command
+ # Directory where the help files live.                      [required for help]
+-help_dir          "/usr/athena/lib/olc/olcr_help"
++help_dir          "/usr/share/olc/olcr_help"
+ 
+ # "Main" help file (eg. for "help" with no arguments).   [default: client name]
+ help_name         "olcr"
+@@ -39,10 +39,10 @@
+ stock_dir         "/mit/olc-stock/stock_answers"
+ 
+ # Stock answers browser executable.                [required for stock answers]
+-stock_browser     "/usr/athena/bin/olc_browser"
++stock_browser     "/usr/bin/olc_browser"
+ 
+ # Command(s) to make the stock answers available.   [optional, may be repeated]
+-stock_attach      "/bin/athena/attach olc-stock"
++stock_attach      "/bin/attach olc-stock"
+ 
+ # "Magic" file used to determine if the answers are attached or not.
+ #                                                  [required for stock answers]
+Index: debathena-olc-9.4.0/man/olc.1
+===================================================================
+--- debathena-olc-9.4.0.orig/man/olc.1	2007-02-04 02:27:17.000000000 -0500
++++ debathena-olc-9.4.0/man/olc.1	2007-02-04 02:29:25.000000000 -0500
+@@ -9,7 +9,7 @@
+ .SH NAME
+ olc \- allows you to ask a consultant for help
+ .SH SYNOPSIS
+-.B /usr/athena/bin/olc \fR[\fBrequest\fR]
++.B olc \fR[\fBrequest\fR]
+ .br
+ .SH DESCRIPTION
+ On-Line Consulting (OLC) is a system which enables users to get help
+@@ -66,7 +66,7 @@
+ .SH FILES
+ .PD 0
+ .TP 35
+-/usr/athena/lib/olc/olc_help
++/usr/share/olc/olc_help
+ Directory containing help files.
+ .TP 35
+ /mit/olc-stock/browser
+Index: debathena-olc-9.4.0/clients/motif/data.h
+===================================================================
+--- debathena-olc-9.4.0.orig/clients/motif/data.h	2007-02-04 02:27:18.000000000 -0500
++++ debathena-olc-9.4.0/clients/motif/data.h	2007-02-04 02:29:25.000000000 -0500
+@@ -16,7 +16,7 @@
+ 
+ /* File locations */
+ 
+-#define HELP_PATH "/usr/athena/lib/olc/motif_help/"
++#define HELP_PATH "/usr/share/olc/motif_help/"
+ #define HELP_INIT_NEWQ	"olc.init.newq"
+ #define HELP_INIT_CONTQ	"olc.init.contq"
+ #define HELP_ASK	"olc.ask"
+Index: debathena-olc-9.4.0/man/olcr.1
+===================================================================
+--- debathena-olc-9.4.0.orig/man/olcr.1	2007-02-04 02:27:17.000000000 -0500
++++ debathena-olc-9.4.0/man/olcr.1	2007-02-04 02:29:25.000000000 -0500
+@@ -53,7 +53,7 @@
+ /mit/olc-stock/browser
+ OLC browser program.
+ .TP 35
+-/usr/athena/lib/olc/olcr_help
++/usr/share/olc/olcr_help
+ Directory containing on-line help files.
+ .PD 1
+ .SH LOGS
+Index: debathena-olc-9.4.0/lib/motif_help/Makefile.in
+===================================================================
+--- debathena-olc-9.4.0.orig/lib/motif_help/Makefile.in	2007-02-04 02:27:16.000000000 -0500
++++ debathena-olc-9.4.0/lib/motif_help/Makefile.in	2007-02-04 02:29:25.000000000 -0500
+@@ -13,7 +13,7 @@
+ libdir=@libdir@
+ datadir=@datadir@
+ 
+-MOTIF_HELP_DIR=${libdir}/olc/motif_help
++MOTIF_HELP_DIR=${datadir}/olc/motif_help
+ MOTIF_HELP_FILES=olc.ask olc.init.contq olc.init.newq olc.replay
+ 
+ default: all
+Index: debathena-olc-9.4.0/lib/olc_help/Makefile.in
+===================================================================
+--- debathena-olc-9.4.0.orig/lib/olc_help/Makefile.in	2007-02-04 02:27:17.000000000 -0500
++++ debathena-olc-9.4.0/lib/olc_help/Makefile.in	2007-02-04 02:29:25.000000000 -0500
+@@ -15,7 +15,7 @@
+ 
+ .SUFFIXES: .nroff .help
+ 
+-OLC_HELP_DIR=${libdir}/olc/olc_help
++OLC_HELP_DIR=${datadir}/olc/olc_help
+ OLC_HELP_FILES=answers.help ask.help cancel.help done.help help.help \
+   motd.help olc.help qmark.help quit.help replay.help send.help show.help \
+   status.help topic.help who.help hours.help version.help
+Index: debathena-olc-9.4.0/lib/olcr_help/Makefile.in
+===================================================================
+--- debathena-olc-9.4.0.orig/lib/olcr_help/Makefile.in	2007-02-04 02:27:17.000000000 -0500
++++ debathena-olc-9.4.0/lib/olcr_help/Makefile.in	2007-02-04 02:29:25.000000000 -0500
+@@ -15,7 +15,7 @@
+ 
+ .SUFFIXES: .nroff .help
+ 
+-OLCR_HELP_DIR=${libdir}/olc/olcr_help
++OLCR_HELP_DIR=${datadir}/olc/olcr_help
+ OLCR_HELP_FILES=acl.help answers.help ask.help cancel.help \
+   comment.help describe.help done.help forward.help grab.help help.help \
+   instance.help list.help mail.help motd.help off.help olcr.help on.help \
+Index: debathena-olc-9.4.0/lib/Makefile.in
+===================================================================
+--- debathena-olc-9.4.0.orig/lib/Makefile.in	2007-02-04 02:29:30.000000000 -0500
++++ debathena-olc-9.4.0/lib/Makefile.in	2007-02-04 02:24:47.000000000 -0500
+@@ -12,9 +12,10 @@
+ exec_prefix=@exec_prefix@
+ libdir=@libdir@
+ datadir=@datadir@
++sysconfdir=@sysconfdir@
+ 
+ SUBDIRS=olc_help olcr_help @SUBDIR_MOTIF_HELP@
+-CFGDIR=${libdir}/olc
++CFGDIR=${sysconfdir}/olc
+ CFGFILES=olc.cfg olcr.cfg xolc.cfg olc_browser.cfg
+ 
+ default: all
--- debathena-olc-9.4.0.orig/debian/changelog
+++ debathena-olc-9.4.0/debian/changelog
@@ -0,0 +1,6 @@
+debathena-olc (9.4.0-0debathena1) unstable; urgency=low
+
+  * Initial release.
+  * Section: debathena/net.
+
+ -- Anders Kaseorg <andersk@mit.edu>  Tue, 17 Jul 2007 06:34:08 -0400
--- debathena-olc-9.4.0.orig/debian/debathena-olc-server.install
+++ debathena-olc-9.4.0/debian/debathena-olc-server.install
@@ -0,0 +1 @@
+usr/sbin/*
--- debathena-olc-9.4.0.orig/debian/debathena-olc.install
+++ debathena-olc-9.4.0/debian/debathena-olc.install
@@ -0,0 +1,3 @@
+usr/bin/*
+usr/share/man/man1/*.1.gz
+usr/share/olc
--- debathena-olc-9.4.0.orig/debian/debathena-olc-server.dirs
+++ debathena-olc-9.4.0/debian/debathena-olc-server.dirs
@@ -0,0 +1 @@
+etc/athena/olc
