[Pkg-voip-commits] r4825 - in /openser/trunk/debian: changelog control rules

jblache at alioth.debian.org jblache at alioth.debian.org
Thu Nov 15 15:00:38 UTC 2007 

Author: jblache
Date: Thu Nov 15 15:00:37 2007
New Revision: 4825

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4825
Log:
Add new modules packages.

Modified:
    openser/trunk/debian/changelog
    openser/trunk/debian/control
    openser/trunk/debian/rules

Modified: openser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/changelog?rev=4825&op=diff
==============================================================================
--- openser/trunk/debian/changelog (original)
+++ openser/trunk/debian/changelog Thu Nov 15 15:00:37 2007
@@ -6,8 +6,17 @@
     + Removed; merged upstream.
   * debian/patches/02_xmlrpc_update.dpatch:
     + Removed; merged upstream.
-
- -- Julien BLACHE <jblache at debian.org>  Thu, 15 Nov 2007 15:31:55 +0100
+  * debian/control:
+    + New packages: openser-carrierroute-module, openser-berkeley-module.
+    + openser Suggests both new packages.
+    + Add Build-Dependencies on xsltproc, libconfuse-dev and libdb-dev.
+  * debian/rules:
+    + Update list of presence modules.
+    + Add the carrierroute and berkeley modules.
+    + Build db schemas and bdb utils.
+    + Install openser documentation.
+
+ -- Julien BLACHE <jblache at debian.org>  Thu, 15 Nov 2007 15:58:06 +0100
 
 openser (1.2.2-3) unstable; urgency=low
 

Modified: openser/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/control?rev=4825&op=diff
==============================================================================
--- openser/trunk/debian/control (original)
+++ openser/trunk/debian/control Thu Nov 15 15:00:37 2007
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Julien BLACHE <jblache at debian.org>, Kilian Krause <kilian at debian.org>
-Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19)
+Build-Depends: debhelper (>= 5), dpatch, libmysqlclient15-dev, libexpat1-dev, libxml2-dev, libpq-dev, libradiusclient-ng-dev, flex, bison, zlib1g-dev, unixodbc-dev, libxmlrpc-c3-dev, libperl-dev, libsnmp-dev, dpkg-dev (>= 1.13.19), libdb-dev (>= 4.6.19-1), xsltproc, libconfuse-dev
 Standards-Version: 3.7.2
 Homepage: http://www.openser.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/openser/trunk/
@@ -12,7 +12,7 @@
 Package: openser
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, adduser
-Suggests: openser-mysql-module, openser-postgres-module, openser-unixodbc-module, openser-jabber-module, openser-cpl-module, openser-radius-modules, openser-presence-modules, openser-xmlrpc-module, openser-perl-module, openser-snmpstats-module, openser-xmpp-module
+Suggests: openser-mysql-module, openser-postgres-module, openser-unixodbc-module, openser-jabber-module, openser-cpl-module, openser-radius-modules, openser-presence-modules, openser-xmlrpc-module, openser-perl-module, openser-snmpstats-module, openser-xmpp-module, openser-carrierroute-module, openser-berkeley-module
 Description: very fast and configurable SIP proxy
  OpenSER is a very fast and flexible SIP (RFC3261)
  proxy server. Written entirely in C, OpenSER can handle thousands calls
@@ -159,3 +159,26 @@
  per second even on low-budget hardware.
  .
  This package provides the SIP to XMPP IM translator module for OpenSER.
+
+Package: openser-carrierroute-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${binary:Version})
+Description: Carrierroute module for OpenSER
+ OpenSER is a very fast and flexible SIP (RFC3261)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the carrierroute module for OpenSER, an integrated
+ solution for routing, balancing and blacklisting.
+
+Package: openser-berkeley-module
+Architecture: any
+Depends: ${shlibs:Depends}, openser (= ${binary:Version})
+Description: Berkeley Database module for OpenSER
+ OpenSER is a very fast and flexible SIP (RFC3261)
+ proxy server. Written entirely in C, OpenSER can handle thousands calls
+ per second even on low-budget hardware.
+ .
+ This package provides the berkeley database module for OpenSER, a
+ high-performance embedded DB kernel. All database tables are stored
+ in files, no additional server is necessary.

Modified: openser/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/openser/trunk/debian/rules?rev=4825&op=diff
==============================================================================
--- openser/trunk/debian/rules (original)
+++ openser/trunk/debian/rules Thu Nov 15 15:00:37 2007
@@ -7,7 +7,8 @@
 ALL_PACKAGES = openser openser-mysql-module openser-postgres-module \
 	openser-jabber-module openser-cpl-module openser-radius-modules \
 	openser-unixodbc-module openser-presence-modules openser-xmlrpc-module \
-	openser-perl-module openser-snmpstats-module openser-xmpp-module
+	openser-perl-module openser-snmpstats-module openser-xmpp-module \
+	openser-carrierroute-module openser-berkeley-module
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -41,7 +42,7 @@
 # module depending on radiusclient
 RADIUS_MODULES = avp_radius auth_radius group_radius uri_radius
 # presence related modules
-PRESENCE_MODULES = presence pua pua_mi pua_usrloc
+PRESENCE_MODULES = presence presence_xml presence_mwi pua pua_bla pua_mi pua_usrloc pua_xmpp
 # XMLRPC module
 XMLRPC_MODULES = mi_xmlrpc
 # Perl module
@@ -50,8 +51,12 @@
 SNMPSTATS_MODULES = snmpstats
 # XMPP module
 XMPP_MODULES = xmpp
-
-ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES) $(PERL_MODULES) $(SNMPSTATS_MODULES) $(XMPP_MODULES)
+# Carrierroute module
+CROUTE_MODULES = carrierroute
+# Berkeley DB module
+BERKELEY_MODULES = db_berkeley
+
+ALL_MODULES = $(MYSQL_MODULES) $(POSTGRES_MODULES) $(UNIXODBC_MODULES) $(JABBER_MODULES) $(CPL_MODULES) $(RADIUS_MODULES) $(PRESENCE_MODULES) $(XMLRPC_MODULES) $(PERL_MODULES) $(SNMPSTATS_MODULES) $(XMPP_MODULES) $(CROUTE_MODULES) $(BERKELEY_MODULES)
 
 # modules not in the "main" package or unstable modules
 EXCLUDED_MODULES = $(ALL_MODULES) pa osp
@@ -68,6 +73,8 @@
 PERL_MOD_PATH=$(addprefix modules/, $(PERL_MODULES))
 SNMPSTATS_MOD_PATH=$(addprefix modules/, $(SNMPSTATS_MODULES))
 XMPP_MOD_PATH=$(addprefix modules/, $(XMPP_MODULES))
+CROUTE_MOD_PATH=$(addprefix modules/, $(CROUTE_MODULES))
+BERKELEY_MOD_PATH=$(addprefix modules/, $(BERKELEY_MODULES))
 
 ifeq (cc, $(CC))
 	CC = gcc
@@ -110,6 +117,14 @@
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(PERL_MOD_PATH)" cfg-target=/etc/openser/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(SNMPSTATS_MOD_PATH)" cfg-target=/etc/openser/
 	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(XMPP_MOD_PATH)" cfg-target=/etc/openser/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/openser/
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/openser/
+
+	# generate the db schemas
+	$(MAKE) dbschema
+
+	# generate the utils db_berkeley
+	$(MAKE) utils include_modules="db_berkeley"
 
 	touch build-stamp
 
@@ -123,6 +138,7 @@
 	$(MAKE) TLS=$(TLS) include_modules="$(ALL_MODULES)" proper
 	rm -f cfg.tab.h
 	rm -f utils/openserunix/openserunix.o utils/openserunix/openserunix
+	rm -f utils/db_berkeley/bdb_recover.o utils/db_berkeley/bdb_recover
 
 	dh_clean
 
@@ -138,7 +154,8 @@
 		basedir=$(CURDIR)/debian/openser \
 		prefix=/usr \
 		cfg-prefix=$(CURDIR)/debian/openser \
-		cfg-target=/etc/openser/
+		cfg-target=/etc/openser/ \
+		doc-dir=share/doc/openser
 
 	find $(CURDIR)/debian/openser/etc/openser -type f -exec chmod -x {} \;
 	sed -i -e "s/^PATH.*//" $(CURDIR)/debian/openser/usr/sbin/openserctl
@@ -241,6 +258,22 @@
 		cfg-prefix=$(CURDIR)/debian/openser-xmpp-module \
 		cfg-target=/etc/openser/ \
 		doc-dir=share/doc/openser-xmpp-module
+
+	# install only the carrierroute module
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(CROUTE_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/openser-carrierroute-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/openser-carrierroute-module \
+		cfg-target=/etc/openser/ \
+		doc-dir=share/doc/openser-carrierroute-module
+
+	# install only the db_berkeley module
+	CC="$(CC)" CFLAGS="$(CFLAGS)" TLS=$(TLS) $(MAKE) install-modules-all modules="$(BERKELEY_MOD_PATH)"  \
+		basedir=$(CURDIR)/debian/openser-berkeley-module \
+		prefix=/usr \
+		cfg-prefix=$(CURDIR)/debian/openser-berkeley-module \
+		cfg-target=/etc/openser/ \
+		doc-dir=share/doc/openser-berkeley-module
 
 
 	# the modules packages all ship an empty /usr/sbin directory, let's clean that up

More information about the Pkg-voip-commits mailing list