[skycat] 01/03: Fix rtd script
Ole Streicher
olebole-guest at alioth.debian.org
Fri Aug 9 15:27:00 UTC 2013
This is an automated email from the git hooks/post-receive script.
olebole-guest pushed a commit to branch debian
in repository skycat.
commit 69ed7d70b0bdd98f14d26796ab2b4dab1622da28
Author: Ole Streicher <debian at liska.ath.cx>
Date: Fri Aug 9 16:32:29 2013 +0200
Fix rtd script
---
debian/patches/fhs.patch | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/debian/patches/fhs.patch b/debian/patches/fhs.patch
index 084ee39..b027169 100644
--- a/debian/patches/fhs.patch
+++ b/debian/patches/fhs.patch
@@ -302,3 +302,36 @@ Description: Change the paths so that they correspond to the FHS.
-chmod ugo+rx skycat-star
+chmod ugo+rx skycat
+--- a/rtd/rtd.in
++++ b/rtd/rtd.in
+@@ -26,7 +26,7 @@
+ cd $cwd
+
+ # If we're NOT ssh'd in
+-if [ ! ${SSH_TTY} ]; then
++if [ ! "${SSH_TTY}" ]; then
+ # make sure X is running (on Mac OS X)
+ if [ `uname` = "Darwin" -a "`ps -x 2>/dev/null | awk '{print $5}' | grep X11`" = "" ]; then
+ for i in /Applications/Utilities $HOME/Desktop ; do
+@@ -41,12 +41,8 @@
+ fi
+ fi
+
+-# Make sure we can find the shared libs
+- at LD_LIBRARY_PATH_VAR@="$RTD_BASE/lib:@BLT_LIB_DIR@:${@LD_LIBRARY_PATH_VAR@}"
+-export @LD_LIBRARY_PATH_VAR@
+-
+-# and the Tcl packages
+-TCLLIBPATH="$RTD_BASE/lib"
++# Make sure we can find the Tcl packages
++TCLLIBPATH="/usr/lib/skycat /usr/share/skycat"
+ export TCLLIBPATH
+
+ # Make sure we start the correct wish binary
+@@ -54,5 +50,5 @@
+ export PATH
+
+ test -d $HOME/.rtd || mkdir $HOME/.rtd
+-exec wish8.4 $RTD_BASE/lib/rtd at PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee $HOME/.skycat/log 2>&1
++exec wish8.8 /usr/share/skycat/rtd at PACKAGE_VERSION@/main.tcl ${1+"$@"} | tee $HOME/.skycat/log 2>&1
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/skycat.git
More information about the debian-science-commits
mailing list