OpenSDE
/
package-nopast
3
0
Fork 0
Code Issues 9 Projects 1 Releases Activity
OpenSDE Packages Database (without history before r20070)
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.
684 Commits
49 Branches
0 Tags
34 MiB
Tree: feba5e162d
Branches Tags
${ item.name }
Create branch ${ searchTerm }
from 'feba5e162d'
${ noResults }
package-nopast/graphic/geomorph/install.patch

250 lines
12 KiB
Raw Normal View History

* relocated current package database to the trunk of the package sub-project git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20072 10447126-35f2-4685-b0cf-6dd780d3921f
18 years ago
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
​
  1. # --- SDE-COPYRIGHT-NOTE-BEGIN ---
  2. # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
  3. #
  4. # Filename: package/.../geomorph/install.patch
  5. # Copyright (C) 2006 The OpenSDE Project
  6. #
  7. # More information can be found in the files COPYING and README.
  8. #
  9. # This patch file is dual-licensed. It is available under the license the
  10. # patched project is licensed under, as long as it is an OpenSource license
  11. # as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
  12. # of the GNU General Public License as published by the Free Software
  13. # Foundation; either version 2 of the License, or (at your option) any later
  14. # version.
  15. # --- SDE-COPYRIGHT-NOTE-END ---
  17. diff -ur geomorph-0.31_orig/config.sub geomorph-0.31/config.sub
  18. --- geomorph-0.31_orig/config.sub 2006-09-09 22:14:20.222544500 +0100
  19. +++ geomorph-0.31/config.sub 2006-09-09 22:54:11.836011000 +0100
  20. @@ -183,17 +183,6 @@
  21. m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | z8k | v70 | h8500 | w65 | pj | pjl)
  22. ;;
  24. - # We use `pc' rather than `unknown'
  25. - # because (1) that's what they normally are, and
  26. - # (2) the word "unknown" tends to confuse beginning users.
  27. - i[34567]86)
  28. - basic_machine=$basic_machine-pc
  29. - ;;
  30. - # Object if more than one company name word.
  31. - *-*-*)
  32. - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  33. - exit 1
  34. - ;;
  35. # Recognize the basic CPU types with company name.
  36. # FIXME: clean up the formatting here.
  37. vax-* | tahoe-* | i[34567]86-* | i860-* | ia64-* | m32r-* | m68k-* | m68000-* \
  38. @@ -861,9 +850,6 @@
  39. os=-coff
  40. ;;
  41. *)
  42. - echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
  43. - exit 1
  44. - ;;
  45. esac
  47. # Here we canonicalize certain aliases for manufacturers.
  48. diff -ur geomorph-0.31_orig/geomorphrc geomorph-0.31/geomorphrc
  49. --- geomorph-0.31_orig/geomorphrc 2006-09-09 22:14:20.222544500 +0100
  50. +++ geomorph-0.31/geomorphrc 2006-09-09 22:39:03.827264000 +0100
  51. @@ -1,10 +1,10 @@
  53. [files] ; R�pertoires et fichiers
  54. def_dir = geomorph ; R�pertoire par d�faut
  55. -hf_dir = /home/patrice/geomorph/ ; R�pertoire par d�faut (images de relief)
  56. -pov_dir = /home/patrice/geomorph/ ; R�pertoire par d�faut (sc�nes Povray)
  57. -doc_dir = /usr/local/share/geomorph/doc/index.html ; R�pertoire par d�faut (documentation)
  58. -doc_reader = epiphany ; Lecteur HTML par d�faut
  59. +hf_dir = ~/geomorph/ ; R�pertoire par d�faut (images de relief)
  60. +pov_dir = ~/geomorph/ ; R�pertoire par d�faut (sc�nes Povray)
  61. +doc_dir = /usr/share/geomorph/doc/index.html ; R�pertoire par d�faut (documentation)
  62. +doc_reader = firefox ; Lecteur HTML par d�faut
  64. [interface] ; Interface
  65. pad = 6 ; Espacement des dialogues (pixels)
  66. @@ -30,7 +30,7 @@
  67. renderer = povray ; Outil de rendu 3D (Povray...)
  68. render_width = 640 ; Largeur par d�faut du rendu 3D
  69. render_height = 480 ; Hauteur par d�faut du rendu 3D
  70. -scene = /home/patrice/geomorph/simple_terrain.pov ; Sc�ne de rendu par d�faut (.pov...)
  71. +scene = ~/geomorph/simple_terrain.pov ; Sc�ne de rendu par d�faut (.pov...)
  72. hf_output_for_rendering = test.png ; Fichier PNG de sortie pour la sc�ne POV par d�faut
  73. other_render_options = +D -F +P ; Autres options de rendu sur la ligne de commande
  75. diff -ur geomorph-0.31_orig/geomorphrc_de geomorph-0.31/geomorphrc_de
  76. --- geomorph-0.31_orig/geomorphrc_de 2006-09-09 22:14:20.222544500 +0100
  77. +++ geomorph-0.31/geomorphrc_de 2006-09-09 22:39:32.117032000 +0100
  78. @@ -1,10 +1,10 @@
  80. [files] ; Verzeichnis und Dateien
  81. def_dir = geomorph ; Standard-Verzeichnis
  82. -hf_dir = /home/yourself/geomorph/ ; Standard-Verzeichnis (Height Fields)
  83. -pov_dir = /home/yourself/geomorph/ ; Standard-Verzeichnis (Povray Szenen)
  84. -doc_dir = /usr/local/share/geomorph/doc/index.html ; Standard-Verzeichnis (Dokumentation)
  85. -doc_reader = epiphany ; Standard HTML Browser
  86. +hf_dir = ~/geomorph/ ; Standard-Verzeichnis (Height Fields)
  87. +pov_dir = ~/geomorph/ ; Standard-Verzeichnis (Povray Szenen)
  88. +doc_dir = /usr/share/geomorph/doc/index.html ; Standard-Verzeichnis (Dokumentation)
  89. +doc_reader = firefox ; Standard HTML Browser
  91. [interface] ; Schnittstelle
  92. pad = 6 ; Dialog Padding (Pixel)
  93. @@ -30,7 +30,7 @@
  94. renderer = povray ; 3D Rendering Werkzeug (Povray...)
  95. render_width = 640 ; Standard 3D Render-Breite
  96. render_height = 480 ; Standard 3D Render-Höhe
  97. -scene = /home/yourself/geomorph/simple_terrain.pov ; Standard-Szene für Rendering (.pov...)
  98. +scene = ~/geomorph/simple_terrain.pov ; Standard-Szene für Rendering (.pov...)
  99. hf_output_for_rendering = test.png ; PNG Dateiname für die Ausgabe der Standard POV Szene
  100. output_prefix = _ ; Povray Ausgabe-Prefix
  101. other_render_options = +D -F +P ; Andere Renderparameter für die Kommandozeile
  102. diff -ur geomorph-0.31_orig/geomorphrc_en geomorph-0.31/geomorphrc_en
  103. --- geomorph-0.31_orig/geomorphrc_en 2006-09-09 22:14:20.222544500 +0100
  104. +++ geomorph-0.31/geomorphrc_en 2006-09-09 22:39:13.799887250 +0100
  105. @@ -10,10 +10,10 @@
  107. [files] ; Directory and files
  108. def_dir = geomorph ; Default directory
  109. -hf_dir = /home/myself/geomorph/ ; Default directory (Height fields)
  110. -pov_dir = /home/myself/geomorph/ ; Default directory (Povray scenes)
  111. -doc_dir = /usr/local/share/geomorph/doc ; Default directory (documentation)
  112. -doc_reader = mozilla ; Default HTML reader
  113. +hf_dir = ~/geomorph/ ; Default directory (Height fields)
  114. +pov_dir = ~/geomorph/ ; Default directory (Povray scenes)
  115. +doc_dir = /usr/share/geomorph/doc ; Default directory (documentation)
  116. +doc_reader = firefox ; Default HTML reader
  118. [interface] ; Interface
  119. pad = 6 ; Dialog padding (pixels)
  120. @@ -39,7 +39,7 @@
  121. renderer = x-povray ; 3D rendering tool (Povray...)
  122. render_width = 640 ; Default 3D rendering width
  123. render_height = 480 ; Default 3D rendering height
  124. -scene = /home/myself/geomorph/iced_satellite.pov ; Default rendering scene (.pov...)
  125. +scene = ~/geomorph/iced_satellite.pov ; Default rendering scene (.pov...)
  126. hf_output_for_rendering = tmp/test.png ; PNG output file name for default POV scene
  127. output_prefix = _ ; Povray output prefix
  128. other_render_options = +P +D -F ; Other command line rendering options
  129. diff -ur geomorph-0.31_orig/geomorphrc_fr geomorph-0.31/geomorphrc_fr
  130. --- geomorph-0.31_orig/geomorphrc_fr 2006-09-09 22:14:20.222544500 +0100
  131. +++ geomorph-0.31/geomorphrc_fr 2006-09-09 22:39:54.490430250 +0100
  132. @@ -10,10 +10,10 @@
  134. [files] ; R�pertoires et fichiers
  135. def_dir = geomorph ; R�pertoire par d�faut
  136. -hf_dir = /home/moimeme/geomorph/ ; R�pertoire par d�faut (images de relief)
  137. -pov_dir = /home/moimeme/geomorph/ ; R�pertoire par d�faut (sc�nes Povray)
  138. -doc_dir = /usr/local/share/geomorph/doc ; R�pertoire par d�faut (documentation)
  139. -doc_reader = mozilla ; Lecteur HTML par d�faut
  140. +hf_dir = ~/geomorph/ ; R�pertoire par d�faut (images de relief)
  141. +pov_dir = ~/geomorph/ ; R�pertoire par d�faut (sc�nes Povray)
  142. +doc_dir = /usr/share/geomorph/doc ; R�pertoire par d�faut (documentation)
  143. +doc_reader = firefox ; Lecteur HTML par d�faut
  145. [interface] ; Interface
  146. pad = 6 ; Espacement des dialogues (pixels)
  147. @@ -39,7 +39,7 @@
  148. renderer = x-povray ; Outil de rendu 3D (Povray...)
  149. render_width = 640 ; Largeur par d�faut du rendu 3D
  150. render_height = 480 ; Hauteur par d�faut du rendu 3D
  151. -scene = /home/moimeme/geomorph/iced_satellite.pov ; Sc�ne de rendu par d�faut (.pov...)
  152. +scene = ~/geomorph/iced_satellite.pov ; Sc�ne de rendu par d�faut (.pov...)
  153. hf_output_for_rendering = tmp/test.png ; Fichier PNG de sortie pour la sc�ne POV par d�faut
  154. output_prefix = _ ; Pr�fixe du fichier de sortie Povray
  155. other_render_options = +P +D -F ; Autres options de rendu sur la ligne de commande
  156. diff -ur geomorph-0.31_orig/install-step1-dir geomorph-0.31/install-step1-dir
  157. --- geomorph-0.31_orig/install-step1-dir 2006-09-09 22:14:20.258546750 +0100
  158. +++ geomorph-0.31/install-step1-dir 2006-09-09 22:41:45.209349750 +0100
  159. @@ -3,7 +3,7 @@
  160. # Installing a Geomorph user, part 1: the directory with default POV scenes
  162. VERSION=0.31
  163. -SOURCE_DIR=/usr/local/share/geomorph/$VERSION/scenes
  164. +SOURCE_DIR=/usr/share/geomorph/$VERSION/scenes
  166. if [ -d $HOME/geomorph ]
  167. then
  168. @@ -32,6 +32,6 @@
  169. fi
  171. mkdir -v $HOME/geomorph
  172. -cp -fv /usr/local/share/geomorph/$VERSION/scenes/* $HOME/geomorph
  173. +cp -fv /usr/share/geomorph/$VERSION/scenes/* $HOME/geomorph
  176. diff -ur geomorph-0.31_orig/install-step2-rcfile geomorph-0.31/install-step2-rcfile
  177. --- geomorph-0.31_orig/install-step2-rcfile 2006-09-09 22:14:20.258546750 +0100
  178. +++ geomorph-0.31/install-step2-rcfile 2006-09-09 23:04:16.525801750 +0100
  179. @@ -14,7 +14,7 @@
  180. echo "def_dir = geomorph" >> $GEORC;
  181. echo "hf_dir = $HOME/geomorph" >> $GEORC;
  182. echo "pov_dir = $HOME/geomorph" >> $GEORC;
  183. -echo "doc_dir = /usr/local/share/geomorph/doc/index.html " >> $GEORC;
  184. +echo "doc_dir = /usr/share/geomorph/doc/index.html " >> $GEORC;
  186. # Look for a HTML reader
  187. # (a simple process which could be fooled in some cases -
  188. @@ -76,8 +76,8 @@
  190. echo " " >> $GEORC;
  192. -if type /usr/local/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
  193. - /usr/local/share/geomorph/$VERSION/v0_30_new_sections >> $GEORC
  194. +if type /usr/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
  195. + /usr/share/geomorph/$VERSION/v0_30_new_sections >> $GEORC
  196. elif type ./v0_30_new_sections > /dev/null ; then
  197. ./v0_30_new_sections >> $GEORC
  198. fi
  199. diff -ur geomorph-0.31_orig/install-step3-desktop geomorph-0.31/install-step3-desktop
  200. --- geomorph-0.31_orig/install-step3-desktop 2006-09-09 22:14:20.258546750 +0100
  201. +++ geomorph-0.31/install-step3-desktop 2006-09-09 22:41:45.209349750 +0100
  202. @@ -7,13 +7,13 @@
  204. if [ -d $HOME/.gnome-desktop ]
  205. then if [ ! -f $HOME/.gnome-desktop/$DSKT ]
  206. - then cp -vf /usr/local/share/geomorph/Geomorph-gnome.desktop $HOME/.gnome-desktop/$DSKT
  207. + then cp -vf /usr/share/geomorph/Geomorph-gnome.desktop $HOME/.gnome-desktop/$DSKT
  208. fi
  209. fi
  211. if [ -d $HOME/Desktop ]
  212. then if [ ! -f $HOME/Desktop/$DSKT ]
  213. - then cp -vf /usr/local/share/geomorph/Geomorph-kde.desktop $HOME/Desktop/$DSKT
  214. + then cp -vf /usr/share/geomorph/Geomorph-kde.desktop $HOME/Desktop/$DSKT
  215. fi
  216. fi
  218. diff -ur geomorph-0.31_orig/install-user geomorph-0.31/install-user
  219. --- geomorph-0.31_orig/install-user 2006-09-09 22:14:20.258546750 +0100
  220. +++ geomorph-0.31/install-user 2006-09-09 22:41:45.213350000 +0100
  221. @@ -10,11 +10,11 @@
  223. if [ -d $HOME/geomorph ]
  224. then
  225. - /usr/local/share/geomorph/$VERSION/install-step1-dir
  226. + /usr/share/geomorph/$VERSION/install-step1-dir
  227. exit
  228. fi
  230. -/usr/local/share/geomorph/$VERSION/install-step1-dir
  231. -/usr/local/share/geomorph/$VERSION/install-step2-rcfile
  232. -/usr/local/share/geomorph/$VERSION/install-step3-desktop
  233. +/usr/share/geomorph/$VERSION/install-step1-dir
  234. +/usr/share/geomorph/$VERSION/install-step2-rcfile
  235. +/usr/share/geomorph/$VERSION/install-step3-desktop
  237. diff -ur geomorph-0.31_orig/update-rc geomorph-0.31/update-rc
  238. --- geomorph-0.31_orig/update-rc 2006-09-09 22:14:20.258546750 +0100
  239. +++ geomorph-0.31/update-rc 2006-09-09 22:16:07.549252000 +0100
  240. @@ -65,8 +65,8 @@
  242. # 5. We add the 3d_preview and the camera_1 to camera_5 sections
  244. -if type /usr/local/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
  245. - /usr/local/share/geomorph/$VERSION/v0_30_new_sections >> $HOME/geomorph/geomorphrc
  246. +if type /usr/share/geomorph/$VERSION/v0_30_new_sections >& /dev/null ; then
  247. + /usr/share/geomorph/$VERSION/v0_30_new_sections >> $HOME/geomorph/geomorphrc
  248. elif type ./v0_30_new_sections > /dev/null ; then
  249. ./v0_30_new_sections >> $HOME/geomorph/geomorphrc
  250. fi