[Pkg-voip-commits] [SCM] reSIProcate branch, master, updated. debian/1.8.5-1-10-gc3276c3

[Daniel Pocock]

The following commit has been merged in the master branch:
commit c3276c37b2adf8d2fafb8e3dfc25829e800869bf
Author: Daniel Pocock <daniel at pocock.com.au>
Date:   Wed May 8 00:26:09 2013 +0200

    Update for building recon packages

diff --git a/debian/control b/debian/control
index a0cf0f4..9adc5e6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: libs
 Priority: extra
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Daniel Pocock <daniel at pocock.com.au>
-Build-Depends: debhelper (>= 9.0.0), gperf, libasio-dev (>= 1.2.0), libboost-dev, libc-ares-dev (>= 1.6.0), libdb++-dev, libpopt-dev, libssl-dev (>= 0.9.8), perl, libmysqlclient-dev, libradiusclient-ng-dev, libcppunit-dev, autotools-dev, libpcre3-dev, dpkg-dev (>= 1.16.1~), libxerces-c-dev
+Build-Depends: debhelper (>= 9.0.0), gperf, libasio-dev (>= 1.2.0), libboost-dev, libc-ares-dev (>= 1.6.0), libdb++-dev, libpopt-dev, libssl-dev (>= 0.9.8), perl, libmysqlclient-dev, libradiusclient-ng-dev, libcppunit-dev, autotools-dev, libpcre3-dev, dpkg-dev (>= 1.16.1~), libxerces-c-dev, libsipxtapi-dev
 Homepage: http://www.resiprocate.org/
 Standards-Version: 3.9.3
 DM-Upload-Allowed: yes
@@ -35,6 +35,36 @@ Description: reSIProcate SIP stack - development files
  This package provides header files needed for developing applications
  based on the core reSIProcate libraries.
 
+Package: librecon-1.8
+Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: reSIProcate conversation manager - shared libraries
+ reSIProcate is a framework that aims to fully implement the SIP protocol
+ in first class C++.  It is intended for use in other applications,
+ such as the repro SIP proxy.
+ .
+ This package provides the conversation manager library, librecon,
+ implementing the core functionality of a back-to-back user agent (B2BUA),
+ session border controller (SBC) and conferencing server.
+ .
+ As reSIProcate has no built-in media framework, this package depends on the
+ media framework from the sipXtapi project.  However, it does not utilise
+ any other features of sipXtapi for the session control.  Future versions of
+ recon aim to support multiple media frameworks using an abstraction layer.
+ 
+Package: librecon-1.8-dev
+Section: libdevel
+Architecture: any
+Depends: librecon-1.8 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Description: reSIProcate conversation manager - development files
+ reSIProcate is a framework that aims to fully implement the SIP protocol
+ in first class C++.  It is intended for use in other applications,
+ such as the repro SIP proxy.
+ .
+ This package provides header files needed for developing applications
+ based on librecon.
+
 Package: libresiprocate-turn-client-1.8
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/librecon-1.8-dev.install b/debian/librecon-1.8-dev.install
new file mode 100644
index 0000000..5bb09fd
--- /dev/null
+++ b/debian/librecon-1.8-dev.install
@@ -0,0 +1,4 @@
+usr/include/recon
+usr/include/reflow
+usr/lib/*/librecon.so
+usr/lib/*/libreflow.so
diff --git a/debian/librecon-1.8.install b/debian/librecon-1.8.install
new file mode 100644
index 0000000..40f1b79
--- /dev/null
+++ b/debian/librecon-1.8.install
@@ -0,0 +1,2 @@
+usr/lib/*/librecon-*.so*
+usr/lib/*/libreflow-*.so*
diff --git a/debian/libresiprocate-1.8.lintian-overrides b/debian/librecon-1.8.lintian-overrides
similarity index 61%
copy from debian/libresiprocate-1.8.lintian-overrides
copy to debian/librecon-1.8.lintian-overrides
index 64b57f0..39ad852 100644
--- a/debian/libresiprocate-1.8.lintian-overrides
+++ b/debian/librecon-1.8.lintian-overrides
@@ -1,11 +1,11 @@
 # library package contains multiple libs that are always used together
-libresiprocate-1.8 binary: package-name-doesnt-match-sonames
+librecon-1.8 binary: package-name-doesnt-match-sonames
 # code is Vovida (BSD-like) licensed, only packaging is GPL
-libresiprocate-1.8 binary: possible-gpl-code-linked-with-openssl
+librecon-1.8 binary: possible-gpl-code-linked-with-openssl
 # this is currently needed because the lintian check doesn't
 # seem to recognise libs created with libtool -release
 # (rather than the preferred libtool -version-info)
 # discussed on debian-mentors 2012-05-21
-libresiprocate-1.8 binary: dev-pkg-without-shlib-symlink
+librecon-1.8 binary: dev-pkg-without-shlib-symlink
 # this is needed because of bug #673112
-libresiprocate-1.8 binary: hardening-no-fortify-functions
+librecon-1.8 binary: hardening-no-fortify-functions
diff --git a/debian/libresiprocate-1.8-dev.install b/debian/libresiprocate-1.8-dev.install
index a9b4f78..afa742c 100644
--- a/debian/libresiprocate-1.8-dev.install
+++ b/debian/libresiprocate-1.8-dev.install
@@ -1,5 +1,6 @@
 usr/include/rutil
-usr/include/resip
+usr/include/resip/dum
+usr/include/resip/stack
 usr/include/sipdial
 usr/include/b2bua
 usr/lib/*/librutil.so
diff --git a/debian/rules b/debian/rules
index 5219bfa..6b7e68d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,6 +15,12 @@ include /usr/share/dpkg/buildflags.mk
 DEB_DH_INSTALL_ARGS := --sourcedir=debian/tmp
 
 CPPFLAGS += -DRESIP_FIXED_POINT
+# this is just temporary, reSIProcate 1.9.x should not need this:
+CPPFLAGS += -I/usr/include/sipxtapi
+# these are also temporary, should be implemented in reSIProcate's build system, for sipXtapi
+# with librecon:
+CPPFLAGS += -D__pingtel_on_posix__ -D_linux_ -D_REENTRANT -D_FILE_OFFS
+CPPFLAGS += -DDEFAULT_BRIDGE_MAX_IN_OUTPUTS=20
 CXXFLAGS += -fpermissive
 LDFLAGS += -lcares
 
@@ -26,6 +32,7 @@ override_dh_auto_configure:
 		--enable-ipv6 \
 		--with-radius \
  	 	--with-c-ares \
+		--with-recon \
 		--with-b2bua
 
 override_dh_auto_build:

-- 
reSIProcate