[tango] 02/05: Imported Upstream version 8.1.2c+dfsg
Frédéric-Emmanuel Picca
picca at alioth.debian.org
Tue Sep 3 19:38:33 UTC 2013
This is an automated email from the git hooks/post-receive script.
picca pushed a commit to branch master
in repository tango.
commit d4c6f4848ea460b71c3610b6624ec32d4b300f8b
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date: Tue Sep 3 20:04:12 2013 +0200
Imported Upstream version 8.1.2c+dfsg
---
lib/java/Makefile.am | 1 +
lib/java/Makefile.in | 1 +
lib/java/astor.in | 2 +-
lib/java/atkmoni.in | 2 +-
lib/java/atkpanel.in | 2 +-
lib/java/atktuning.in | 2 +-
lib/java/cvstag.in | 2 +-
lib/java/devicetree.in | 2 +-
lib/java/jdraw.in | 2 +-
lib/java/jive.in | 2 +-
lib/java/logviewer.in | 2 +-
lib/java/synopticappli.in | 2 +-
lib/java/tg_devtest.in | 2 +-
13 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index b236ee3..fa03de8 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -44,6 +44,7 @@ edit = sed \
-e 's|@TANGO_RC_FILE[@]|$(TANGO_RC_FILE)|g' \
-e 's|@JAVA[@]|$(JAVA)|g' \
-e 's|@DOXYGEN[@]|$(DOXYGEN)|g' \
+ -e 's|@libdir[@]|$(libdir)|g' \
-e 's|@prefix[@]|$(prefix)|g'
#astor jive pogo pogo-6 devicetree atkpanel logviewer atktuning jdraw synopticappli atkmoni cvstag TangoVers tg_devtest: Makefile
diff --git a/lib/java/Makefile.in b/lib/java/Makefile.in
index c52bfdf..dea26d6 100644
--- a/lib/java/Makefile.in
+++ b/lib/java/Makefile.in
@@ -361,6 +361,7 @@ dist_java_DATA = \
@TANGO_JAVA_ENABLED_TRUE@ -e 's|@TANGO_RC_FILE[@]|$(TANGO_RC_FILE)|g' \
@TANGO_JAVA_ENABLED_TRUE@ -e 's|@JAVA[@]|$(JAVA)|g' \
@TANGO_JAVA_ENABLED_TRUE@ -e 's|@DOXYGEN[@]|$(DOXYGEN)|g' \
+ at TANGO_JAVA_ENABLED_TRUE@ -e 's|@libdir[@]|$(libdir)|g' \
@TANGO_JAVA_ENABLED_TRUE@ -e 's|@prefix[@]|$(prefix)|g'
diff --git a/lib/java/astor.in b/lib/java/astor.in
index 99a1259..9a5553e 100755
--- a/lib/java/astor.in
+++ b/lib/java/astor.in
@@ -58,7 +58,7 @@ export ATK_CLASS
CLASSPATH=$TANGO_CLASS:$ASTOR_CLASS:$JIVE_CLASS:$ATK_CLASS:$LOGVIEWER:$LOG4J
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
#---------------------------------------------------------
diff --git a/lib/java/atkmoni.in b/lib/java/atkmoni.in
index c5ed5a1..4338911 100755
--- a/lib/java/atkmoni.in
+++ b/lib/java/atkmoni.in
@@ -21,7 +21,7 @@ CLASSPATH=$TANGO:$TACO:$TANGOATK
export CLASSPATH
echo "CLASSPATH=$CLASSPATH"
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
#---------------------------------------------------------
diff --git a/lib/java/atkpanel.in b/lib/java/atkpanel.in
index 166f98b..ac345e3 100755
--- a/lib/java/atkpanel.in
+++ b/lib/java/atkpanel.in
@@ -19,7 +19,7 @@ ATKPANEL=$LIB_DIR/atkpanel.jar
CLASSPATH=$ATKPANEL:$TANGOATK:$TANGO
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
#---------------------------------------------------------
diff --git a/lib/java/atktuning.in b/lib/java/atktuning.in
index 9a2fc3e..cb58e62 100755
--- a/lib/java/atktuning.in
+++ b/lib/java/atktuning.in
@@ -19,7 +19,7 @@ ATKPANEL=$LIB_DIR/AtkTuning.jar
CLASSPATH=$ATKPANEL:$TANGOATK:$TANGO
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
#---------------------------------------------------------
diff --git a/lib/java/cvstag.in b/lib/java/cvstag.in
index 9180815..d56d6ac 100755
--- a/lib/java/cvstag.in
+++ b/lib/java/cvstag.in
@@ -16,7 +16,7 @@ POGO_CLASS=$APP_DIR/Pogo.jar; export POGO_CLASS
CLASSPATH=$POGO_CLASS:$TANGO_CLASS; export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
#---------------------------------------------------------
diff --git a/lib/java/devicetree.in b/lib/java/devicetree.in
index 2fca14d..7ce4642 100755
--- a/lib/java/devicetree.in
+++ b/lib/java/devicetree.in
@@ -9,7 +9,7 @@ JAVABIN=@prefix@/share/java;
CLASSPATH=$JAVALIB/TangORB.jar:$JAVALIB/ATKWidget.jar:$JAVALIB/ATKCore.jar:$JAVABIN/Jive.jar:$JAVABIN/atkpanel.jar:$JAVABIN/DeviceTree.jar
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
echo Running Device Tree...
diff --git a/lib/java/jdraw.in b/lib/java/jdraw.in
index 03de543..2f59f5d 100755
--- a/lib/java/jdraw.in
+++ b/lib/java/jdraw.in
@@ -21,7 +21,7 @@ CLASSPATH=$TANGOATK:$TANGO
export CLASSPATH
echo "CLASSPATH=$CLASSPATH"
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
echo Running Jdraw ...
diff --git a/lib/java/jive.in b/lib/java/jive.in
index 0edc16c..d29c4c8 100755
--- a/lib/java/jive.in
+++ b/lib/java/jive.in
@@ -19,7 +19,7 @@ LOG4J=$JAVALIB/log4j.jar
CLASSPATH=$JAVALIB/TangORB.jar:$JAVABIN/Jive.jar:$ATK:$LOGVIEWER:$LOG4J:$ASTOR:.
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
@JAVA@ -mx128m -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST $applet_name $@
diff --git a/lib/java/logviewer.in b/lib/java/logviewer.in
index 336c0f8..46bb9db 100755
--- a/lib/java/logviewer.in
+++ b/lib/java/logviewer.in
@@ -18,7 +18,7 @@ ATKJAR=$ATKBIN/ATKCore.jar:$ATKBIN/ATKWidget.jar:$ATKBIN/log4j.jar
CLASSPATH=$JAVALIB/TangORB.jar:$TLVBIN/LogViewer.jar:$ATKJAR:.
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
@JAVA@ -Djava.library.path=$LIBPATH -DTANGO_HOST=$TANGO_HOST $applet_name $*
diff --git a/lib/java/synopticappli.in b/lib/java/synopticappli.in
index 519a48e..798f679 100755
--- a/lib/java/synopticappli.in
+++ b/lib/java/synopticappli.in
@@ -27,7 +27,7 @@ CLASSPATH=$TACO:$TANGO:$TANGOATK:$ATKPANEL
export CLASSPATH
echo "CLASSPATH=$CLASSPATH"
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
#---------------------------------------------------------
diff --git a/lib/java/tg_devtest.in b/lib/java/tg_devtest.in
index 2ab2cba..6f4d08e 100755
--- a/lib/java/tg_devtest.in
+++ b/lib/java/tg_devtest.in
@@ -11,7 +11,7 @@ TANGOATK=$JAVALIB/ATKCore.jar:$JAVALIB/ATKWidget.jar
CLASSPATH=$JAVALIB/TangORB.jar:$JAVALIB/Jive.jar:$TANGOATK
export CLASSPATH
-LIBPATH=@prefix@/lib
+LIBPATH=@libdir@
export LIBPATH
echo Starting...
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git
More information about the debian-science-commits
mailing list