Browse code

pkg/kamailio/deb: integrate xenial libgeocoding change [skip ci] in backports/xenial script

* add wrap-and-sort on all scripts

Victor Seva authored on 11/12/2017 08:25:21
Showing 13 changed files
... ...
@@ -18,6 +18,8 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \
18 18
 sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
19 19
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
20 20
 
21
+wrap-and-sort -sat -d ${DIST}
22
+
21 23
 # clean backports scripts
22 24
 rm -rf ${DIST}/backports
23 25
 exit 0
... ...
@@ -39,6 +39,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/
39 39
 sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules
40 40
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules
41 41
 
42
+wrap-and-sort -sat -d ${DIST}
43
+
42 44
 # clean backports scripts
43 45
 rm -rf ${DIST}/backports
44 46
 exit 0
... ...
@@ -76,6 +76,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/
76 76
 sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules
77 77
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules
78 78
 
79
+wrap-and-sort -sat -d ${DIST}
80
+
79 81
 # clean backports scripts
80 82
 rm -rf ${DIST}/backports
81 83
 exit 0
... ...
@@ -18,6 +18,8 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \
18 18
 sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
19 19
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
20 20
 
21
+wrap-and-sort -sat -d ${DIST}
22
+
21 23
 # clean backports scripts
22 24
 rm -rf ${DIST}/backports
23 25
 exit 0
... ...
@@ -18,6 +18,8 @@ sed -i -e '/libval-dev/d' -e '/^Package: kamailio-dnssec-modules/,/^$/d' \
18 18
 sed -i -e 's/ dnssec[ ,$]*/ /' ${DIST}/rules
19 19
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ dnssec/' ${DIST}/rules
20 20
 
21
+wrap-and-sort -sat -d ${DIST}
22
+
21 23
 # clean backports scripts
22 24
 rm -rf ${DIST}/backports
23 25
 exit 0
... ...
@@ -50,6 +50,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/
50 50
 sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules
51 51
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules
52 52
 
53
+wrap-and-sort -sat -d ${DIST}
54
+
53 55
 # clean backports scripts
54 56
 rm -rf ${DIST}/backports
55 57
 exit 0
... ...
@@ -76,6 +76,8 @@ sed -i -e '/libphonenumber-dev/d' -e '/^Package: kamailio-phonenum-modules/,/^$/
76 76
 sed -i -e 's/ phonenum[ ,$]*/ /' ${DIST}/rules
77 77
 sed -i -e '/^EXTRA_EXCLUDED_MODULES=/s/$/ phonenum/' ${DIST}/rules
78 78
 
79
+wrap-and-sort -sat -d ${DIST}
80
+
79 81
 # clean backports scripts
80 82
 rm -rf ${DIST}/backports
81 83
 exit 0
... ...
@@ -20,6 +20,12 @@ echo "kamailio-mysql-modules: depends-on-obsolete-package depends: mysql-client
20 20
 # no libssl-dev
21 21
 sed -i -e '/libssl-dev/d' ${DIST}/control
22 22
 
23
+# geocoding not in libphonenumber
24
+sed -i 's/libphonenumber-dev/libgeocoding-dev \(>= 7\),\n libphonenumber-dev/' \
25
+	${DIST}/control
26
+
27
+wrap-and-sort -sat -d ${DIST}
28
+
23 29
 # clean backports scripts
24 30
 rm -rf ${DIST}/backports
25 31
 exit 0
... ...
@@ -8,7 +8,6 @@ Uploaders:
8 8
 Build-Depends:
9 9
  bison,
10 10
  debhelper (>= 9),
11
- libmysqlclient-dev,
12 11
  dh-systemd (>= 1.5),
13 12
  docbook-xml,
14 13
  dpkg-dev (>= 1.16.1.1),
... ...
@@ -21,6 +20,7 @@ Build-Depends:
21 20
  libev-dev,
22 21
  libevent-dev,
23 22
  libexpat1-dev,
23
+ libfreeradius-client-dev,
24 24
  libgeoip-dev (>= 1.4.5),
25 25
  libhiredis-dev (>= 0.10.0),
26 26
  libjansson-dev,
... ...
@@ -29,12 +29,12 @@ Build-Depends:
29 29
  liblua5.1-0-dev,
30 30
  libmemcached-dev,
31 31
  libmono-2.0-dev,
32
+ libmysqlclient-dev,
32 33
  libncurses5-dev,
33 34
  libpcre3-dev,
34 35
  libperl-dev,
35 36
  libpq-dev,
36 37
  librabbitmq-dev,
37
- libfreeradius-client-dev,
38 38
  libreadline-dev,
39 39
  libsasl2-dev,
40 40
  libsctp-dev,
... ...
@@ -275,8 +275,8 @@ Multi-Arch: same
275 275
 Pre-Depends:
276 276
  ${misc:Pre-Depends},
277 277
 Depends:
278
- mysql-client | virtual-mysql-client,
279 278
  kamailio (= ${binary:Version}),
279
+ mysql-client | virtual-mysql-client,
280 280
  ${misc:Depends},
281 281
  ${shlibs:Depends},
282 282
 Description: MySQL database connectivity module for Kamailio
... ...
@@ -8,7 +8,6 @@ Uploaders:
8 8
 Build-Depends:
9 9
  bison,
10 10
  debhelper (>= 9),
11
- libmysqlclient-dev,
12 11
  docbook-xml,
13 12
  dpkg-dev (>= 1.16.1.1),
14 13
  erlang-dev,
... ...
@@ -28,6 +27,7 @@ Build-Depends:
28 27
  liblua5.1-0-dev,
29 28
  libmemcached-dev,
30 29
  libmono-2.0-dev,
30
+ libmysqlclient-dev,
31 31
  libncurses5-dev,
32 32
  libpcre3-dev,
33 33
  libperl-dev,
... ...
@@ -271,8 +271,8 @@ Multi-Arch: same
271 271
 Pre-Depends:
272 272
  ${misc:Pre-Depends},
273 273
 Depends:
274
- mysql-client | virtual-mysql-client,
275 274
  kamailio (= ${binary:Version}),
275
+ mysql-client | virtual-mysql-client,
276 276
  ${misc:Depends},
277 277
  ${shlibs:Depends},
278 278
 Description: MySQL database connectivity module for Kamailio
... ...
@@ -8,7 +8,6 @@ Uploaders:
8 8
 Build-Depends:
9 9
  bison,
10 10
  debhelper (>= 9),
11
- libmysqlclient-dev,
12 11
  docbook-xml,
13 12
  dpkg-dev (>= 1.16.1.1),
14 13
  erlang-dev,
... ...
@@ -20,6 +19,7 @@ Build-Depends:
20 19
  libev-dev,
21 20
  libevent-dev,
22 21
  libexpat1-dev,
22
+ libfreeradius-client-dev,
23 23
  libgeoip-dev (>= 1.4.5),
24 24
  libhiredis-dev (>= 0.10.0),
25 25
  libjansson-dev,
... ...
@@ -28,12 +28,12 @@ Build-Depends:
28 28
  liblua5.1-0-dev,
29 29
  libmemcached-dev,
30 30
  libmono-2.0-dev,
31
+ libmysqlclient-dev,
31 32
  libncurses5-dev,
32 33
  libpcre3-dev,
33 34
  libperl-dev,
34 35
  libpq-dev,
35 36
  librabbitmq-dev,
36
- libfreeradius-client-dev,
37 37
  libreadline-dev,
38 38
  libsasl2-dev,
39 39
  libsctp-dev,
... ...
@@ -273,8 +273,8 @@ Multi-Arch: same
273 273
 Pre-Depends:
274 274
  ${misc:Pre-Depends},
275 275
 Depends:
276
- mysql-client | virtual-mysql-client,
277 276
  kamailio (= ${binary:Version}),
277
+ mysql-client | virtual-mysql-client,
278 278
  ${misc:Depends},
279 279
  ${shlibs:Depends},
280 280
 Description: MySQL database connectivity module for Kamailio
... ...
@@ -8,7 +8,6 @@ Uploaders:
8 8
 Build-Depends:
9 9
  bison,
10 10
  debhelper (>= 9),
11
- libmysqlclient-dev,
12 11
  docbook-xml,
13 12
  dpkg-dev (>= 1.16.1.1),
14 13
  erlang-dev,
... ...
@@ -28,6 +27,7 @@ Build-Depends:
28 27
  liblua5.1-0-dev,
29 28
  libmemcached-dev,
30 29
  libmono-2.0-dev,
30
+ libmysqlclient-dev,
31 31
  libncurses5-dev,
32 32
  libpcre3-dev,
33 33
  libperl-dev,
... ...
@@ -271,8 +271,8 @@ Multi-Arch: same
271 271
 Pre-Depends:
272 272
  ${misc:Pre-Depends},
273 273
 Depends:
274
- mysql-client | virtual-mysql-client,
275 274
  kamailio (= ${binary:Version}),
275
+ mysql-client | virtual-mysql-client,
276 276
  ${misc:Depends},
277 277
  ${shlibs:Depends},
278 278
 Description: MySQL database connectivity module for Kamailio
... ...
@@ -8,7 +8,6 @@ Uploaders:
8 8
 Build-Depends:
9 9
  bison,
10 10
  debhelper (>= 9),
11
- libmysqlclient-dev,
12 11
  dh-systemd (>= 1.5),
13 12
  docbook-xml,
14 13
  dpkg-dev (>= 1.16.1.1),
... ...
@@ -31,6 +30,7 @@ Build-Depends:
31 30
  libmaxminddb-dev,
32 31
  libmemcached-dev,
33 32
  libmono-2.0-dev,
33
+ libmysqlclient-dev,
34 34
  libncurses5-dev,
35 35
  libpcre3-dev,
36 36
  libperl-dev,
... ...
@@ -297,8 +297,8 @@ Multi-Arch: same
297 297
 Pre-Depends:
298 298
  ${misc:Pre-Depends},
299 299
 Depends:
300
- mysql-client | virtual-mysql-client,
301 300
  kamailio (= ${binary:Version}),
301
+ mysql-client | virtual-mysql-client,
302 302
  ${misc:Depends},
303 303
  ${shlibs:Depends},
304 304
 Description: MySQL database connectivity module for Kamailio