Browse code

- debian update: - switched to debhelper 4.0 - removed uneededi/obsolete files - force nostrip - added some of the examples/* - updated ser.init script (--oknodo from juha) - postinst update (try to run ser, if it fails suggest installing some ser modules; updated adduser) - postrm update (remove ser user, group & home dir)

Andrei Pelinescu-Onciul authored on 27/06/2003 18:34:28
Showing 19 changed files
1 1
deleted file mode 100644
... ...
@@ -1,6 +0,0 @@
1
-ser for Debian
2
-
3
- - experimental version (under construction)
4
-
5
- -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de>, Tue, 16 Jul 2002 15:41:31 +0200
... ...
@@ -1,3 +1,12 @@
1
+ser (0.8.11-pre34) unstable; urgency=low
2
+
3
+  * minor bugfixes
4
+
5
+  * debian packaging changes (debhelper 4.0, init & postinst cleanups, added
6
+    examples, a.s.o)
7
+
8
+ -- Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>  Fri, 27 Jun 2003 15:14:52 +0200
9
+
1 10
 ser (0.8.11-pre30) unstable; urgency=low
2 11
 
3 12
   * minor bugfixes
4 13
new file mode 100644
... ...
@@ -0,0 +1 @@
1
+4
0 2
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-/etc/ser/ser.cfg
2
-/etc/init.d/ser
... ...
@@ -2,14 +2,14 @@ Source: ser
2 2
 Section: net
3 3
 Priority: optional
4 4
 Maintainer: Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.fraunhofer.de>
5
-Build-Depends: debhelper (>> 3.0.0), libmysqlclient-dev, libexpat1-dev, zlib1g-dev, libradius1-dev
5
+Build-Depends: debhelper (>= 4), libmysqlclient-dev, libexpat1-dev, zlib1g-dev, libradius1-dev
6 6
 Standards-Version: 3.5.2
7 7
 
8 8
 Package: ser
9 9
 Architecture: any
10
-Depends: ${shlibs:Depends}
10
+Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
11 11
 Suggests: ser-mysql-module, ser-jabber-module
12
-Conflicts: ser-mysql-module (< ${Source-Version}), ser-jabber-module (< ${Source-Version}), ser-radius-modules (< ${Source-Version})
12
+Conflicts: ser-mysql-module (<< ${Source-Version}), ser-jabber-module (<< ${Source-Version}), ser-radius-modules (<< ${Source-Version})
13 13
 Description: Sip Express Router, very fast and configurable SIP proxy
14 14
  ser or SIP Express Router is a very fast and flexible SIP (RFC3621)
15 15
  proxy server. Written entirely in C, ser can handle thousands calls
... ...
@@ -1,13 +1,18 @@
1
-This package was debianized by Andrei Pelinescu-Onciul <pelinescu-onciul@fokus.gmd.de> on
2
-Tue, 16 Jul 2002 15:41:31 +0200.
1
+This package was debianized by Andrei Pelinescu-Onciul
2
+<pelinescu-onciul@fokus.fraunhofer.de> on Tue, 16 Jul 2002 15:41:31 +0200.
3 3
 
4 4
 It was downloaded from http://iptel.org/ser.
5 5
 
6
-Upstream Authors: Andrei Pelinescu - Onciul <pelinescu-onciul@fokus.gmd.de>, Bogdan Iancu <iancu@fokus.gmd.de>, Daniel-Constantin Mierla, Jan Janak <J.Janak@sh.cvut.cz>, Jiri Kuthan <jiri@iptel.org>, Nils Ohlmeier, Ricardo Baratto, Stelios Sidiroglou-Douskos 
6
+Upstream Authors: Andrei Pelinescu-Onciul
7
+<pelinescu-onciul@fokus.fraunhofer.de>, Bogdan Iancu
8
+<iancu@fokus.fraunhofer.de>, Daniel-Constantin Mierla, Jan Janak
9
+<J.Janak@sh.cvut.cz>, Jiri Kuthan <jiri@iptel.org>, Nils Ohlmeier, Ricardo
10
+Baratto, Stelios Sidiroglou-Douskos  (see AUTHORS file for details)
7 11
 
8 12
 This software is copyright (c) 2002-2003 by Fhg Fokus
9 13
 
10 14
 You are free to distribute this software under the terms of
11 15
 the GNU General Public License.
16
+
12 17
 On Debian systems, the complete text of the GNU General Public
13
-License can be found in the file `/usr/share/common-licenses/GPL�.
18
+License can be found in the file `/usr/share/common-licenses/GPL.
14 19
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-usr/bin
2
-usr/sbin
3 0
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-README
2
-TODO
3 0
deleted file mode 100644
... ...
@@ -1,2 +0,0 @@
1
-ser_0.8.7.16_i386.deb net optional
2
-ser-mysql-module_0.8.7.16_i386.deb net optional
... ...
@@ -26,7 +26,9 @@ set -e
26 26
 
27 27
 case "$1" in
28 28
     configure)
29
-        adduser --system --group --home /var/run/ser ser
29
+        adduser --quiet --system --group --disabled-password \
30
+                --shell /bin/false --gecos "SIP Express Router" \
31
+                --home /var/run/ser ser || true
30 32
 
31 33
     ;;
32 34
 
... ...
@@ -42,12 +44,33 @@ esac
42 44
 
43 45
 # # dh_installdeb will replace this with shell code automatically
44 46
 # # generated by other debhelper scripts.
47
+# deb_helper is not used here to avoid automatically starting ser after
48
+# the installation (dh_installinit 4.0 , from woody does not support
49
+# --nostart, if you're using a newer version is safe to comment out the 
50
+# rest of the code and add again deb_helper)
45 51
 
46
-# #DEBHELPER#
47
-echo ""
48
-echo "Next install any additional ser modules and then (re)start ser"
49
-echo "by executing command '/etc/init.d/ser start|restart'."
50
-
52
+# this will be added automatically by dh_installdocs if deb_helper is 
53
+# "enabled"
54
+if [ "$1" = "configure" ]; then
55
+	if [ -d /usr/doc -a ! -e /usr/doc/ser -a -d /usr/share/doc/ser ]; then
56
+		ln -sf ../share/doc/ser /usr/doc/ser
57
+	fi
58
+fi
59
+# end dh_installdocs section
60
+# this will be automativally added by dh_installinit if deb_helper is
61
+# "enabled
62
+if [ -x "/etc/init.d/ser" ]; then
63
+	 update-rc.d ser defaults 23 >/dev/null
64
+	 if ! invoke-rc.d ser restart ; then
65
+		echo ""
66
+		echo "ser failed to (re)start. Perhaps your configuration requires "
67
+		echo "additional modules (e.g. ser-mysql-module, ser-jabber-module "
68
+		echo "or ser-radius-modules). Next try to install any additional ser"
69
+		echo "modules you might need and then (re)start ser by executing "
70
+		echo "the command '/etc/init.d/ser start|restart'."
71
+	fi
72
+fi
73
+# end dh_installinit section
51 74
 
52 75
 exit 0
53 76
 
... ...
@@ -29,9 +29,17 @@ case "$1" in
29 29
 
30 30
 esac
31 31
 
32
+
32 33
 # dh_installdeb will replace this with shell code automatically
33 34
 # generated by other debhelper scripts.
34 35
 
35 36
 #DEBHELPER#
36 37
 
38
+if [ "$1" = "purge" ] ; then
39
+# remove user/group on purge
40
+	deluser --quiet --remove-home ser &>/dev/null || true
41
+# remove /etc/ser if empty
42
+	rmdir /etc/ser || true
43
+fi
44
+
37 45
 exit 0
... ...
@@ -8,13 +8,18 @@
8 8
 # --------
9 9
 #  2003-05-30  updated for the 0.8.11 release, changed modules list and
10 10
 #              some ser make options (andrei)
11
+#  2003-06-27  changed to DH_COMPAT 4 (debian/compat) + other filenames
12
+#              & small fixes (andrei)
11 13
 
12 14
 
13 15
 # Uncomment this to turn on verbose mode.
14 16
 #export DH_VERBOSE=1
15 17
 
16 18
 # This is the debhelper compatibility version to use.
17
-export DH_COMPAT=3
19
+# export DH_COMPAT=4
20
+#  -- already set in compat
21
+#  force no striping (always include debug symbols for now)
22
+export DEB_BUILD_OPTIONS:="$(DEB_BUILD_OPTIONS) nostrip"
18 23
 
19 24
 # modules not in the "main" package or unstable 
20 25
 EXCLUDED_MODULES=	mysql jabber auth_radius group_radius uri_radius \
... ...
@@ -126,7 +131,7 @@ binary-common:
126 131
 #	dh_installemacsen
127 132
 #	dh_installpam
128 133
 #	dh_installmime
129
-	dh_installinit --init-script=ser -- defaults 23
134
+	dh_installinit  -- defaults 23
130 135
 	dh_installcron
131 136
 	dh_installman
132 137
 	dh_installinfo
... ...
@@ -134,7 +139,7 @@ binary-common:
134 139
 	dh_installchangelogs 
135 140
 	dh_link
136 141
 	dh_strip
137
-	dh_compress
142
+	dh_compress 
138 143
 	dh_fixperms
139 144
 #	dh_makeshlibs
140 145
 	dh_installdeb
141 146
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-usr/lib/ser/modules
2 0
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-usr/lib/ser/modules/mysql.so
2 0
new file mode 100644
... ...
@@ -0,0 +1,13 @@
1
+examples/acc.cfg
2
+examples/ccdiversion.cfg
3
+examples/ctd.sh
4
+examples/exec.cfg
5
+examples/logging.cfg
6
+examples/msilo.cfg
7
+examples/onr.cfg
8
+examples/pstn.cfg
9
+examples/redirect.cfg
10
+examples/replicate.cfg
11
+examples/serial_183.cfg
12
+examples/uas.cfg
13
+examples/welcome.cfg
0 14
similarity index 97%
1 15
rename from debian/init.d
2 16
rename to debian/ser.init
... ...
@@ -56,7 +56,7 @@ case "$1" in
56 56
 	#	just the same as "restart".
57 57
 	#
58 58
 	echo -n "Restarting $DESC: $NAME"
59
-	start-stop-daemon --stop --quiet --pidfile \
59
+	start-stop-daemon --oknodo --stop --quiet --pidfile \
60 60
 		$PIDFILE --exec $DAEMON
61 61
 	sleep 1
62 62
 	start-stop-daemon --start --quiet --pidfile \
63 63
deleted file mode 100644
... ...
@@ -1,7 +0,0 @@
1
-# Automatically added by dh_installdocs
2
-if [ "$1" = "configure" ]; then
3
-	if [ -d /usr/doc -a ! -e /usr/doc/ser -a -d /usr/share/doc/ser ]; then
4
-		ln -sf ../share/doc/ser /usr/doc/ser
5
-	fi
6
-fi
7
-# End automatically added section
8 0
deleted file mode 100644
... ...
@@ -1,5 +0,0 @@
1
-# Automatically added by dh_installdocs
2
-if [ \( "$1" = "upgrade" -o "$1" = "remove" \) -a -L /usr/doc/ser ]; then
3
-	rm -f /usr/doc/ser
4
-fi
5
-# End automatically added section
6 0
deleted file mode 100644
... ...
@@ -1 +0,0 @@
1
-shlibs:Depends=libc6 (>= 2.2.5-13)