[23176] in Source-Commits
/svn/athena r22837 - in trunk/athena/bin/xdsc: . debian
daemon@ATHENA.MIT.EDU (tabbott@MIT.EDU)
Sun Apr 6 16:55:12 2008
Date: Sun, 6 Apr 2008 16:54:43 -0400 (EDT)
From: tabbott@MIT.EDU
Message-Id: <200804062054.QAA29057@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:54:43 -0400 (Sun, 06 Apr 2008)
New Revision: 22837
Removed:
trunk/athena/bin/xdsc/debian/patches/
Modified:
trunk/athena/bin/xdsc/Makefile.in
trunk/athena/bin/xdsc/debian/changelog
trunk/athena/bin/xdsc/xdsc.c
Log:
Modified: trunk/athena/bin/xdsc/Makefile.in
===================================================================
--- trunk/athena/bin/xdsc/Makefile.in 2008-04-06 20:54:12 UTC (rev 22836)
+++ trunk/athena/bin/xdsc/Makefile.in 2008-04-06 20:54:43 UTC (rev 22837)
@@ -13,10 +13,11 @@
libdir=@libdir@
mandir=@mandir@
datadir=@datadir@
-appdefsdir=${libdir}/X11/app-defaults
+sysconfdir=@sysconfdir@
+appdefsdir=${sysconfdir}/X11/app-defaults
CC=@CC@
-DEFS=@DEFS@ -DEDSC_PATH=\"$(sbindir)/edsc\"
+DEFS=@DEFS@ -DEDSC_PATH=\"${libdir}/debathena-discuss/edsc\"
CPPFLAGS=@CPPFLAGS@
CFLAGS=@CFLAGS@
X_CFLAGS=@X_CFLAGS@
Modified: trunk/athena/bin/xdsc/debian/changelog
===================================================================
--- trunk/athena/bin/xdsc/debian/changelog 2008-04-06 20:54:12 UTC (rev 22836)
+++ trunk/athena/bin/xdsc/debian/changelog 2008-04-06 20:54:43 UTC (rev 22837)
@@ -1,3 +1,9 @@
+debathena-xdsc (10.0.0-1) unstable; urgency=low
+
+ * Merged quilt patches into mainline Athena tree
+
+ -- Shreevatsa R <vatsa@mit.edu> Sun, 6 Apr 2008 16:24:02 -0400
+
debathena-xdsc (9.4.0-0debathena1) unstable; urgency=low
* Initial release.
Modified: trunk/athena/bin/xdsc/xdsc.c
===================================================================
--- trunk/athena/bin/xdsc/xdsc.c 2008-04-06 20:54:12 UTC (rev 22836)
+++ trunk/athena/bin/xdsc/xdsc.c 2008-04-06 20:54:43 UTC (rev 22837)
@@ -729,7 +729,7 @@
}
}
-static void
+void
BotSelect(w, client_data, call_data)
Widget w; /*IGNORED*/
XtPointer client_data;
