- Makefile, AUTHORS, man pages merged from stable

AUTHORS

@@ -8,7 +8,7 @@
 
 N: Andrei Pelinescu - Onciul
 C: andrei
-E: pelinescu-onciul@fokus.gmd.de
+E: pelinescu-onciul@fokus.fraunhofer.de
 P: 2CF56A2D   D96D 8B80 BA31 9B93 6208  5D68 3910 FA00 2CF5 6A2D
 D: 
 
@@ -40,6 +40,16 @@ E: [email protected]
 W: http://lohi.eng.song.fi
 D:
 
+N: Maxim Sobolev
+C: sobomax
+E:
+D:
+
+N: Miklos Tirpak
+C: tirpi
+E:
+D:
+
 N: Nils Ohlmeier
 C: calrissian, noh
 E: [email protected]
@@ -47,6 +57,11 @@ W: http://www.ohlmeier.org
 P: BAD6CA40   B5E7 4FB0 800F 0A2C E3E9  4073 C7C3 F275 BAD6 CA40
 D:
 
+N: Ramona-Elena Modroiu
+C: ramona
+E:
+D:
+
 N: Raphael Coeffic
 C: rco
 E: [email protected]

Makefile

@@ -24,6 +24,9 @@
 #               in the cfg (re: /usr/.*lib/ser/modules)
 #              ser.cfg.default is installed only if there is a previous
 #               cfg. -- fixes packages containing ser.cfg.default (andrei)
+#  2003-08-29  install-modules-doc split from install-doc, added 
+#               install-modules-all, removed README.cfg (andrei)
+#              added skip_cfg_install (andrei)
 #
 
 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
 #include  source related defs
 include Makefile.sources
 
+# whether or not to install ser.cfg or just ser.cfg.default
+# (ser.cfg will never be overwritten by make install, this is usefull
+#  when creating packages)
+skip_cfg_install?=
+
 #extra modules to exclude
 skip_modules?=
 
@@ -237,10 +245,11 @@ $(man-prefix)/$(man-dir)/man5:
 # note: on solaris 8 sed: ? or \(...\)* (a.s.o) do not work
 install-cfg: $(cfg-prefix)/$(cfg-dir)
 		sed -e "s#/usr/.*lib/ser/modules/#$(modules-target)#g" \
-			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.default
-		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.default
-		if [ ! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
-			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.default \
+			< etc/ser.cfg > $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
+		chmod 644 $(cfg-prefix)/$(cfg-dir)ser.cfg.sample
+		if [ -z "${skip_cfg_install}" -a \
+				! -f $(cfg-prefix)/$(cfg-dir)ser.cfg ]; then \
+			mv -f $(cfg-prefix)/$(cfg-dir)ser.cfg.sample \
 				$(cfg-prefix)/$(cfg-dir)ser.cfg; \
 		fi
 #		$(INSTALL-CFG) etc/ser.cfg $(cfg-prefix)/$(cfg-dir)
@@ -273,9 +282,10 @@ install-modules: modules $(modules-prefix)/$(modules-dir)
 	done 
 
 
-install-doc: $(doc-prefix)/$(doc-dir)
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README.cfg 
-	$(INSTALL-DOC) README.cfg $(doc-prefix)/$(doc-dir)
+install-modules-all: install-modules install-modules-doc
+
+
+install-doc: $(doc-prefix)/$(doc-dir) install-modules-doc
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/INSTALL 
 	$(INSTALL-DOC) INSTALL $(doc-prefix)/$(doc-dir)
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README-MODULES 
@@ -284,6 +294,11 @@ install-doc: $(doc-prefix)/$(doc-dir)
 	$(INSTALL-DOC) AUTHORS $(doc-prefix)/$(doc-dir)
 	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/NEWS
 	$(INSTALL-DOC) NEWS $(doc-prefix)/$(doc-dir)
+	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
+	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
+
+
+install-modules-doc: $(doc-prefix)/$(doc-dir)
 	-@for r in $(modules_basenames) "" ; do \
 		if [ -n "$$r" ]; then \
 			if [ -f modules/"$$r"/README ]; then \
@@ -295,8 +310,7 @@ install-doc: $(doc-prefix)/$(doc-dir)
 			fi ; \
 		fi ; \
 	done 
-	$(INSTALL-TOUCH) $(doc-prefix)/$(doc-dir)/README 
-	$(INSTALL-DOC) README $(doc-prefix)/$(doc-dir)
+
 
 install-man: $(man-prefix)/$(man-dir)/man8 $(man-prefix)/$(man-dir)/man5
 	$(INSTALL-TOUCH)  $(man-prefix)/$(man-dir)/man8/ser.8 

Makefile.defs

@@ -40,7 +40,7 @@ export makefile_defs
 VERSION = 0
 PATCHLEVEL = 8
 SUBLEVEL =   12
-EXTRAVERSION = dev-t15
+EXTRAVERSION = dev-t16
 
 RELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)
 OS = $(shell uname -s | sed -e s/SunOS/solaris/ | tr "[A-Z]" "[a-z]")

TODO

@@ -2,6 +2,9 @@ $Id$
 
 ( - todo, x - done)
 
+x update AUTHORS, debian/copyright, ser.8, ser.cfg.5 from stable
+x update Makefile*  from stable
+x update all package specs from stable
 - add BUG checks for  fd > 0 && fd <= maxfd to all selects?
 x tcp_main_loop: BUG cases should "conitnue;"
 - change len_gt into and expr (e.g msg:len).
@@ -16,7 +19,7 @@ x port receive.c pre_script_cb fix from stable
        tcp foo.bar:5063, udp foo.bar:5062, foo2.bar
 
 release:
-- print_cseq_num max. size fix.
+x print_cseq_num max. size fix.
 x backport: tcp conn id fix to stable + destroy_tcp 
 x backport: acc mem. leak fixes
 x backport: dns mem. leak fixes (resolve.[ch])

ser.8

@@ -156,17 +156,27 @@ status.
 .SH AUTHORS
 Andrei Pelinescu - Onciul, <[email protected]>
 .br
-Bogdan Andrei Iancu;
+Bogdan Andrei Iancu
 .br
-Daniel-Constantin Mierla;
+Daniel-Constantin Mierla
 .br 
-Jan Janak;
+Jan Janak
 .br
-Jiri Kuthan;
+Jiri Kuthan
 .br
-Nils Ohlmeier;
+Juha Heinanen
 .br
-Ricardo Baratto;
+Maxim Sobolev
+.br
+Miklos Tirpak
+.br
+Nils Ohlmeier
+.br
+Ramona-Elena Modroiu
+.br
+Raphael Coeffic
+.br
+Ricardo Baratto
 .br
 Stelios Sidiroglou-Douskos
 
@@ -175,10 +185,17 @@ Stelios Sidiroglou-Douskos
 .PP
 Full documentation on ser, including configuration guidelines, FAQs and
 licensing conditions, is available at
-http://www.iptel.org/ser/.
+.I http://www.iptel.org/ser/.
 .PP 
-Report bugs at
-.nf
-https://developer.berlios.de/bugs/?func=addbug&group_id=480 .
-.br
-For help/support, write an email to <[email protected]> or <[email protected]>.
+For reporting  bugs see
+.I
+http://www.iptel.org/ser/bugs/.
+.PP
+Mailing lists:
+.nf 
[email protected] - ser user community
+.nf 
[email protected] - ser development, new features and unstable version
+.PP
+For help/support, write an email to <[email protected]>.
+

ser.cfg.5

@@ -20,10 +20,8 @@ or enclosed in
 .B /* ... */
 are interpreted as comments.
 .PP
-This manual page is incomplete. For further information please read
-.I /usr/share/doc/ser/README.cfg
-and
-.I Ser User Guide.
+This manual page is incomplete. For further information please read the
+.I Ser User Guide (http://www.iptel.org/ser/admin.html).
 
 .SH FILES
 .bL
@@ -33,29 +31,46 @@ and
 .SH AUTHORS
 Andrei Pelinescu - Onciul, <[email protected]>
 .br
-Bogdan Andrei Iancu;
+Bogdan Andrei Iancu
 .br
-Daniel-Constantin Mierla;
+Daniel-Constantin Mierla
 .br 
-Jan Janak;
+Jan Janak
 .br
-Jiri Kuthan;
+Jiri Kuthan
 .br
-Nils Ohlmeier;
+Juha Heinanen
 .br
-Ricardo Baratto;
+Maxim Sobolev
+.br
+Miklos Tirpak
+.br
+Nils Ohlmeier
+.br
+Ramona-Elena Modroiu
+.br
+Raphael Coeffic
+.br
+Ricardo Baratto
 .br
 Stelios Sidiroglou-Douskos
 
 .SH SEE ALSO
-.BR ser.cfg(5)
+.BR ser(8)
 .PP
 Full documentation on ser, including configuration guidelines, FAQs and
 licensing conditions, is available at
-http://www.iptel.org/ser/.
+.I http://www.iptel.org/ser/.
+.PP
+For reporting  bugs see
+.I
+http://www.iptel.org/ser/bugs/.
+.PP
+Mailing lists:
+.nf 
[email protected] - ser user community
+.nf 
[email protected] - ser development, new features and unstable version
 .PP
-Report bugs at
-.nf
-https://developer.berlios.de/bugs/?func=addbug&group_id=480 .
 For help/support, write an email to <[email protected]>.