karasz
/
package-update
1
0
Fork 0
Code Issues Releases Activity
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
4234 Commits
46 Branches
0 Tags
0 B
 
 
 
 
 
 
Tree: 94b1badb03
Branches Tags
${ item.name }
Create tag ${ searchTerm }
Create branch ${ searchTerm }
from '94b1badb03'
${ noResults }
package-update/graphic/geomorph/install.patch

250 lines
12 KiB
Raw Blame History

# --- SDE-COPYRIGHT-NOTE-BEGIN ---
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: package/.../geomorph/install.patch
# Copyright (C) 2006 The OpenSDE Project
#
# More information can be found in the files COPYING and README.
#
# This patch file is dual-licensed. It is available under the license the
# patched project is licensed under, as long as it is an OpenSource license
# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
# of the GNU General Public License as published by the Free Software
# Foundation; either version 2 of the License, or (at your option) any later
# version.
# --- SDE-COPYRIGHT-NOTE-END ---
diff -ur geomorph-0.31_orig/config.sub geomorph-0.31/config.sub
--- geomorph-0.31_orig/config.sub 2006-09-09 22:14:20.222544500 +0100
+++ geomorph-0.31/config.sub 2006-09-09 22:54:11.836011000 +0100
@@ -183,17 +183,6 @@
m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
;;
- # We use `pc' rather than `unknown'
- # because (1) that's what they normally are, and
- # (2) the word "unknown" tends to confuse beginning users.
- i[34567]86)
- basic_machine=$basic_machine-pc
- ;;
- # Object if more than one company name word.
- *-*-*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
# Recognize the basic CPU types with company name.
# FIXME: clean up the formatting here.
vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
@@ -861,9 +850,6 @@
os=-coff
;;
*)
- echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
- exit 1
- ;;
esac
# Here we canonicalize certain aliases for manufacturers.
diff -ur geomorph-0.31_orig/geomorphrc geomorph-0.31/geomorphrc
--- geomorph-0.31_orig/geomorphrc 2006-09-09 22:14:20.222544500 +0100
+++ geomorph-0.31/geomorphrc 2006-09-09 22:39:03.827264000 +0100
@@ -1,10 +1,10 @@
[files] ; Répertoires et fichiers
def_dir = geomorph ; Répertoire par défaut
-hf_dir = /home/patrice/geomorph/ ; Répertoire par défaut (images de relief)
-pov_dir = /home/patrice/geomorph/ ; Répertoire par défaut (scènes Povray)
-doc_dir = /usr/local/share/geomorph/doc/index.html ; Répertoire par défaut (documentation)
-doc_reader = epiphany ; Lecteur HTML par défaut
+hf_dir = ~/geomorph/ ; Répertoire par défaut (images de relief)
+pov_dir = ~/geomorph/ ; Répertoire par défaut (scènes Povray)
+doc_dir = /usr/share/geomorph/doc/index.html ; Répertoire par défaut (documentation)
+doc_reader = firefox ; Lecteur HTML par défaut
[interface] ; Interface
pad = 6 ; Espacement des dialogues (pixels)
@@ -30,7 +30,7 @@
renderer = povray ; Outil de rendu 3D (Povray...)
render_width = 640 ; Largeur par défaut du rendu 3D
render_height = 480 ; Hauteur par défaut du rendu 3D
-scene = /home/patrice/geomorph/simple_terrain.pov ; Scène de rendu par défaut (.pov...)
+scene = ~/geomorph/simple_terrain.pov ; Scène de rendu par défaut (.pov...)
hf_output_for_rendering = test.png ; Fichier PNG de sortie pour la scène POV par défaut
other_render_options = +D -F +P ; Autres options de rendu sur la ligne de commande
diff -ur geomorph-0.31_orig/geomorphrc_de geomorph-0.31/geomorphrc_de
--- geomorph-0.31_orig/geomorphrc_de 2006-09-09 22:14:20.222544500 +0100
+++ geomorph-0.31/geomorphrc_de 2006-09-09 22:39:32.117032000 +0100
@@ -1,10 +1,10 @@
[files] ; Verzeichnis und Dateien
def_dir = geomorph ; Standard-Verzeichnis
-hf_dir = /home/yourself/geomorph/ ; Standard-Verzeichnis (Height Fields)
-pov_dir = /home/yourself/geomorph/ ; Standard-Verzeichnis (Povray Szenen)
-doc_dir = /usr/local/share/geomorph/doc/index.html ; Standard-Verzeichnis (Dokumentation)
-doc_reader = epiphany ; Standard HTML Browser
+hf_dir = ~/geomorph/ ; Standard-Verzeichnis (Height Fields)
+pov_dir = ~/geomorph/ ; Standard-Verzeichnis (Povray Szenen)
+doc_dir = /usr/share/geomorph/doc/index.html ; Standard-Verzeichnis (Dokumentation)
+doc_reader = firefox ; Standard HTML Browser
[interface] ; Schnittstelle
pad = 6 ; Dialog Padding (Pixel)
@@ -30,7 +30,7 @@
renderer = povray ; 3D Rendering Werkzeug (Povray...)
render_width = 640 ; Standard 3D Render-Breite
render_height = 480 ; Standard 3D Render-Höhe
-scene = /home/yourself/geomorph/simple_terrain.pov ; Standard-Szene für Rendering (.pov...)
+scene = ~/geomorph/simple_terrain.pov ; Standard-Szene für Rendering (.pov...)
hf_output_for_rendering = test.png ; PNG Dateiname für die Ausgabe der Standard POV Szene
output_prefix = _ ; Povray Ausgabe-Prefix
other_render_options = +D -F +P ; Andere Renderparameter für die Kommandozeile
diff -ur geomorph-0.31_orig/geomorphrc_en geomorph-0.31/geomorphrc_en
--- geomorph-0.31_orig/geomorphrc_en 2006-09-09 22:14:20.222544500 +0100
+++ geomorph-0.31/geomorphrc_en 2006-09-09 22:39:13.799887250 +0100
@@ -10,10 +10,10 @@
[files] ; Directory and files
def_dir = geomorph ; Default directory
-hf_dir = /home/myself/geomorph/ ; Default directory (Height fields)
-pov_dir = /home/myself/geomorph/ ; Default directory (Povray scenes)
-doc_dir = /usr/local/share/geomorph/doc ; Default directory (documentation)
-doc_reader = mozilla ; Default HTML reader
+hf_dir = ~/geomorph/ ; Default directory (Height fields)
+pov_dir = ~/geomorph/ ; Default directory (Povray scenes)
+doc_dir = /usr/share/geomorph/doc ; Default directory (documentation)
+doc_reader = firefox ; Default HTML reader
[interface] ; Interface
pad = 6 ; Dialog padding (pixels)
@@ -39,7 +39,7 @@
renderer = x-povray ; 3D rendering tool (Povray...)
render_width = 640 ; Default 3D rendering width
render_height = 480 ; Default 3D rendering height
-scene = /home/myself/geomorph/iced_satellite.pov ; Default rendering scene (.pov...)
+scene = ~/geomorph/iced_satellite.pov ; Default rendering scene (.pov...)
hf_output_for_rendering = tmp/test.png ; PNG output file name for default POV scene
output_prefix = _ ; Povray output prefix
other_render_options = +P +D -F ; Other command line rendering options
diff -ur geomorph-0.31_orig/geomorphrc_fr geomorph-0.31/geomorphrc_fr
--- geomorph-0.31_orig/geomorphrc_fr 2006-09-09 22:14:20.222544500 +0100
+++ geomorph-0.31/geomorphrc_fr 2006-09-09 22:39:54.490430250 +0100
@@ -10,10 +10,10 @@
[files] ; Répertoires et fichiers
def_dir = geomorph ; Répertoire par défaut
-hf_dir = /home/moimeme/geomorph/ ; Répertoire par défaut (images de relief)
-pov_dir = /home/moimeme/geomorph/ ; Répertoire par défaut (scènes Povray)
-doc_dir = /usr/local/share/geomorph/doc ; Répertoire par défaut (documentation)
-doc_reader = mozilla ; Lecteur HTML par défaut
+hf_dir = ~/geomorph/ ; Répertoire par défaut (images de relief)
+pov_dir = ~/geomorph/ ; Répertoire par défaut (scènes Povray)
+doc_dir = /usr/share/geomorph/doc ; Répertoire par défaut (documentation)
+doc_reader = firefox ; Lecteur HTML par défaut
[interface] ; Interface
pad = 6 ; Espacement des dialogues (pixels)
@@ -39,7 +39,7 @@
renderer = x-povray ; Outil de rendu 3D (Povray...)
render_width = 640 ; Largeur par défaut du rendu 3D
render_height = 480 ; Hauteur par défaut du rendu 3D
-scene = /home/moimeme/geomorph/iced_satellite.pov ; Scène de rendu par défaut (.pov...)
+scene = ~/geomorph/iced_satellite.pov ; Scène de rendu par défaut (.pov...)
hf_output_for_rendering = tmp/test.png ; Fichier PNG de sortie pour la scène POV par défaut
output_prefix = _ ; Préfixe du fichier de sortie Povray
other_render_options = +P +D -F ; Autres options de rendu sur la ligne de commande
diff -ur geomorph-0.31_orig/install-step1-dir geomorph-0.31/install-step1-dir
--- geomorph-0.31_orig/install-step1-dir 2006-09-09 22:14:20.258546750 +0100
+++ geomorph-0.31/install-step1-dir 2006-09-09 22:41:45.209349750 +0100
@@ -3,7 +3,7 @@
# Installing a Geomorph user, part 1: the directory with default POV scenes
VERSION=0.31
-SOURCE_DIR=/usr/local/share/geomorph/$VERSION/scenes
+SOURCE_DIR=/usr/share/geomorph/$VERSION/scenes
if [ -d $HOME/geomorph ]
then
@@ -32,6 +32,6 @@
fi
mkdir -v $HOME/geomorph
-cp -fv /usr/local/share/geomorph/$VERSION/scenes/* $HOME/geomorph
+cp -fv /usr/share/geomorph/$VERSION/scenes/* $HOME/geomorph
diff -ur geomorph-0.31_orig/install-step2-rcfile geomorph-0.31/install-step2-rcfile
--- geomorph-0.31_orig/install-step2-rcfile 2006-09-09 22:14:20.258546750 +0100
+++ geomorph-0.31/install-step2-rcfile 2006-09-09 23:04:16.525801750 +0100
@@ -14,7 +14,7 @@
echo "def_dir = geomorph" >> $GEORC;
echo "hf_dir = $HOME/geomorph" >> $GEORC;
echo "pov_dir = $HOME/geomorph" >> $GEORC;
-echo "doc_dir = /usr/local/share/geomorph/doc/index.html " >> $GEORC;
+echo "doc_dir = /usr/share/geomorph/doc/index.html " >> $GEORC;
# Look for a HTML reader
# (a simple process which could be fooled in some cases -
@@ -76,8 +76,8 @@
echo " " >> $GEORC;
-if type /usr/local/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
- /usr/local/share/geomorph/$VERSION/v0_30_new_sections >> $GEORC
+if type /usr/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
+ /usr/share/geomorph/$VERSION/v0_30_new_sections >> $GEORC
elif type ./v0_30_new_sections > /dev/null ; then
./v0_30_new_sections >> $GEORC
fi
diff -ur geomorph-0.31_orig/install-step3-desktop geomorph-0.31/install-step3-desktop
--- geomorph-0.31_orig/install-step3-desktop 2006-09-09 22:14:20.258546750 +0100
+++ geomorph-0.31/install-step3-desktop 2006-09-09 22:41:45.209349750 +0100
@@ -7,13 +7,13 @@
if [ -d $HOME/.gnome-desktop ]
then if [ ! -f $HOME/.gnome-desktop/$DSKT ]
- then cp -vf /usr/local/share/geomorph/Geomorph-gnome.desktop $HOME/.gnome-desktop/$DSKT
+ then cp -vf /usr/share/geomorph/Geomorph-gnome.desktop $HOME/.gnome-desktop/$DSKT
fi
fi
if [ -d $HOME/Desktop ]
then if [ ! -f $HOME/Desktop/$DSKT ]
- then cp -vf /usr/local/share/geomorph/Geomorph-kde.desktop $HOME/Desktop/$DSKT
+ then cp -vf /usr/share/geomorph/Geomorph-kde.desktop $HOME/Desktop/$DSKT
fi
fi
diff -ur geomorph-0.31_orig/install-user geomorph-0.31/install-user
--- geomorph-0.31_orig/install-user 2006-09-09 22:14:20.258546750 +0100
+++ geomorph-0.31/install-user 2006-09-09 22:41:45.213350000 +0100
@@ -10,11 +10,11 @@
if [ -d $HOME/geomorph ]
then
- /usr/local/share/geomorph/$VERSION/install-step1-dir
+ /usr/share/geomorph/$VERSION/install-step1-dir
exit
fi
-/usr/local/share/geomorph/$VERSION/install-step1-dir
-/usr/local/share/geomorph/$VERSION/install-step2-rcfile
-/usr/local/share/geomorph/$VERSION/install-step3-desktop
+/usr/share/geomorph/$VERSION/install-step1-dir
+/usr/share/geomorph/$VERSION/install-step2-rcfile
+/usr/share/geomorph/$VERSION/install-step3-desktop
diff -ur geomorph-0.31_orig/update-rc geomorph-0.31/update-rc
--- geomorph-0.31_orig/update-rc 2006-09-09 22:14:20.258546750 +0100
+++ geomorph-0.31/update-rc 2006-09-09 22:16:07.549252000 +0100
@@ -65,8 +65,8 @@
# 5. We add the 3d_preview and the camera_1 to camera_5 sections
-if type /usr/local/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
- /usr/local/share/geomorph/$VERSION/v0_30_new_sections >> $HOME/geomorph/geomorphrc
+if type /usr/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
+ /usr/share/geomorph/$VERSION/v0_30_new_sections >> $HOME/geomorph/geomorphrc
elif type ./v0_30_new_sections > /dev/null ; then
./v0_30_new_sections >> $HOME/geomorph/geomorphrc
fi