Browse code

- Makefile, AUTHORS, man pages merged from stable

Andrei Pelinescu-Onciul authored on 03/09/2003 15:03:22
Showing 6 changed files
... ...
@@ -8,7 +8,7 @@
8 8
 
9 9
 N: Andrei Pelinescu - Onciul
10 10
 C: andrei
11
-E: pelinescu-onciul@fokus.gmd.de
11
+E: pelinescu-onciul@fokus.fraunhofer.de
12 12
 P: 2CF56A2D   D96D 8B80 BA31 9B93 6208  5D68 3910 FA00 2CF5 6A2D
13 13
 D: 
14 14
 
... ...
@@ -40,6 +40,16 @@ E: jh@song.fi
40 40
 W: http://lohi.eng.song.fi
41 41
 D:
42 42
 
43
+N: Maxim Sobolev
44
+C: sobomax
45
+E:
46
+D:
47
+
48
+N: Miklos Tirpak
49
+C: tirpi
50
+E:
51
+D:
52
+
43 53
 N: Nils Ohlmeier
44 54
 C: calrissian, noh
45 55
 E: nils@iptel.org
... ...
@@ -47,6 +57,11 @@ W: http://www.ohlmeier.org
47 47
 P: BAD6CA40   B5E7 4FB0 800F 0A2C E3E9  4073 C7C3 F275 BAD6 CA40
48 48
 D:
49 49
 
50
+N: Ramona-Elena Modroiu
51
+C: ramona
52
+E:
53
+D:
54
+
50 55
 N: Raphael Coeffic
51 56
 C: rco
52 57
 E: raphael.coeffic@gmx.de
... ...
@@ -24,6 +24,9 @@
24 24
 #               in the cfg (re: /usr/.*lib/ser/modules)
25 25
 #              ser.cfg.default is installed only if there is a previous
26 26
 #               cfg. -- fixes packages containing ser.cfg.default (andrei)
27
+#  2003-08-29  install-modules-doc split from install-doc, added 
28
+#               install-modules-all, removed README.cfg (andrei)
29
+#              added skip_cfg_install (andrei)
27 30
 #
28 31
 
29 32
 auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
... ...
@@ -31,6 +34,11 @@ auto_gen=lex.yy.c cfg.tab.c   #lexx, yacc etc
31 31
 #include  source related defs
32 32
 include Makefile.sources
33 33
 
34
+# whether or not to install ser.cfg or just ser.cfg.default
35
+# (ser.cfg will never be overwritten by make install, this is usefull
36
+#  when creating packages)
37
+skip_cfg_install?=
38
+
34 39
 #extra modules to exclude
35 40
 skip_modules?=
36 41
 
... ...
@@ -237,10 +245,11 @@ $(man-prefix)/$(man-dir)/man5:
237 237
 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
238 238
 install-cfg: $(cfg-prefix)/$(cfg-dir)
239 239
 		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
240
-			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.default
241
-		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.default
242
-		if [ ! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
243
-			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.default \
240
+			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
241
+		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
242
+		if [ -z "${skip_cfg_install}" -a \
243
+				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
244
+			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
244 245
 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
245 246
 		fi
246 247
 #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
... ...
@@ -273,9 +282,10 @@ install-modules: modules $(modules-prefix)/$(modules-dir)
273 273
 	done 
274 274
 
275 275
 
276
-install-doc: $(doc-prefix)/$(doc-dir)
277
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README.cfg 
278
-	$(INSTALL-DOC) README.cfg $(doc-prefix)/$(doc-dir)
276
+install-modules-all: install-modules install-modules-doc
277
+
278
+
279
+install-doc: $(doc-prefix)/$(doc-dir) install-modules-doc
279 280
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/INSTALL 
280 281
 	$(INSTALL-DOC) INSTALL $(doc-prefix)/$(doc-dir)
281 282
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README-MODULES 
... ...
@@ -284,6 +294,11 @@ install-doc: $(doc-prefix)/$(doc-dir)
284 284
 	$(INSTALL-DOC) AUTHORS $(doc-prefix)/$(doc-dir)
285 285
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/NEWS
286 286
 	$(INSTALL-DOC) NEWS $(doc-prefix)/$(doc-dir)
287
+	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
288
+	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
289
+
290
+
291
+install-modules-doc: $(doc-prefix)/$(doc-dir)
287 292
 	-@for r in $(modules_basenames) "" ; do \
288 293
 		if [ -n "$$r" ]; then \
289 294
 			if [ -f modules/"$$r"/README ]; then \
... ...
@@ -295,8 +310,7 @@ install-doc: $(doc-prefix)/$(doc-dir)
295 295
 			fi ; \
296 296
 		fi ; \
297 297
 	done 
298
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
299
-	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
298
+
300 299
 
301 300
 install-man: $(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
302 301
 	$(INSTALL-TOUCH)  $(man-prefix)/$(man-dir)/man8/ser.8 
... ...
@@ -40,7 +40,7 @@ export makefile_defs
40 40
 VERSION = 0
41 41
 PATCHLEVEL = 8
42 42
 SUBLEVEL =   12
43
-EXTRAVERSION = dev-t15
43
+EXTRAVERSION = dev-t16
44 44
 
45 45
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
46 46
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")
... ...
@@ -2,6 +2,9 @@ $Id$
2 2
 
3 3
 ( - todo, x - done)
4 4
 
5
+x update AUTHORS, debian/copyright, ser.8, ser.cfg.5 from stable
6
+x update Makefile*  from stable
7
+x update all package specs from stable
5 8
 - add BUG checks for  fd > 0 && fd <= maxfd to all selects?
6 9
 x tcp_main_loop: BUG cases should "conitnue;"
7 10
 - change len_gt into and expr (e.g msg:len).
... ...
@@ -16,7 +19,7 @@ x port receive.c pre_script_cb fix from stable
16 16
        tcp foo.bar:5063, udp foo.bar:5062, foo2.bar
17 17
 
18 18
 release:
19
-- print_cseq_num max. size fix.
19
+x print_cseq_num max. size fix.
20 20
 x backport: tcp conn id fix to stable + destroy_tcp 
21 21
 x backport: acc mem. leak fixes
22 22
 x backport: dns mem. leak fixes (resolve.[ch])
... ...
@@ -156,17 +156,27 @@ status.
156 156
 .SH AUTHORS
157 157
 Andrei Pelinescu - Onciul, <pelinescu-onciul@fokus.gmd.de>
158 158
 .br
159
-Bogdan Andrei Iancu;
159
+Bogdan Andrei Iancu
160 160
 .br
161
-Daniel-Constantin Mierla;
161
+Daniel-Constantin Mierla
162 162
 .br 
163
-Jan Janak;
163
+Jan Janak
164 164
 .br
165
-Jiri Kuthan;
165
+Jiri Kuthan
166 166
 .br
167
-Nils Ohlmeier;
167
+Juha Heinanen
168 168
 .br
169
-Ricardo Baratto;
169
+Maxim Sobolev
170
+.br
171
+Miklos Tirpak
172
+.br
173
+Nils Ohlmeier
174
+.br
175
+Ramona-Elena Modroiu
176
+.br
177
+Raphael Coeffic
178
+.br
179
+Ricardo Baratto
170 180
 .br
171 181
 Stelios Sidiroglou-Douskos
172 182
 
... ...
@@ -175,10 +185,17 @@ Stelios Sidiroglou-Douskos
175 175
 .PP
176 176
 Full documentation on ser, including configuration guidelines, FAQs and
177 177
 licensing conditions, is available at
178
-http://www.iptel.org/ser/.
178
+.I http://www.iptel.org/ser/.
179 179
 .PP 
180
-Report bugs at
181
-.nf
182
-https://developer.berlios.de/bugs/?func=addbug&group_id=480 .
183
-.br
184
-For help/support, write an email to <serhelp@iptel.org> or <seruser@iptel.org>.
180
+For reporting  bugs see
181
+.I
182
+http://www.iptel.org/ser/bugs/.
183
+.PP
184
+Mailing lists:
185
+.nf 
186
+serusers@iptel.org - ser user community
187
+.nf 
188
+serdev@iptel.org - ser development, new features and unstable version
189
+.PP
190
+For help/support, write an email to <serhelp@iptel.org>.
191
+
... ...
@@ -20,10 +20,8 @@ or enclosed in
20 20
 .B /* ... */
21 21
 are interpreted as comments.
22 22
 .PP
23
-This manual page is incomplete. For further information please read
24
-.I /usr/share/doc/ser/README.cfg
25
-and
26
-.I Ser User Guide.
23
+This manual page is incomplete. For further information please read the
24
+.I Ser User Guide (http://www.iptel.org/ser/admin.html).
27 25
 
28 26
 .SH FILES
29 27
 .bL
... ...
@@ -33,29 +31,46 @@ and
33 33
 .SH AUTHORS
34 34
 Andrei Pelinescu - Onciul, <pelinescu-onciul@fokus.gmd.de>
35 35
 .br
36
-Bogdan Andrei Iancu;
36
+Bogdan Andrei Iancu
37 37
 .br
38
-Daniel-Constantin Mierla;
38
+Daniel-Constantin Mierla
39 39
 .br 
40
-Jan Janak;
40
+Jan Janak
41 41
 .br
42
-Jiri Kuthan;
42
+Jiri Kuthan
43 43
 .br
44
-Nils Ohlmeier;
44
+Juha Heinanen
45 45
 .br
46
-Ricardo Baratto;
46
+Maxim Sobolev
47
+.br
48
+Miklos Tirpak
49
+.br
50
+Nils Ohlmeier
51
+.br
52
+Ramona-Elena Modroiu
53
+.br
54
+Raphael Coeffic
55
+.br
56
+Ricardo Baratto
47 57
 .br
48 58
 Stelios Sidiroglou-Douskos
49 59
 
50 60
 .SH SEE ALSO
51
-.BR ser.cfg(5)
61
+.BR ser(8)
52 62
 .PP
53 63
 Full documentation on ser, including configuration guidelines, FAQs and
54 64
 licensing conditions, is available at
55
-http://www.iptel.org/ser/.
65
+.I http://www.iptel.org/ser/.
66
+.PP
67
+For reporting  bugs see
68
+.I
69
+http://www.iptel.org/ser/bugs/.
70
+.PP
71
+Mailing lists:
72
+.nf 
73
+serusers@iptel.org - ser user community
74
+.nf 
75
+serdev@iptel.org - ser development, new features and unstable version
56 76
 .PP
57
-Report bugs at
58
-.nf
59
-https://developer.berlios.de/bugs/?func=addbug&group_id=480 .
60 77
 For help/support, write an email to <serhelp@iptel.org>.
61 78