The following commit has been merged in the master branch:
commit 836deffae50eccc8ea1ea6ef8c0e29533120e929
Author: YunQiang Su <wzss...@gmail.com>
Date: Tue Jul 12 08:29:37 2011 +0800
install all data files to share
diff --git a/debian/changelog b/debian/changelog
index 2e642f3..59571e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+savi (1.4.5-2) unstable; urgency=low
+
+ * Install data files to /usr/share now
+ - remove debian/patches/{data, maps, oogl}_to_share.diff
+ [debian/savi.install, debian/savi-bin]
+ install data files and scripts to /usr/share/savi
+ [debian/patches/share_lib_div.diff]
+ patch ./savi to find bin file SaVi in /usr/lib/savi/bin
+
+
+ -- YunQiang Su <wzss...@gmail.com> Tue, 12 Jul 2011 08:10:37 +0800
+
savi (1.4.5-1) unstable; urgency=low
* Initial release (Closes: #436511)
diff --git a/debian/patches/data_to_share.diff
b/debian/patches/data_to_share.diff
deleted file mode 100644
index 360042e..0000000
--- a/debian/patches/data_to_share.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: savi-1.4.4/tcl/main.tcl
-===================================================================
---- savi-1.4.4.orig/tcl/main.tcl 2011-04-22 22:37:59.870447882 +0800
-+++ savi-1.4.4/tcl/main.tcl 2011-04-22 22:43:43.990952601 +0800
-@@ -640,7 +640,7 @@
-
- # coverage(update_decay)
-
-- main(load_file) "data/$filename"
-+ main(load_file) "/usr/share/savi/data/$filename"
- }
-
- proc main(source_file) {filename} {
diff --git a/debian/patches/maps_to_share.diff
b/debian/patches/maps_to_share.diff
deleted file mode 100644
index 3ae5c12..0000000
--- a/debian/patches/maps_to_share.diff
+++ /dev/null
@@ -1,49 +0,0 @@
-Index: savi-1.4.5/src/include/coverage_vis.h
-===================================================================
---- savi-1.4.5.orig/src/include/coverage_vis.h 2011-06-27 23:52:56.446814707
+0800
-+++ savi-1.4.5/src/include/coverage_vis.h 2011-06-27 23:55:33.759594777
+0800
-@@ -30,19 +30,19 @@
- #include "Satellite.h"
-
- /* bitmap of geographical boundaries for coverage */
--#define CYLINDRICAL_BITMAP_NAME "maps/world.cyl.pbm"
--#define UNPROJECTED_BITMAP_NAME "maps/world.unp.pbm"
--#define SPHERICAL_BITMAP_NAME "maps/world.sph.pbm"
--#define SPHERICAL_90_BITMAP_NAME "maps/world90W.sph.pbm"
--#define SINUSOIDAL_BITMAP_NAME "maps/world.sinu.pbm"
--#define SINUSOIDAL_90_BITMAP_NAME "maps/world90W.sinu.pbm"
-+#define CYLINDRICAL_BITMAP_NAME "/usr/share/savi/maps/world.cyl.pbm"
-+#define UNPROJECTED_BITMAP_NAME "/usr/share/savi/maps/world.unp.pbm"
-+#define SPHERICAL_BITMAP_NAME "/usr/share/savi/maps/world.sph.pbm"
-+#define SPHERICAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sph.pbm"
-+#define SINUSOIDAL_BITMAP_NAME "/usr/share/savi/maps/world.sinu.pbm"
-+#define SINUSOIDAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sinu.pbm"
-
--#define CYLINDRICAL_LARGE_BITMAP_NAME "maps/world1024.cyl.pbm"
--#define UNPROJECTED_LARGE_BITMAP_NAME "maps/world1024.unp.pbm"
--#define SPHERICAL_LARGE_BITMAP_NAME "maps/world1024.sph.pbm"
--#define SPHERICAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sph.pbm"
--#define SINUSOIDAL_LARGE_BITMAP_NAME "maps/world1024.sinu.pbm"
--#define SINUSOIDAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sinu.pbm"
-+#define CYLINDRICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.cyl.pbm"
-+#define UNPROJECTED_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.unp.pbm"
-+#define SPHERICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sph.pbm"
-+#define SPHERICAL_90_LARGE_BITMAP_NAME
"/usr/share/savi/maps/world90W1024.sph.pbm"
-+#define SINUSOIDAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sinu.pbm"
-+#define SINUSOIDAL_90_LARGE_BITMAP_NAME
"/usr/share/savi/maps/world90W1024.sinu.pbm"
-
- #define LONGITUDE_CENTER_LINE 0.0
- #define LONGITUDE_CENTER_LINE_90W (-90.0)
-Index: savi-1.4.5/tcl/about.tcl
-===================================================================
---- savi-1.4.5.orig/tcl/about.tcl 2011-06-27 23:56:26.403855824 +0800
-+++ savi-1.4.5/tcl/about.tcl 2011-06-27 23:56:50.483975233 +0800
-@@ -36,7 +36,7 @@
- set cmd [build_CmdFrame $name cmd]
-
- set logo [canvas $cmd.logo -width 150 -height 75]
-- image create photo graphic -file "maps/savi-logo.gif"
-+ image create photo graphic -file "/usr/share/savi/maps/savi-logo.gif"
- $logo create image 75 0 -image graphic -anchor n
- pack $logo
-
diff --git a/debian/patches/oogl_to_share.diff
b/debian/patches/oogl_to_share.diff
deleted file mode 100644
index 762258a..0000000
--- a/debian/patches/oogl_to_share.diff
+++ /dev/null
@@ -1,156 +0,0 @@
-Index: savi-1.4.5/src/coverage_vis.c
-===================================================================
---- savi-1.4.5.orig/src/coverage_vis.c 2011-06-28 00:02:23.781627968 +0800
-+++ savi-1.4.5/src/coverage_vis.c 2011-06-28 00:05:05.154428175 +0800
-@@ -655,9 +655,9 @@
- coverage_dynamic_disk_initialised(void)
- {
- char line[LENGTH_LINE];
-- const char name[] = "oogl/earth.oogl";
-+ const char name[] = "/usr/share/savi/oogl/earth.oogl";
- const char fallback_tmpnam[] = "coverage";
-- const char static_name[] = "oogl/Earth.ppm.Z";
-+ const char static_name[] = "/usr/share/savi/oogl/Earth.ppm.Z";
- const char file_separator[] = "/";
- const char file_start[] = "file \"";
- const char file_end[] = "\"\n";
-Index: savi-1.4.5/src/earth.c
-===================================================================
---- savi-1.4.5.orig/src/earth.c 2011-06-28 00:05:20.438503977 +0800
-+++ savi-1.4.5/src/earth.c 2011-06-28 00:07:14.975071910 +0800
-@@ -115,23 +115,23 @@
-
- if (texture_flag) {
- if (!earth_texture_loaded) {
-- earth_texture_loaded = gv_sendfile("oogl/earth_texture_h.oogl");
-+ earth_texture_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_texture_h.oogl");
- }
- if (geomview_stream_textures && geomview_dynamic_texture_flag) {
- if (coverage_projection == UNPROJECTED) {
- if (debug) error("texturemap sphere, dynamic unprojected map.");
-- gv_sendfile("oogl/earth_coverage_unp_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_coverage_unp_h.oogl");
- redraw_coverage_display();
- } else if (coverage_projection == CYLINDRICAL) {
- if (debug) error("texturemap sphere, dynamic cylindrical map.");
-- gv_sendfile("oogl/earth_coverage_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_coverage_h.oogl");
- redraw_coverage_display();
- } else {
- if (debug) error("texturemap sphere, dynamic mapping of this
projection not supported.");
- if (use_fancy_earth) {
-- gv_sendfile("oogl/earth_fancy_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
- } else {
-- gv_sendfile("oogl/earth_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
- }
- geomview_dynamic_coverage = FALSE;
- }
-@@ -143,7 +143,7 @@
- } else if (use_simple_earth) {
- /* static texture - blue and gold map */
- if (debug) error ("texturemap sphere, simple static Earth image.\n");
-- gv_sendfile("oogl/earth_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
- gv_create_geom("Central_Body", "central_t",
"earth_vect_texture_sphere_h");
- } else if (use_fancy_earth) {
- /* static texture - detailed texturemap */
-@@ -152,7 +152,7 @@
- /* 1.9.0 supports streaming and CYLINDRICAL/RECTANGULAR */
- error("Detailed Earth map requires later Geomview. Please upgrade.");
- }
-- gv_sendfile("oogl/earth_fancy_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
- gv_create_geom("Central_Body", "central_t",
"earth_vect_texture_sphere_h");
- } else {
- if (debug) error ("texturemap sphere, do not draw detailed Earth.\n");
-@@ -168,7 +168,7 @@
- /* no texturing */
- if (use_fancy_earth || use_simple_earth) {
- if (debug) error ("ordinary sphere, detailed vector Earth.\n");
-- earth_texture_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
-+ earth_texture_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_sphere_h");
- } else {
- if (debug) error ("ordinary sphere.");
-@@ -238,7 +238,7 @@
- if (geomview_module) gv_start();
-
- if (!earth_vectors_loaded) {
-- earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
-+ earth_vectors_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- }
-
- if (earth_on_flag) {
-@@ -247,7 +247,7 @@
- } else {
- /* clear sphere */
- if (debug) error("clear sphere, invisible Earth body.");
-- gv_sendfile("oogl/earth_vect_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
- earth_geom_exists = TRUE;
- }
-@@ -304,7 +304,7 @@
- if (geomview_module) gv_start();
-
- if (!earth_vectors_loaded) {
-- earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
-+ earth_vectors_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- }
-
- if (earth_on_flag) {
-@@ -313,7 +313,7 @@
- } else {
- /* clear sphere */
- if (debug) error("clear sphere, invisible Earth body.");
-- gv_sendfile("oogl/earth_vect_h.oogl");
-+ gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
- gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
- earth_geom_exists = TRUE;
- }
-Index: savi-1.4.5/src/gv_init.c
-===================================================================
---- savi-1.4.5.orig/src/gv_init.c 2011-06-28 00:07:36.067176508 +0800
-+++ savi-1.4.5/src/gv_init.c 2011-06-28 00:08:10.307346297 +0800
-@@ -37,7 +37,7 @@
- #include "sats.h"
- #include "globals.h"
-
--#define DETAILED_TEXTUREMAP_NAME
"oogl/blue_marble_land_shallow_topo_2048.jpeg"
-+#define DETAILED_TEXTUREMAP_NAME
"/usr/share/savi/oogl/blue_marble_land_shallow_topo_2048.jpeg"
-
- static char tname[] = "trans_ ";
-
-Index: savi-1.4.5/src/include/constants.h
-===================================================================
---- savi-1.4.5.orig/src/include/constants.h 2011-06-28 00:08:33.547461538
+0800
-+++ savi-1.4.5/src/include/constants.h 2011-06-28 00:09:17.183677922 +0800
-@@ -40,10 +40,10 @@
- /* for file-handling routines */
- #define NOT_OK -1
-
--#define HANDLE_FILE_SAVI "oogl/savi.oogl"
--#define HANDLE_FILE_LOGO "oogl/savilogo.oogl"
-+#define HANDLE_FILE_SAVI "/usr/share/savi/oogl/savi.oogl"
-+#define HANDLE_FILE_LOGO "/usr/share/savi/oogl/savilogo.oogl"
-
--#define AMBIENT_LIGHTING "oogl/ambient_light.oogl"
-+#define AMBIENT_LIGHTING "/usr/share/savi/oogl/ambient_light.oogl"
- #define EARTH_YEAR (365.25*24*3600)
- #define EARTH_TILT 23.5
-
-Index: savi-1.4.5/src/stars.c
-===================================================================
---- savi-1.4.5.orig/src/stars.c 2011-06-28 00:09:35.755770017 +0800
-+++ savi-1.4.5/src/stars.c 2011-06-28 00:10:03.247906337 +0800
-@@ -48,7 +48,7 @@
- {
- gv_start();
- if (!stars_loaded) {
-- stars_loaded = gv_sendfile("oogl/stars_h.oogl");
-+ stars_loaded = gv_sendfile("/usr/share/savi/oogl/stars_h.oogl");
- }
- if (stars_loaded) {
- gv_create_geomh("Stars", "stars_h");
diff --git a/debian/patches/series b/debian/patches/series
index 8b69e46..9aa50f0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
-data_to_share.diff
enable_zlib.diff
-maps_to_share.diff
-oogl_to_share.diff
+share_lib_div.diff
diff --git a/debian/patches/share_lib_div.diff
b/debian/patches/share_lib_div.diff
new file mode 100644
index 0000000..6a83d33
--- /dev/null
+++ b/debian/patches/share_lib_div.diff
@@ -0,0 +1,20 @@
+Index: savi-1.4.5/savi
+===================================================================
+--- savi-1.4.5.orig/savi 2011-07-12 08:07:17.862240899 +0800
++++ savi-1.4.5/savi 2011-07-12 08:09:27.818885318 +0800
+@@ -68,7 +68,7 @@
+ #
+ # Default executable relative location and name
+ #
+-SAVIBIN=bin/SaVi
++SAVIBIN=../../lib/savi/bin/SaVi
+
+
+ #
+@@ -270,4 +270,4 @@
+ echo "(setenv SAVI \"$SAVI\")"
+ fi
+ exec ${SAVIBIN} $* ${params}
+-fi
+\ No newline at end of file
++fi
diff --git a/debian/savi-bin b/debian/savi-bin
index 65bee7a..7d697e4 100644
--- a/debian/savi-bin
+++ b/debian/savi-bin
@@ -1,3 +1,3 @@
#!/bin/sh
-sh /usr/lib/savi/savi $*
+sh /usr/share/savi/savi $*
diff --git a/debian/savi.install b/debian/savi.install
index af59757..0d5b252 100644
--- a/debian/savi.install
+++ b/debian/savi.install
@@ -1,10 +1,10 @@
-COPYRIGHT /usr/lib/savi
-BUGS /usr/lib/savi
-README /usr/lib/savi
-README-COVERAGE-TEXTUREMAP /usr/lib/savi
+COPYRIGHT /usr/share/savi
+BUGS /usr/share/savi
+README /usr/share/savi
+README-COVERAGE-TEXTUREMAP /usr/share/savi
-savi /usr/lib/savi
-bin/SaVi /usr/lib/savi/bin/
+savi /usr/share/savi
+tcl /usr/share/savi/
data /usr/share/savi/
maps /usr/share/savi/
manual /usr/share/savi/
@@ -12,4 +12,4 @@ oogl /usr/share/savi/
debian/savi.1 /usr/share/man/man1/
-tcl /usr/lib/savi/
+bin/SaVi /usr/lib/savi/bin/
diff --git a/src/Makefile b/src/Makefile
index bc40440..9e23969 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -26,7 +26,7 @@ include Makefile_defs_$(ARCH)
# zlib enables transparent gzip compression of dynamic texture scratchfiles.
# OTHER_LIBS = -lz should be inserted at end of definitions file.
- GCC_FLAGS = -O2
+ GCC_FLAGS = -O2 -DNO_ZLIB
LIBS = $(TCL_LIBS) $(OTHER_LIBS) -lm
diff --git a/src/Makefile_defs_ubuntu b/src/Makefile_defs_ubuntu
index 72ed51b..e4b5f21 100644
--- a/src/Makefile_defs_ubuntu
+++ b/src/Makefile_defs_ubuntu
@@ -45,7 +45,7 @@ CC = gcc
# match. #
# #
########################################################
-TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
+TCL_INCLUDES = -I/usr/include/tcl8.5 -I/usr/include/tk8.5
########################################################
# #
@@ -56,9 +56,9 @@ TCL_INCLUDES = -I/usr/include/tcl -I/usr/include/tk
# Debian requires a dot here: -ltcl8.4 -ltk8.4
# as does Red Hat Enterprise.
-#TCL_LIBS = -ltcl8.5 -ltk8.5
+TCL_LIBS = -ltcl8.5 -ltk8.5
-TCL_LIBS = -ltcl -ltk
+# TCL_LIBS = -ltcl -ltk
# is a generic alternative to try.
@@ -70,6 +70,6 @@ TCL_LIBS = -ltcl -ltk
########################################################
OTHER_LIBS = -ldl
-OTHER_LIBS = -lz
+# OTHER_LIBS = -lz
# if zlib compression of textures to Geomview is desired.
# OTHER_LIBS = -static
diff --git a/src/coverage_vis.c b/src/coverage_vis.c
index ccfcffa..5cfd201 100644
--- a/src/coverage_vis.c
+++ b/src/coverage_vis.c
@@ -655,9 +655,9 @@ static int
coverage_dynamic_disk_initialised(void)
{
char line[LENGTH_LINE];
- const char name[] = "/usr/share/savi/oogl/earth.oogl";
+ const char name[] = "oogl/earth.oogl";
const char fallback_tmpnam[] = "coverage";
- const char static_name[] = "/usr/share/savi/oogl/Earth.ppm.Z";
+ const char static_name[] = "oogl/Earth.ppm.Z";
const char file_separator[] = "/";
const char file_start[] = "file \"";
const char file_end[] = "\"\n";
diff --git a/src/earth.c b/src/earth.c
index ec90f2b..263c2c7 100644
--- a/src/earth.c
+++ b/src/earth.c
@@ -115,23 +115,23 @@ earth_on_cmd(int argc, char *argv[])
if (texture_flag) {
if (!earth_texture_loaded) {
- earth_texture_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_texture_h.oogl");
+ earth_texture_loaded = gv_sendfile("oogl/earth_texture_h.oogl");
}
if (geomview_stream_textures && geomview_dynamic_texture_flag) {
if (coverage_projection == UNPROJECTED) {
if (debug) error("texturemap sphere, dynamic unprojected map.");
- gv_sendfile("/usr/share/savi/oogl/earth_coverage_unp_h.oogl");
+ gv_sendfile("oogl/earth_coverage_unp_h.oogl");
redraw_coverage_display();
} else if (coverage_projection == CYLINDRICAL) {
if (debug) error("texturemap sphere, dynamic cylindrical map.");
- gv_sendfile("/usr/share/savi/oogl/earth_coverage_h.oogl");
+ gv_sendfile("oogl/earth_coverage_h.oogl");
redraw_coverage_display();
} else {
if (debug) error("texturemap sphere, dynamic mapping of this
projection not supported.");
if (use_fancy_earth) {
- gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
+ gv_sendfile("oogl/earth_fancy_h.oogl");
} else {
- gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
+ gv_sendfile("oogl/earth_h.oogl");
}
geomview_dynamic_coverage = FALSE;
}
@@ -143,7 +143,7 @@ earth_on_cmd(int argc, char *argv[])
} else if (use_simple_earth) {
/* static texture - blue and gold map */
if (debug) error ("texturemap sphere, simple static Earth image.\n");
- gv_sendfile("/usr/share/savi/oogl/earth_h.oogl");
+ gv_sendfile("oogl/earth_h.oogl");
gv_create_geom("Central_Body", "central_t",
"earth_vect_texture_sphere_h");
} else if (use_fancy_earth) {
/* static texture - detailed texturemap */
@@ -152,7 +152,7 @@ earth_on_cmd(int argc, char *argv[])
/* 1.9.0 supports streaming and CYLINDRICAL/RECTANGULAR */
error("Detailed Earth map requires later Geomview. Please upgrade.");
}
- gv_sendfile("/usr/share/savi/oogl/earth_fancy_h.oogl");
+ gv_sendfile("oogl/earth_fancy_h.oogl");
gv_create_geom("Central_Body", "central_t",
"earth_vect_texture_sphere_h");
} else {
if (debug) error ("texturemap sphere, do not draw detailed Earth.\n");
@@ -168,7 +168,7 @@ earth_on_cmd(int argc, char *argv[])
/* no texturing */
if (use_fancy_earth || use_simple_earth) {
if (debug) error ("ordinary sphere, detailed vector Earth.\n");
- earth_texture_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ earth_texture_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_sphere_h");
} else {
if (debug) error ("ordinary sphere.");
@@ -238,7 +238,7 @@ simple_on_cmd(int argc, char *argv[])
if (geomview_module) gv_start();
if (!earth_vectors_loaded) {
- earth_vectors_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
}
if (earth_on_flag) {
@@ -247,7 +247,7 @@ simple_on_cmd(int argc, char *argv[])
} else {
/* clear sphere */
if (debug) error("clear sphere, invisible Earth body.");
- gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ gv_sendfile("oogl/earth_vect_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
earth_geom_exists = TRUE;
}
@@ -304,7 +304,7 @@ fancy_on_cmd(int argc, char *argv[])
if (geomview_module) gv_start();
if (!earth_vectors_loaded) {
- earth_vectors_loaded =
gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ earth_vectors_loaded = gv_sendfile("oogl/earth_vect_h.oogl");
}
if (earth_on_flag) {
@@ -313,7 +313,7 @@ fancy_on_cmd(int argc, char *argv[])
} else {
/* clear sphere */
if (debug) error("clear sphere, invisible Earth body.");
- gv_sendfile("/usr/share/savi/oogl/earth_vect_h.oogl");
+ gv_sendfile("oogl/earth_vect_h.oogl");
gv_create_geom("Central_Body", "central_t", "earth_vect_clear_h");
earth_geom_exists = TRUE;
}
diff --git a/src/gv_init.c b/src/gv_init.c
index 7fce93d..8233520 100644
--- a/src/gv_init.c
+++ b/src/gv_init.c
@@ -37,7 +37,7 @@
#include "sats.h"
#include "globals.h"
-#define DETAILED_TEXTUREMAP_NAME
"/usr/share/savi/oogl/blue_marble_land_shallow_topo_2048.jpeg"
+#define DETAILED_TEXTUREMAP_NAME "oogl/blue_marble_land_shallow_topo_2048.jpeg"
static char tname[] = "trans_ ";
diff --git a/src/include/constants.h b/src/include/constants.h
index ecd2820..82751f1 100644
--- a/src/include/constants.h
+++ b/src/include/constants.h
@@ -40,10 +40,10 @@
/* for file-handling routines */
#define NOT_OK -1
-#define HANDLE_FILE_SAVI "/usr/share/savi/oogl/savi.oogl"
-#define HANDLE_FILE_LOGO "/usr/share/savi/oogl/savilogo.oogl"
+#define HANDLE_FILE_SAVI "oogl/savi.oogl"
+#define HANDLE_FILE_LOGO "oogl/savilogo.oogl"
-#define AMBIENT_LIGHTING "/usr/share/savi/oogl/ambient_light.oogl"
+#define AMBIENT_LIGHTING "oogl/ambient_light.oogl"
#define EARTH_YEAR (365.25*24*3600)
#define EARTH_TILT 23.5
diff --git a/src/include/coverage_vis.h b/src/include/coverage_vis.h
index 577136b..3844f33 100644
--- a/src/include/coverage_vis.h
+++ b/src/include/coverage_vis.h
@@ -30,19 +30,19 @@
#include "Satellite.h"
/* bitmap of geographical boundaries for coverage */
-#define CYLINDRICAL_BITMAP_NAME "/usr/share/savi/maps/world.cyl.pbm"
-#define UNPROJECTED_BITMAP_NAME "/usr/share/savi/maps/world.unp.pbm"
-#define SPHERICAL_BITMAP_NAME "/usr/share/savi/maps/world.sph.pbm"
-#define SPHERICAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sph.pbm"
-#define SINUSOIDAL_BITMAP_NAME "/usr/share/savi/maps/world.sinu.pbm"
-#define SINUSOIDAL_90_BITMAP_NAME "/usr/share/savi/maps/world90W.sinu.pbm"
+#define CYLINDRICAL_BITMAP_NAME "maps/world.cyl.pbm"
+#define UNPROJECTED_BITMAP_NAME "maps/world.unp.pbm"
+#define SPHERICAL_BITMAP_NAME "maps/world.sph.pbm"
+#define SPHERICAL_90_BITMAP_NAME "maps/world90W.sph.pbm"
+#define SINUSOIDAL_BITMAP_NAME "maps/world.sinu.pbm"
+#define SINUSOIDAL_90_BITMAP_NAME "maps/world90W.sinu.pbm"
-#define CYLINDRICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.cyl.pbm"
-#define UNPROJECTED_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.unp.pbm"
-#define SPHERICAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sph.pbm"
-#define SPHERICAL_90_LARGE_BITMAP_NAME
"/usr/share/savi/maps/world90W1024.sph.pbm"
-#define SINUSOIDAL_LARGE_BITMAP_NAME "/usr/share/savi/maps/world1024.sinu.pbm"
-#define SINUSOIDAL_90_LARGE_BITMAP_NAME
"/usr/share/savi/maps/world90W1024.sinu.pbm"
+#define CYLINDRICAL_LARGE_BITMAP_NAME "maps/world1024.cyl.pbm"
+#define UNPROJECTED_LARGE_BITMAP_NAME "maps/world1024.unp.pbm"
+#define SPHERICAL_LARGE_BITMAP_NAME "maps/world1024.sph.pbm"
+#define SPHERICAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sph.pbm"
+#define SINUSOIDAL_LARGE_BITMAP_NAME "maps/world1024.sinu.pbm"
+#define SINUSOIDAL_90_LARGE_BITMAP_NAME "maps/world90W1024.sinu.pbm"
#define LONGITUDE_CENTER_LINE 0.0
#define LONGITUDE_CENTER_LINE_90W (-90.0)
diff --git a/src/stars.c b/src/stars.c
index b0fe091..873357b 100644
--- a/src/stars.c
+++ b/src/stars.c
@@ -48,7 +48,7 @@ stars_on_cmd(int argc, char *argv[])
{
gv_start();
if (!stars_loaded) {
- stars_loaded = gv_sendfile("/usr/share/savi/oogl/stars_h.oogl");
+ stars_loaded = gv_sendfile("oogl/stars_h.oogl");
}
if (stars_loaded) {
gv_create_geomh("Stars", "stars_h");
diff --git a/tcl/about.tcl b/tcl/about.tcl
index c247017..2131a3a 100644
--- a/tcl/about.tcl
+++ b/tcl/about.tcl
@@ -36,7 +36,7 @@ proc about(build) {} {
set cmd [build_CmdFrame $name cmd]
set logo [canvas $cmd.logo -width 150 -height 75]
- image create photo graphic -file "/usr/share/savi/maps/savi-logo.gif"
+ image create photo graphic -file "maps/savi-logo.gif"
$logo create image 75 0 -image graphic -anchor n
pack $logo
diff --git a/tcl/main.tcl b/tcl/main.tcl
index 09d004d..b5cdc09 100644
--- a/tcl/main.tcl
+++ b/tcl/main.tcl
@@ -641,7 +641,7 @@ proc main(constellation) {filename} {
# coverage(update_decay)
- main(load_file) "/usr/share/savi/data/$filename"
+ main(load_file) "data/$filename"
}
proc main(source_file) {filename} {
--
satellite constellation visualisation
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
