]>
Commit | Line | Data |
---|---|---|
1 | diff -urN SVGATextMode-1.9-src.orig/Makefile SVGATextMode-1.9-src/Makefile | |
2 | --- SVGATextMode-1.9-src.orig/Makefile Wed Jul 28 22:14:53 1999 | |
3 | +++ SVGATextMode-1.9-src/Makefile Wed Jul 28 22:31:20 1999 | |
4 | @@ -41,14 +41,14 @@ | |
5 | export CFLAGS | |
6 | ||
7 | # installation path for SVGATextMode | |
8 | -INSTBINDIR = /usr/sbin | |
9 | +INSTBINDIR = $(DESTDIR)/usr/sbin | |
10 | ||
11 | # installation path for TextConfig. This is also the path that will be | |
12 | # compiled into SVGATextMode. | |
13 | -INSTCONFDIR = /etc | |
14 | +INSTCONFDIR = $(DESTDIR)/etc | |
15 | ||
16 | # installation path for the manual files | |
17 | -INSTMANDIR = /usr/man | |
18 | +INSTMANDIR = $(DESTDIR)/usr/share/man | |
19 | ||
20 | # misc configuration flags. | |
21 | # | |
22 | @@ -82,7 +82,7 @@ | |
23 | # to use 64kb of VGA memory instead of 32k. | |
24 | # | |
25 | ||
26 | -CONF_FLAGS = | |
27 | +CONF_FLAGS = -DRUN_SECURE | |
28 | ||
29 | ############ END OF USER CONFIGURATION ################################# | |
30 | ||
31 | @@ -107,8 +107,8 @@ | |
32 | XFREELIBS = XFREE/libxf86_hw.a | |
33 | XFREELINK = -LXFREE -lxf86_hw | |
34 | ||
35 | -USERPROGS = SVGATextMode stm clockprobe grabmode | |
36 | -HACKPROGS = setVGAreg getVGAreg setpalette getpalette set80 ClockProg | |
37 | +USERPROGS = SVGATextMode stm grabmode | |
38 | +HACKPROGS = setVGAreg setpalette set80 ClockProg | |
39 | ||
40 | BINARIES = $(USERPROGS) $(HACKPROGS) | |
41 | ||
42 | @@ -255,16 +255,12 @@ | |
43 | # | |
44 | ||
45 | bininstall: | |
46 | - @if [ ! -x SVGATextMode ]; then \ | |
47 | - make SVGATextMode; \ | |
48 | - fi | |
49 | - @if [ ! -x grabmode ]; then \ | |
50 | - make grabmode; \ | |
51 | - fi | |
52 | + install -s -m 755 $(USERPROGS) $(HACKPROGS) $(INSTBINDIR) | |
53 | install -m 755 SVGATextMode $(INSTBINDIR) | |
54 | ln -sf SVGATextMode $(INSTBINDIR)/stm | |
55 | - install -m 755 grabmode $(INSTBINDIR) | |
56 | ln -sf grabmode $(INSTBINDIR)/clockprobe | |
57 | + ln -sf setVGAreg $(INSTBINDIR)/getVGAreg | |
58 | + ln -sf setpalette $(INSTBINDIR)/getpalette | |
59 | ||
60 | man-install maninstall: | |
61 | rm -f $(INSTMANDIR)/man8/SVGATextMode.8.gz | |
62 | diff -urN SVGATextMode-1.9-src.orig/TextConfig SVGATextMode-1.9-src/TextConfig | |
63 | --- SVGATextMode-1.9-src.orig/TextConfig Wed Jul 28 22:14:53 1999 | |
64 | +++ SVGATextMode-1.9-src/TextConfig Wed Jul 28 22:26:10 1999 | |
65 | @@ -333,7 +333,7 @@ | |
66 | # cards, and is useless on cards with a programmable clock chip. | |
67 | # Cirrus cards seem not to like this feature! | |
68 | # | |
69 | -Option "ClockDiv2" | |
70 | +#Option "ClockDiv2" | |
71 | ||
72 | ############################################################################# | |
73 | # | |
74 | @@ -401,12 +401,15 @@ | |
75 | # It will be called with TWO arguments: the H and V size of the new text | |
76 | # mode. Example: SVGATextMode 100x37 will call | |
77 | # | |
78 | -# /etc/STM_reset 100 37 | |
79 | +# /usr/sbin/STM_reset 100 37 | |
80 | # Your reset program NEED not use those two arguments, but it could be useful | |
81 | # for some applications. | |
82 | # | |
83 | +# Debian package includes STM_reset script set up properly for use with gpm. | |
84 | +# You should not change the line below unless you have your own reset script | |
85 | +# in another location. | |
86 | ||
87 | -#ResetProg "/etc/STM_reset" | |
88 | +ResetProg "/usr/sbin/STM_reset" | |
89 | ||
90 | ||
91 | ############################################################################# | |
92 | diff -urN SVGATextMode-1.9-src.orig/contrib/STM_utilities.8 SVGATextMode-1.9-src/contrib/STM_utilities.8 | |
93 | --- SVGATextMode-1.9-src.orig/contrib/STM_utilities.8 Thu Jan 1 01:00:00 1970 | |
94 | +++ SVGATextMode-1.9-src/contrib/STM_utilities.8 Wed Jul 28 22:26:10 1999 | |
95 | @@ -0,0 +1,25 @@ | |
96 | +.TH STM_utilities 81 "10 April 1999" "Debian GNU/Linux" "SVGATextMode Utilities" | |
97 | +.\" Copyright (c) 1999 Ron Lee. All rights reserved. | |
98 | +.\" This text may be distributed under the terms of the GPL. | |
99 | +.\" | |
100 | +.SH NAME | |
101 | +STM_utilities \- helper programs supplied with SVGATextMode | |
102 | +.SH SYNOPSIS | |
103 | +.B STM_reset | |
104 | +.br | |
105 | +.B ClockProg | |
106 | +.br | |
107 | +.B getVGAreg | |
108 | +.br | |
109 | +.B getpalette | |
110 | +.br | |
111 | +.B setVGAreg | |
112 | +.br | |
113 | +.B setpalette | |
114 | +.br | |
115 | +.B set80 | |
116 | +.SH "DESCRIPTION" | |
117 | +These utilities currently do not have manual pages. | |
118 | +.PP | |
119 | +see \fI/usr/doc/svgatextmode\fP for details about their use. | |
120 | + | |
121 | diff -urN SVGATextMode-1.9-src.orig/contrib/scripts/STM_reset SVGATextMode-1.9-src/contrib/scripts/STM_reset | |
122 | --- SVGATextMode-1.9-src.orig/contrib/scripts/STM_reset Wed Jul 28 22:14:53 1999 | |
123 | +++ SVGATextMode-1.9-src/contrib/scripts/STM_reset Wed Jul 28 22:26:10 1999 | |
124 | @@ -1,4 +1,4 @@ | |
125 | -#!/bin/bash | |
126 | +#!/bin/sh | |
127 | # | |
128 | # This scripts is called from the "resetprog" line in TextConfig, | |
129 | # when SVGATextMode has finished switching modes. | |
130 | @@ -13,10 +13,19 @@ | |
131 | # on some kernel versions (according to Mr Rubini). | |
132 | # | |
133 | ||
134 | +# *** old gpm pid file.. kept for backward compatibility *** | |
135 | if [ -f /var/run/gpmpid ] | |
136 | then | |
137 | echo "Screen resized to $1x$2. Restarting GPM..." | |
138 | - kill -WINCH `cat /var/run/gpmpid # gets pid from current gpm daemon, and send resize signal to it | |
139 | + kill -WINCH `cat /var/run/gpmpid` # gets pid from current gpm daemon, and send resize signal to it | |
140 | +fi | |
141 | + | |
142 | +# *** modified by Ron Lee *** | |
143 | +# *** to do the same for the new one *** | |
144 | +if [ -f /var/run/gpm.pid ] | |
145 | +then | |
146 | + echo "Screen resized to $1x$2. Restarting GPM..." | |
147 | + kill -WINCH `cat /var/run/gpm.pid` # gets pid from current gpm daemon, and send resize signal to it | |
148 | fi | |
149 | ||
150 | # | |
151 | diff -urN SVGATextMode-1.9-src.orig/contrib/scripts/gettextregs SVGATextMode-1.9-src/contrib/scripts/gettextregs | |
152 | --- SVGATextMode-1.9-src.orig/contrib/scripts/gettextregs Wed Jul 28 22:14:53 1999 | |
153 | +++ SVGATextMode-1.9-src/contrib/scripts/gettextregs Wed Jul 28 22:26:10 1999 | |
154 | @@ -7,7 +7,8 @@ | |
155 | # current mode. It does about the same as "textmode" from svgalib | |
156 | # | |
157 | ||
158 | -BINDIR=. | |
159 | +#BINDIR=. | |
160 | +BINDIR=/usr/sbin | |
161 | ||
162 | $BINDIR/getVGAreg -x CRTC 0 | |
163 | $BINDIR/getVGAreg -x CRTC 1 | |
164 | diff -urN SVGATextMode-1.9-src.orig/debian/README.tips SVGATextMode-1.9-src/debian/README.tips | |
165 | --- SVGATextMode-1.9-src.orig/debian/README.tips Thu Jan 1 01:00:00 1970 | |
166 | +++ SVGATextMode-1.9-src/debian/README.tips Wed Jul 28 22:26:10 1999 | |
167 | @@ -0,0 +1,81 @@ | |
168 | +Various notes on svgatextmode for Debian | |
169 | +----------------------- | |
170 | + | |
171 | +If you experience problems after upgrading to SVGATextMode-1.9, it may be | |
172 | +because some of the modes in your old TextConfig have been invalidated by | |
173 | +new upstream mode checking. Mode lines with Vertical Totals > 1023 are | |
174 | +subject to this. It is recommended that you install the TextConfig file | |
175 | +that came with this package and reapply any custom changes to that. | |
176 | + | |
177 | +It is possible that the offending lines will be taken care of by the | |
178 | +install scripts in a later release ... | |
179 | +( submissions to this end are welcome ;) | |
180 | + | |
181 | +============================================================================ | |
182 | + | |
183 | +SVGATextMode is now started from /etc/init.d/svgatextmode instead of from | |
184 | +rc.boot. This allows it to set default font even if the fonts are located on | |
185 | +a partition that is not mounted early in the boot process. | |
186 | + | |
187 | +10/4/99 - it is now started from rcS.d/S40... which should be after the mount | |
188 | + process. | |
189 | + | |
190 | +============================================================================ | |
191 | + | |
192 | +If you need more resolution, or want to load a different font, then please | |
193 | +customize /etc/TextConfig according to what kind of video card you have. | |
194 | + | |
195 | +/etc/svgamode file is no longer needed, because you can set the default mode | |
196 | +in the /etc/TextConfig file. | |
197 | + | |
198 | +You can restore the screen to 80x25 mode with | |
199 | + | |
200 | +stm 80x25 | |
201 | + | |
202 | +at all times. | |
203 | + | |
204 | +(Does not work with some high level video boards that do have | |
205 | +some problems with the low refresh rates when in native mode!) | |
206 | + | |
207 | +============================================================================ | |
208 | + | |
209 | +If you have installed kbd >=0.92-3, and did not replace TextConfig conffile on | |
210 | +upgrade, you will need to edit it, and change FontPath to | |
211 | +/usr/share/consolefonts . | |
212 | + | |
213 | +============================================================================ | |
214 | + | |
215 | +If your card is buggy, and you get a lot of garbage on your screen after | |
216 | +reboot, add the following line to your /etc/init.d/reboot | |
217 | +test -x /sbin/stm -a -f /etc/svgamode && stm 80x25 || true | |
218 | +This will reset your video card on reboot. | |
219 | + | |
220 | +=========================================================================== | |
221 | + | |
222 | +For some PCI cards, notably Matrox Millenium, it is in some cases | |
223 | +necessary to type 'cat /proc/pci' before using stm. If your card | |
224 | +requires it, you need to add this line to /etc/init.d/svgatextmode, | |
225 | +under 'start)' : | |
226 | + | |
227 | +cat /proc/pci &>/dev/null | |
228 | + | |
229 | +========================================================================== | |
230 | + | |
231 | +If you are having problems with keeping gpm happy after screen resize, make sure | |
232 | +your /usr/sbin/STM_reset has the following command in it: | |
233 | + | |
234 | +if [ -f /var/run/gpm.pid ] | |
235 | +then | |
236 | + echo "Screen resized to $1x$2. Restarting GPM..." | |
237 | + kill -WINCH `cat /var/run/gpm.pid` # gets pid from current gpm daemon | |
238 | + , and send resize signal to it | |
239 | +fi | |
240 | + | |
241 | +Also make sure you have the following uncommented in /etc/TextConfig: | |
242 | + | |
243 | +ResetProg "/usr/sbin/STM_reset" | |
244 | +========================================================================== | |
245 | + | |
246 | +Igor Grobman, <igor@debian.org> | |
247 | + | |
248 | +updated by Ron Lee <ron@debian.org>, Fri, 9 Apr 1999 21:15:51 +0930 |