[23160] in Source-Commits
/svn/athena r22821 - in trunk/athena/bin/discuss: client debian edsc include server
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 16:45:27 2008
Date: Sun, 6 Apr 2008 16:44:55 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062044.QAA28753@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: tabbott
Date: 2008-04-06 16:44:54 -0400 (Sun, 06 Apr 2008)
New Revision: 22821
Removed:
trunk/athena/bin/discuss/debian/patches/
Modified:
trunk/athena/bin/discuss/client/Makefile.in
trunk/athena/bin/discuss/client/trn_expr.y
trunk/athena/bin/discuss/debian/changelog
trunk/athena/bin/discuss/edsc/Makefile.in
trunk/athena/bin/discuss/edsc/discuss.el
trunk/athena/bin/discuss/include/config.h.sed
trunk/athena/bin/discuss/server/Makefile.in
Log:
Modified: trunk/athena/bin/discuss/client/Makefile.in
===================================================================
--- trunk/athena/bin/discuss/client/Makefile.in 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/client/Makefile.in 2008-04-06 20:44:54 UTC (rev 22821)
@@ -19,7 +19,7 @@
CPPFLAGS=@CPPFLAGS@
CFLAGS=@CFLAGS@
LDFLAGS=@LDFLAGS@
-LIBS=../server/acl.o ../libds/libdsk.a ../usp/libusp.a @KRB4_LIBS@ @KRB5_LIBS@ -lss -lreadline -lhistory -lcurses @LIBS@
+LIBS=../server/acl.o ../libds/libdsk.a ../usp/libusp.a @KRB4_LIBS@ @KRB5_LIBS@ -lss @LIBS@
ALL_CFLAGS=-I../include ${CPPFLAGS} ${CFLAGS} ${DEFS}
OBJS= discuss.o edit.o output.o trn_expr.o list.o trn_select.o \
Modified: trunk/athena/bin/discuss/client/trn_expr.y
===================================================================
--- trunk/athena/bin/discuss/client/trn_expr.y 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/client/trn_expr.y 2008-04-06 20:44:54 UTC (rev 22821)
@@ -69,7 +69,7 @@
*
*/
-static yyerror(msg)
+yyerror(msg)
char *msg;
{
#ifdef lint
@@ -97,7 +97,7 @@
return(1);
}
-static yylex()
+yylex()
{
if (!*cp) return -1;
if(isdigit(*cp)) {
Modified: trunk/athena/bin/discuss/debian/changelog
===================================================================
--- trunk/athena/bin/discuss/debian/changelog 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/debian/changelog 2008-04-06 20:44:54 UTC (rev 22821)
@@ -1,3 +1,9 @@
+debathena-discuss (10.0.0-1) unstable; urgency=low
+
+ * Merged quilt patches into mainline Athena tree
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 15:54:22 -0400
+
debathena-discuss (9.4.41-0debathena2) unstable; urgency=low
* Add emacs22 as a default alternative to emacs21 | emacsen.
Modified: trunk/athena/bin/discuss/edsc/Makefile.in
===================================================================
--- trunk/athena/bin/discuss/edsc/Makefile.in 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/edsc/Makefile.in 2008-04-06 20:44:54 UTC (rev 22821)
@@ -42,10 +42,9 @@
depend:
install:
- ${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
${top_srcdir}/mkinstalldirs ${DESTDIR}${libexecdir}
${top_srcdir}/mkinstalldirs ${DESTDIR}${lispdir}
- ${INSTALL_PROGRAM} edsc ${DESTDIR}${sbindir}
+ ${INSTALL_PROGRAM} edsc ${DESTDIR}${libexecdir}
${INSTALL} -m 444 ${srcdir}/discuss-acl.el ${DESTDIR}${lispdir}
${INSTALL} -m 444 ${srcdir}/discuss-enter.el ${DESTDIR}${lispdir}
${INSTALL} -m 444 ${srcdir}/discuss-ls.el ${DESTDIR}${lispdir}
Modified: trunk/athena/bin/discuss/edsc/discuss.el
===================================================================
--- trunk/athena/bin/discuss/edsc/discuss.el 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/edsc/discuss.el 2008-04-06 20:44:54 UTC (rev 22821)
@@ -30,7 +30,7 @@
(save-excursion
(set-buffer buf)
(erase-buffer)
- (call-process-region (point) (point) "/bin/athena/machtype" nil t nil)
+ (call-process-region (point) (point) "/bin/machtype" nil t nil)
(goto-char (point-max))
(delete-backward-char 1)
(setq foo (buffer-string))
@@ -39,7 +39,7 @@
(error "Can't determine machine type.")
foo)
)))
-(defvar discuss-pathname "/usr/athena/etc/edsc"
+(defvar discuss-pathname "/usr/lib/debathena-discuss/edsc"
"*Name of program to run as slave process for discuss.")
(defvar discuss-DWIM nil
Modified: trunk/athena/bin/discuss/include/config.h.sed
===================================================================
--- trunk/athena/bin/discuss/include/config.h.sed 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/include/config.h.sed 2008-04-06 20:44:54 UTC (rev 22821)
@@ -53,7 +53,7 @@
/* Server to exec (assumed to be in SERVERDIR) */
#ifndef SERVER
-#define SERVER "/usr/athena/etc/disserve"
+#define SERVER "/usr/sbin/disserve"
#endif
#ifndef SERVER_LOCAL
/* this one is path-searched if it doesn't begin with slash... */
@@ -65,7 +65,7 @@
/* Info directory */
#ifndef INFO_DIR
-#define INFO_DIR "/usr/athena/share/discuss/info"
+#define INFO_DIR "/usr/share/discuss/info"
#endif
/* Name server / Kerberos realm */
@@ -85,7 +85,7 @@
/* Place where dsmail can find dspipe */
#ifndef DSPIPE
-#define DSPIPE "/usr/athena/bin/dspipe"
+#define DSPIPE "/usr/bin/dspipe"
#endif
/* dsc_setup command */
Modified: trunk/athena/bin/discuss/server/Makefile.in
===================================================================
--- trunk/athena/bin/discuss/server/Makefile.in 2008-04-06 20:42:47 UTC (rev 22820)
+++ trunk/athena/bin/discuss/server/Makefile.in 2008-04-06 20:44:54 UTC (rev 22821)
@@ -41,7 +41,7 @@
install:
${top_srcdir}/mkinstalldirs ${DESTDIR}${sbindir}
${INSTALL_PROGRAM} discussd ${DESTDIR}${sbindir}
- ${INSTALL} -o discuss -m 4755 disserve ${DESTDIR}${sbindir}
+ ${INSTALL_PROGRAM} disserve ${DESTDIR}${sbindir}
discussd: $(DISCUSSD_OBJS)
${CC} ${LDFLAGS} -o $@ $(DISCUSSD_OBJS) ${LIBS}
