1
#! /bin/sh /usr/share/dpatch/dpatch-run
2
## scripts.dpatch by Francesco Paolo Lovergine <frankie@debian.org>
4
## All lines beginning with `## DP:' are a description of the patch.
8
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/scripts/m.proj/m.proj grass-6.4.0~rc6+42329/scripts/m.proj/m.proj
9
--- grass-6.4.0~rc6+42329~/scripts/m.proj/m.proj 2010-03-15 14:23:45.000000000 +0100
10
+++ grass-6.4.0~rc6+42329/scripts/m.proj/m.proj 2010-09-21 15:37:08.000000000 +0200
12
#% description: Input coordinate file (omit to read from stdin)
14
#% key_desc : filename
15
+#% guisection: Files & format
20
#% description: Output coordinate file (omit to send to stdout)
22
#% key_desc : filename
23
+#% guisection: Files & format
29
#% key_desc : character
31
+#% guisection: Files & format
36
#% description: Input projection parameters (PROJ.4 style)
38
+#% guisection: Projections
43
#% description: Output projection parameters (PROJ.4 style)
45
+#% guisection: Projections
49
#% description: Use LL WGS84 as input and current location as output projection
50
+#% guisection: Projections
54
#% description: Use current location as input and LL WGS84 as output projection
55
+#% guisection: Projections
59
-#% description: Output long/lat in decimal degrees or other projections with many decimal places
60
+#% description: Output long/lat in decimal degrees, or other projections with many decimal places
61
+#% guisection: Files & format
65
#% description: Script style output in CSV format respecting the field separator settings
66
+#% guisection: Files & format
70
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/scripts/r.mask/r.mask grass-6.4.0~rc6+42329/scripts/r.mask/r.mask
71
--- grass-6.4.0~rc6+42329~/scripts/r.mask/r.mask 2010-03-15 14:23:25.000000000 +0100
72
+++ grass-6.4.0~rc6+42329/scripts/r.mask/r.mask 2010-09-21 15:37:16.000000000 +0200
74
exec g.parser "$0" "$@"
77
+if [ -z "$GRASS_VERBOSE" ] || [ "$GRASS_VERBOSE" -le 2 ] ; then
89
if [ "$GIS_FLAG_R" -eq 1 ]; then
90
- if test -f `g.gisenv GISDBASE`/`g.gisenv LOCATION_NAME`/`g.gisenv MAPSET`/cell/MASK ; then
91
+ if test -f "`g.gisenv GISDBASE`/`g.gisenv LOCATION_NAME`/`g.gisenv MAPSET`/cell/MASK" ; then
93
- g.message "Raster MASK removed"
94
+ g.message ${BEQUIET} "Raster MASK removed"
96
- g.message -w "No existing MASK to remove"
97
+ g.message ${BEQUIET} -w "No existing MASK to remove"
100
if [ ! $GIS_OPT_INPUT ]; then
101
- g.message -w "No raster map for MASK provided"
102
+ g.message ${BEQUIET} -w "No raster map for MASK provided"
105
if [ "$GIS_FLAG_O" -eq 1 ]; then
106
@@ -114,13 +120,13 @@
107
g.rename --q rast=MASK,$TEMPRAST
108
r.mapcalc "MASK=if(isnull($TEMPRAST),1,null())"
109
g.remove --q rast=$TEMPRAST
110
- g.message "Inverted MASK created. All subsequent raster operations"
111
+ g.message ${BEQUIET} "Inverted MASK created. All subsequent raster operations"
113
- g.message "MASK created. All subsequent raster operations"
114
+ g.message ${BEQUIET} "MASK created. All subsequent raster operations"
116
- g.message "will be limited to MASK area"
117
- g.message "Removing or renaming raster file named MASK will"
118
- g.message "restore raster operations to normal"
119
+ g.message ${BEQUIET} "will be limited to MASK area"
120
+ g.message ${BEQUIET} "Removing or renaming raster file named MASK will"
121
+ g.message ${BEQUIET} "restore raster operations to normal"
125
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/scripts/r.regression.line/r.regression.line grass-6.4.0~rc6+42329/scripts/r.regression.line/r.regression.line
126
--- grass-6.4.0~rc6+42329~/scripts/r.regression.line/r.regression.line 2010-03-15 14:23:47.000000000 +0100
127
+++ grass-6.4.0~rc6+42329/scripts/r.regression.line/r.regression.line 2010-09-21 15:37:38.000000000 +0200
128
@@ -112,10 +112,10 @@
130
END {B=(sumXY - sumX*sumY/tot)/(sumsqX - sumX*sumX/tot);\
131
R= (sumXY - sumX*sumY/tot)/((sumsqX - sumX^2/tot)*(sumsqY - sumY^2/tot))^0.5;\
132
-mediaX=sumX/tot;sumsqX=sumsqX/tot;varX=sumsqX-(mediaX^2);sdX=varX^0.5;\
133
-mediaY=sumY/tot;sumsqY=sumsqY/tot;varY=sumsqY-(mediaY^2);sdY=varY^0.5;\
134
-A=mediaY - B*mediaX; F= R^2/(1-R^2/tot-2);\
135
-print A, B, R, tot, F, mediaX, sdX, mediaY, sdY}' "$TEMPFILE" > "$TEMPFILE"b
136
+meanX=sumX/tot; sumsqX=sumsqX/tot; varX=sumsqX-(meanX^2); sdX=varX^0.5;\
137
+meanY=sumY/tot; sumsqY=sumsqY/tot; varY=sumsqY-(meanY^2); sdY=varY^0.5;\
138
+A=meanY - B*meanX; F= R^2/(1-R^2/tot-2);\
139
+print A, B, R, tot, F, meanX, sdX, meanY, sdY}' "$TEMPFILE" > "$TEMPFILE"b
141
echo "a b R N F medX sdX medY sdY" | tr -s ' ' '\n' > "$TEMPFILE"d
142
cat "$TEMPFILE"b | tr -s ' ' '\n' > "$TEMPFILE"e
145
echo " R: sumXY - sumX*sumY/tot"
146
echo " N: number of elements"
147
+ echo " F: F-test significance"
148
echo " medX, medY: Means"
149
echo " sdX, sdY: Standard deviations"
150
echo "a b R N F medX sdX medY sdY"
152
echo " b: gain" >> "$TEMPFILE"c
153
echo " R: sumXY - sumX*sumY/tot" >> "$TEMPFILE"c
154
echo " N: number of elements" >> "$TEMPFILE"c
155
+ echo " F: F-test significance" >> "$TEMPFILE"c
156
echo " medX, medY: Means" >> "$TEMPFILE"c
157
echo " sdX, sdY: Standard deviations" >> "$TEMPFILE"c
158
echo "a b R N F medX sdX medY sdY" >> "$TEMPFILE"c
159
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/scripts/v.in.gpsbabel/v.in.gpsbabel grass-6.4.0~rc6+42329/scripts/v.in.gpsbabel/v.in.gpsbabel
160
--- grass-6.4.0~rc6+42329~/scripts/v.in.gpsbabel/v.in.gpsbabel 2010-03-15 14:23:30.000000000 +0100
161
+++ grass-6.4.0~rc6+42329/scripts/v.in.gpsbabel/v.in.gpsbabel 2010-09-21 15:37:54.000000000 +0200
163
if [ "$IN_PROJ" = "$OUT_PROJ" ] || [ $KEEP_WGS84 -eq 1 ] ; then
164
g.message "No projection transformation performed"
165
cat "${TEMPFILE}.base" | awk 'BEGIN {;} $1=="L" { print } ; \
166
- $1!="L" { " %s %s\n", $1, $2) } END {;}' > "${TEMPFILE}.P_base"
167
+ $1!="L" { printf(" %s %s\n", $1, $2) } END {;}' > "${TEMPFILE}.P_base"
169
g.message "Attempting waypoint projection transform with cs2cs"
170
cs2cs -tL -f %.7f $IN_PROJ +to $OUT_PROJ < "${TEMPFILE}.base" > "${TEMPFILE}.P_mid"
171
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' grass-6.4.0~rc6+42329~/scripts/v.in.mapgen/v.in.mapgen grass-6.4.0~rc6+42329/scripts/v.in.mapgen/v.in.mapgen
172
--- grass-6.4.0~rc6+42329~/scripts/v.in.mapgen/v.in.mapgen 2010-03-15 14:23:29.000000000 +0100
173
+++ grass-6.4.0~rc6+42329/scripts/v.in.mapgen/v.in.mapgen 2010-09-21 15:38:12.000000000 +0200
178
-#% description: Import Mapgen or Matlab vector maps into GRASS.
179
+#% description: Import Mapgen or Matlab-ASCII vector maps into GRASS.
180
#% keywords: vector, import