diff --git a/debian/compat b/debian/compat index 7ed6ff82d..ec635144f 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -5 +9 diff --git a/debian/control b/debian/control index ad42acc8b..be3e7c29f 100644 --- a/debian/control +++ b/debian/control @@ -2,72 +2,87 @@ Source: ngcp-rtpengine Section: net Priority: extra Maintainer: Sipwise Development Team -Build-Depends: debhelper (>= 5), - iptables-dev (>= 1.4), - libavcodec-dev (>= 6:10), - libavfilter-dev (>= 6:10), - libavformat-dev (>= 6:10), - libavresample-dev (>= 6:10), - libavutil-dev (>= 6:10), - libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl3-openssl-dev | libcurl3-gnutls-dev, - libevent-dev (>= 2.0), - libglib2.0-dev (>= 2.30), - libhiredis-dev, - libjson-glib-dev, - libpcap0.8-dev | libpcap-dev, - libpcre3-dev, - libssl-dev (>= 1.0.1), - libxmlrpc-c3-dev (>= 1.16.07) | libxmlrpc-core-c3-dev (>= 1.16.07), - markdown, - zlib1g-dev +Build-Depends: + debhelper (>= 9~), + iptables-dev (>= 1.4), + libavcodec-dev (>= 6:10), + libavfilter-dev (>= 6:10), + libavformat-dev (>= 6:10), + libavresample-dev (>= 6:10), + libavutil-dev (>= 6:10), + libcurl4-openssl-dev | libcurl4-gnutls-dev | libcurl3-openssl-dev | libcurl3-gnutls-dev, + libevent-dev (>= 2.0), + libglib2.0-dev (>= 2.30), + libhiredis-dev, + libjson-glib-dev, + libpcap0.8-dev | libpcap-dev, + libpcre3-dev, + libssl-dev (>= 1.0.1), + libxmlrpc-c3-dev (>= 1.16.07) | libxmlrpc-core-c3-dev (>= 1.16.07), + markdown, + zlib1g-dev, Standards-Version: 3.9.7 Homepage: http://sipwise.com/ Package: ngcp-rtpengine-daemon Architecture: any -Recommends: ngcp-rtpengine-recording-daemon, - ngcp-rtpengine-utils -Suggests: ngcp-system-tools -Depends: lsb-base (>= 3.0-6), - ${misc:Depends}, - ${shlibs:Depends} -Conflicts: ngcp-mediaproxy-ng-daemon, - ngcp-rtpengine-redis1 -Replaces: ngcp-mediaproxy-ng-daemon, - ngcp-rtpengine-redis1 +Recommends: + ngcp-rtpengine-recording-daemon, + ngcp-rtpengine-utils, +Suggests: + ngcp-system-tools, +Depends: + lsb-base (>= 3.0-6), + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + ngcp-mediaproxy-ng-daemon, + ngcp-rtpengine-redis1, +Replaces: + ngcp-mediaproxy-ng-daemon, + ngcp-rtpengine-redis1, Description: Proxy for RTP and media streams used in NGCP, userspace part. This daemon handles the first stages of proxying media streams and talks to the kernel part of the proxy for eventual high-performance packet forwarding. Package: ngcp-rtpengine-recording-daemon Architecture: any -Recommends: ngcp-rtpengine-utils -Suggests: ngcp-system-tools -Depends: lsb-base (>= 3.0-6), - nfs-common, - ${misc:Depends}, - ${shlibs:Depends} +Recommends: + ngcp-rtpengine-utils, +Suggests: + ngcp-system-tools, +Depends: + lsb-base (>= 3.0-6), + nfs-common, + ${misc:Depends}, + ${shlibs:Depends}, Description: Recording daemon for RTP and media streams This daemon handles the call recording (media intercept) component of rtpengine. Package: ngcp-rtpengine-iptables Architecture: any -Depends: ${misc:Depends}, - ${shlibs:Depends} -Conflicts: ngcp-mediaproxy-ng-iptables -Replaces: ngcp-mediaproxy-ng-iptables +Depends: + ${misc:Depends}, + ${shlibs:Depends}, +Conflicts: + ngcp-mediaproxy-ng-iptables, +Replaces: + ngcp-mediaproxy-ng-iptables, Description: IPtables extension module for the kernel-space NGCP media proxy. Provides the IPtables extension needed to configure the mediaproxy rule. Package: ngcp-rtpengine Architecture: all -Depends: ngcp-rtpengine-daemon (>= ${source:Version}), - ngcp-rtpengine-iptables (>= ${source:Version}), - ngcp-rtpengine-kernel-dkms (>= ${source:Version}), - ngcp-rtpengine-recording-daemon (>= ${source:Version}), - ngcp-rtpengine-utils (>= ${source:Version}) -Conflicts: ngcp-mediaproxy-ng -Replaces: ngcp-mediaproxy-ng +Depends: + ngcp-rtpengine-daemon (>= ${source:Version}), + ngcp-rtpengine-iptables (>= ${source:Version}), + ngcp-rtpengine-kernel-dkms (>= ${source:Version}), + ngcp-rtpengine-recording-daemon (>= ${source:Version}), + ngcp-rtpengine-utils (>= ${source:Version}), +Conflicts: + ngcp-mediaproxy-ng, +Replaces: + ngcp-mediaproxy-ng, Description: NGCP RTP/media proxy - meta package. This is a meta package for easy installation of all four parts of the NGCP media proxy. It will install the user-space daemon, the kernel-space IPtables @@ -75,11 +90,14 @@ Description: NGCP RTP/media proxy - meta package. Package: ngcp-rtpengine-kernel-source Architecture: all -Depends: debhelper (>= 5), - module-assistant, - ${misc:Depends} -Conflicts: ngcp-mediaproxy-ng-kernel-source -Replaces: ngcp-mediaproxy-ng-kernel-source +Depends: + debhelper (>= 5), + module-assistant, + ${misc:Depends}, +Conflicts: + ngcp-mediaproxy-ng-kernel-source, +Replaces: + ngcp-mediaproxy-ng-kernel-source, Description: IPtables kernel module for the NGCP media proxy - source. Provides the kernel-space part of the NGCP media proxy for high- performance packet forwarding. @@ -88,11 +106,15 @@ Description: IPtables kernel module for the NGCP media proxy - source. Package: ngcp-rtpengine-kernel-dkms Architecture: all -Suggests: ngcp-system-tools -Depends: dkms (>= 1.95), - ${misc:Depends} -Conflicts: ngcp-mediaproxy-ng-kernel-dkms -Replaces: ngcp-mediaproxy-ng-kernel-dkms +Suggests: + ngcp-system-tools, +Depends: + dkms (>= 1.95), + ${misc:Depends}, +Conflicts: + ngcp-mediaproxy-ng-kernel-dkms, +Replaces: + ngcp-mediaproxy-ng-kernel-dkms, Description: IPtables kernel module for the NGCP media proxy - DKMS. Provides the kernel-space part of the NGCP media proxy for high- performance packet forwarding. @@ -101,11 +123,14 @@ Description: IPtables kernel module for the NGCP media proxy - DKMS. Package: ngcp-rtpengine-dbg Architecture: any Section: debug -Depends: ngcp-rtpengine-daemon (= ${binary:Version}), - ngcp-rtpengine-iptables (= ${binary:Version}), - ${misc:Depends} -Conflicts: ngcp-mediaproxy-ng-dbg -Replaces: ngcp-mediaproxy-ng-dbg +Depends: + ngcp-rtpengine-daemon (= ${binary:Version}), + ngcp-rtpengine-iptables (= ${binary:Version}), + ${misc:Depends}, +Conflicts: + ngcp-mediaproxy-ng-dbg, +Replaces: + ngcp-mediaproxy-ng-dbg, Description: debugging symbols for ngcp-rtpengine The ngcp-rtpengine daemon handles the first stages of proxying media streams and talks to the kernel part of the proxy for eventual high-performance packet forwarding. @@ -118,12 +143,13 @@ Description: debugging symbols for ngcp-rtpengine Package: ngcp-rtpengine-utils Architecture: all -Depends: libbencode-perl, - libcrypt-rijndael-perl, - libdigest-hmac-perl, - libio-socket-inet6-perl, - libio-socket-ip-perl, - libsocket6-perl, - netcat-openbsd | netcat +Depends: + libbencode-perl, + libcrypt-rijndael-perl, + libdigest-hmac-perl, + libio-socket-inet6-perl, + libio-socket-ip-perl, + libsocket6-perl, + netcat-openbsd | netcat, Description: Scripts and Perl modules for NGCP rtpengine This package contains scripts and Perl modules for NGCP rtpengine diff --git a/debian/control.modules.in b/debian/control.modules.in index a69488ef5..eb72f412a 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -2,14 +2,17 @@ Source: ngcp-rtpengine Section: kernel Priority: optional Maintainer: Sipwise Development Team -Build-Depends: debhelper (>= 5) +Build-Depends: + debhelper (>= 5), Standards-Version: 3.9.7 Homepage: http://sipwise.com/ Package: ngcp-rtpengine-kernel-modules-_KVERS_ Architecture: any -Depends: linux-modules-_KVERS_ | linux-image-_KVERS_ -Provides: ngcp-rtpengine-kernel +Depends: + linux-modules-_KVERS_ | linux-image-_KVERS_, +Provides: + ngcp-rtpengine-kernel, Description: IPtables kernel module for the NGCP media proxy This package provides the ngcp-rtpengine module for the Linux kernel version _KVERS_. diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 1c63c5155..000000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/sbin -etc/rtpengine diff --git a/debian/ngcp-rtpengine.docs b/debian/ngcp-rtpengine.docs new file mode 100644 index 000000000..cf64a22d1 --- /dev/null +++ b/debian/ngcp-rtpengine.docs @@ -0,0 +1,2 @@ +debian/README.md.gz +debian/README.html.gz diff --git a/debian/rules b/debian/rules index 741c1a033..288c6ad33 100755 --- a/debian/rules +++ b/debian/rules @@ -1,16 +1,9 @@ #!/usr/bin/make -f # -*- makefile -*- -# Sample debian/rules that uses debhelper. -# This file was originally written by Joey Hess and Craig Small. -# As a special exception, when this file is copied by dh-make into a -# dh-make output file, you may use that output file without restriction. -# This special exception was added by Craig Small in version 0.37 of dh-make. # Uncomment this to turn on verbose mode. # export DH_VERBOSE=1 -b=$(CURDIR)/debian - ## kernel package specific stuff # Name of the source package psource:=ngcp-rtpengine-kernel-source @@ -22,44 +15,26 @@ sname:=ngcp-rtpengine sversion:=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2) PACKAGE=ngcp-rtpengine-kernel -MA_DIR ?= /usr/share/modass --include $(MA_DIR)/include/generic.make --include $(MA_DIR)/include/common-rules.make - -kdist_configure: prep-deb-files - -kdist_clean: clean - $(MAKE) $(MFLAGS) -f debian/rules clean ## end of kernel package specific stuff -build: build-stamp - -build-stamp: - dh_testdir - make -C iptables-extension - make -C daemon -j`nproc` - make -C recording-daemon -j`nproc` - touch $@ - -clean: - dh_testdir - dh_testroot - cd daemon && $(MAKE) clean && cd .. - cd recording-daemon && $(MAKE) clean && cd .. - rm -f build-stamp - rm -f iptables-extension/libxt_RTPENGINE.so - rm -f daemon/rtpengine daemon/build_time.h daemon/.depend kernel-module/.xt_RTPENGINE.o.d +%: + dh $@ --parallel + +override_dh_auto_build-arch: + $(MAKE) -C iptables-extension + $(MAKE) -C daemon + $(MAKE) -C recording-daemon + +override_dh_auto_clean: + (cd daemon && $(MAKE) clean) + (cd recording-daemon && $(MAKE) clean) + (cd iptables-extension && $(MAKE) clean) + rm -f daemon/build_time.h kernel-module/.xt_RTPENGINE.o.d rm -rf kernel-module/.tmp_versions rm -f debian/README.html.gz debian/README.md.gz - dh_clean - -rm -rf debian/build - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs + dh_auto_clean +override_dh_auto_install-indep: # Create the directories to install the source into dh_installdirs -p$(psource) usr/src/modules/$(sname)/debian dh_installdirs -p$(pdkms) usr/src/$(sname)-$(sversion) @@ -82,40 +57,8 @@ install: build markdown README.md | gzip -9 > debian/README.html.gz gzip -9 < README.md > debian/README.md.gz - dh_install - -%: - @echo "--- Building: $@" - dh_installdirs -p$@ -P$(b)/$@ - dh_link -p$@ -P$(b)/$@ - dh_installdocs -p$@ -P$(b)/$@ debian/README.md.gz debian/README.html.gz - dh_installchangelogs -p$@ -P$(b)/$@ - dh_installinit -p$@ -P$(b)/$@ - dh_install -p$@ -P$(b)/$@ - dh_strip --dbg-package=ngcp-rtpengine-dbg - dh_compress -p$@ -P$(b)/$@ - dh_fixperms -p$@ -P$(b)/$@ - dh_makeshlibs -p$@ -P$(b)/$@ -V - dh_installdeb -p$@ -P$(b)/$@ - dh_shlibdeps -p$@ -P$(b)/$@ - dh_installdebconf -p$@ -P$(b)/$@ - dh_gencontrol -p$@ -P$(b)/$@ - dh_md5sums -p$@ -P$(b)/$@ - dh_builddeb -p$@ -P$(b)/$@ - -# Build architecture dependant packages -binary-arch: install \ - ngcp-rtpengine-daemon \ - ngcp-rtpengine-dbg \ - ngcp-rtpengine-iptables \ - ngcp-rtpengine-recording-daemon - -# Build architecture independant packages -binary-indep: build install \ - ngcp-rtpengine \ - ngcp-rtpengine-kernel-dkms \ - ngcp-rtpengine-kernel-source \ - ngcp-rtpengine-utils + dh_auto_install -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install kdist kdist_configure kdist_image kdist_clean +.PHONY: override_dh_strip +override_dh_strip: + dh_strip --dbg-package=ngcp-rtpengine-dbg diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/debian/source/options b/debian/source/options new file mode 100644 index 000000000..bcdff0089 --- /dev/null +++ b/debian/source/options @@ -0,0 +1 @@ +extend-diff-ignore=.gitreview