Author: alerios
Date: Wed Sep 28 21:43:34 2011
New Revision: 9290
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=9290
Log:
Started rewriting a simplier debian/rules using .install files.
Added:
opensips/trunk/debian/opensips-mysql-module.docs
opensips/trunk/debian/opensips-mysql-module.install
Modified:
opensips/trunk/debian/changelog
opensips/trunk/debian/rules
Modified: opensips/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/changelog?rev=9290&op=diff
==============================================================================
--- opensips/trunk/debian/changelog (original)
+++ opensips/trunk/debian/changelog Wed Sep 28 21:43:34 2011
@@ -2,6 +2,7 @@
[ Alejandro Rios P. ]
* Debian man-pages where included by upstream.
+ * Simplier debian/rules using .install files.
[ Bjoern Boschman ]
* New upstream version. (1.7.0)
Added: opensips/trunk/debian/opensips-mysql-module.docs
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/opensips-mysql-module.docs?rev=9290&op=file
==============================================================================
--- opensips/trunk/debian/opensips-mysql-module.docs (added)
+++ opensips/trunk/debian/opensips-mysql-module.docs Wed Sep 28 21:43:34 2011
@@ -1,0 +1,1 @@
+modules/db_mysql/README
Added: opensips/trunk/debian/opensips-mysql-module.install
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/opensips-mysql-module.install?rev=9290&op=file
==============================================================================
--- opensips/trunk/debian/opensips-mysql-module.install (added)
+++ opensips/trunk/debian/opensips-mysql-module.install Wed Sep 28 21:43:34 2011
@@ -1,0 +1,2 @@
+modules/db_mysql/db_mysql.so /usr/lib/opensips/modules/
+/scripts/mysql/* /usr/share/opensips/mysql/
Modified: opensips/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/opensips/trunk/debian/rules?rev=9290&op=diff
==============================================================================
--- opensips/trunk/debian/rules (original)
+++ opensips/trunk/debian/rules Wed Sep 28 21:43:34 2011
@@ -3,14 +3,6 @@
# GNU copyright 1997 to 1999 by Joey Hess.
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
-
-ALL_PACKAGES = opensips opensips-mysql-module opensips-postgres-module \
- opensips-jabber-module opensips-cpl-module opensips-radius-modules \
- opensips-unixodbc-module opensips-presence-modules opensips-xmlrpc-module \
- opensips-perl-modules opensips-snmpstats-module opensips-xmpp-module \
- opensips-carrierroute-module opensips-berkeley-module \
- opensips-ldap-modules opensips-geoip-module opensips-regex-module \
- opensips-b2bua-module opensips-dbhttp-module opensips-console
DEBVERSION:=$(shell head -n 1 debian/changelog \
| sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
@@ -25,102 +17,12 @@
# Uncomment this to turn on verbose mode.
# export DH_VERBOSE=1
-
+# modules not in the "main" package or unstable modules
+EXCLUDED_MODULES = identity
# Do we want the TLS version ?
# Disabled by default due to license issues, set to non-void to enable
TLS=
-
-# Do we want to build the OSP module ?
-# Disabled by default due to license issues, set to non-void to enable
-OSP=
-
-ifeq (,$(OSP))
- DH_OPTIONS += -Nopensips-osp-module
-else
- ALL_PACKAGES += opensips-osp-module
-endif
-
-# Do we want to build the IDENTITY module ?
-# Disabled by default due to license issues, set to non-void to enable
-IDENTITY=
-
-ifeq (,$(IDENTITY))
- DH_OPTIONS += -Nopensips-identity-module
-else
- ALL_PACKAGES += opensips-identity-module
-endif
-
-
-export DH_OPTIONS
-
-# modules depending on mysql
-MYSQL_MODULES = db_mysql
-# modules depending on postgres
-POSTGRES_MODULES = db_postgres
-# modules depending on unixODBC
-UNIXODBC_MODULES=db_unixodbc
-# jabber module
-JABBER_MODULES = jabber
-# cpl related modules
-CPL_MODULES = cpl-c
-# module depending on radiusclient
-RADIUS_MODULES = aaa_radius peering
-# presence related modules
-PRESENCE_MODULES = presence presence_dialoginfo presence_xml presence_mwi presence_xcapdiff pua pua_bla pua_dialoginfo pua_mi pua_usrloc pua_xmpp rls xcap_client
-# XMLRPC module
-XMLRPC_MODULES = mi_xmlrpc
-# Perl module
-PERL_MODULES = perl perlvdb
-# SNMPstats module
-SNMPSTATS_MODULES = snmpstats
-# XMPP module
-XMPP_MODULES = xmpp
-# Carrierroute module
-CROUTE_MODULES = carrierroute
-# Berkeley DB module
-BERKELEY_MODULES = db_berkeley
-# LDAP modules
-LDAP_MODULES = ldap h350
-# OSP module
-OSP_MODULES = osp
-# GEOIP module
-GEOIP_MODULES = mmgeoip
-# REGEX module
-REGEX_MODULES = regex
-# IDENTITY module
-IDENTITY_MODULES = identity
-# B2BUA module
-B2BUA_MODULES = b2b_entities b2b_logic
-# DBHTTP module
-DBHTTP_MODULES = db_http
-
-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) $(LDAP_MODULES) $(OSP_MODULES) $(GEOIP_MODULES) $(REGEX_MODULES) $(IDENTITY_MODULES) $(B2BUA_MODULES) $(DBHTTP_MODULES)
-
-# modules not in the "main" package or unstable modules
-EXCLUDED_MODULES = $(ALL_MODULES) pa
-
-# the same but with path prepended (needed for modules="...")
-MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
-POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
-UNIXODBC_MOD_PATH=$(addprefix modules/, $(UNIXODBC_MODULES))
-JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
-CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
-RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
-PRESENCE_MOD_PATH=$(addprefix modules/, $(PRESENCE_MODULES))
-XMLRPC_MOD_PATH=$(addprefix modules/, $(XMLRPC_MODULES))
-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))
-LDAP_MOD_PATH=$(addprefix modules/, $(LDAP_MODULES))
-OSP_MOD_PATH=$(addprefix modules/, $(OSP_MODULES))
-GEOIP_MOD_PATH=$(addprefix modules/, $(GEOIP_MODULES))
-REGEX_MOD_PATH=$(addprefix modules/, $(REGEX_MODULES))
-IDENTITY_MOD_PATH=$(addprefix modules/, $(IDENTITY_MODULES))
-B2BUA_MOD_PATH=$(addprefix modules/, $(B2BUA_MODULES))
-DBHTTP_MOD_PATH=$(addprefix modules/, $(DBHTTP_MODULES))
ifeq (cc, $(CC))
@@ -155,34 +57,12 @@
dh_testdir
# Add here commands to compile the package.
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(UNIXODBC_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(PRESENCE_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(XMLRPC_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(PERL_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(SNMPSTATS_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(XMPP_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(CROUTE_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(BERKELEY_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(LDAP_MOD_PATH)" cfg-target=/etc/opensips/
-ifneq (,$(OSP))
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(OSP_MOD_PATH)" cfg-target=/etc/opensips/
-endif
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(GEOIP_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(REGEX_MOD_PATH)" cfg-target=/etc/opensips/
-ifneq (,$(IDENTITY))
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(IDENTITY_MOD_PATH)" cfg-target=/etc/opensips/
-endif
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(B2BUA_MOD_PATH)" cfg-target=/etc/opensips/
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) modules modules="$(DBHTTP_MOD_PATH)" cfg-target=/etc/opensips/
- # generate the utils db_berkeley
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) utils include_modules="db_berkeley"
+ CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) all \
+ include_modules="db_mysql" \
+ skip_modules="$(EXCLUDED_MODULES)" \
+ prefix=/usr \
+ cfg-target=/etc/opensips/
touch build-stamp
@@ -193,7 +73,7 @@
# Add here commands to clean up after the build process.
if [ -r Makefile ]; then \
- $(MAKE) $(VARS) include_modules="$(ALL_MODULES)" proper; \
+ $(MAKE) $(VARS) proper; \
fi
rm -f cfg.tab.h
rm -f utils/opensipsunix/opensipsunix.o utils/opensipsunix/opensipsunix
@@ -221,173 +101,6 @@
rm -f $(CURDIR)/debian/opensips/usr/sbin/osipsconsole
rm -f $(CURDIR)/debian/opensips/etc/opensips/osipsconsolerc
- # install only the mysql module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-mysql-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-mysql-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-mysql-module
-
- # install only the postgres module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-postgres-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-postgres-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-postgres-module
-
- # install only the unixodbc module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(UNIXODBC_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-unixodbc-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-unixodbc-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-unixodbc-module
-
- # install only the jabber module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-jabber-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-jabber-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-jabber-module
-
- # install only the cpl module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-cpl-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-cpl-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-cpl-module
-
- # install only the radius modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-radius-modules \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-radius-modules \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-radius-modules
-
- mkdir -p $(CURDIR)/debian/opensips-radius-modules/etc/opensips/
- # mv $(CURDIR)/debian/opensips/etc/opensips/dictionary.radius $(CURDIR)/debian/opensips-radius-modules/etc/opensips/
-
- # install only the presence modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(PRESENCE_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-presence-modules \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-presence-modules \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-presence-modules
-
- # install only the xmlrpc module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(XMLRPC_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-xmlrpc-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-xmlrpc-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-xmlrpc-module
-
- # install only the perl modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(PERL_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-perl-modules \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-perl-modules \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-perl-modules
-
- # install only the snmpstats module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(SNMPSTATS_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-snmpstats-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-snmpstats-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-snmpstats-module
-
- # install only the xmpp module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(XMPP_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-xmpp-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-xmpp-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-xmpp-module
-
- # install only the carrierroute module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(CROUTE_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-carrierroute-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-carrierroute-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-carrierroute-module
-
- # install only the db_berkeley module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(BERKELEY_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-berkeley-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-berkeley-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-berkeley-module
-
- # install only the ldap modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(LDAP_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-ldap-modules \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-ldap-modules \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-ldap-modules
-
-ifneq (,$(OSP))
- # install only the OSP module
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(OSP_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-osp-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-osp-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-osp-module
-endif
-
- # install only the geoip modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(GEOIP_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-geoip-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-geoip-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-geoip-module
-
- # install only the regex modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(REGEX_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-regex-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-regex-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-regex-module
-
-ifneq (,$(IDENTITY))
- # install only the identity modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(IDENTITY_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-identity-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-identity-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-identity-module
-endif
-
- # install only the b2bua modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(B2BUA_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-b2bua-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-b2bua-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-b2bua-module
-
- # install only the db_http modules
- CC="$(CC)" CFLAGS="$(CFLAGS)" $(VARS) $(MAKE) install-modules-all modules="$(DBHTTP_MOD_PATH)" \
- basedir=$(CURDIR)/debian/opensips-dbhttp-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/opensips-dbhttp-module \
- cfg-target=/etc/opensips/ \
- doc-dir=share/doc/opensips-dbhttp-module
-
# install only the opensips console tool
$(MAKE) install-console \
basedir=$(CURDIR)/debian/opensips-console \
@@ -406,6 +119,7 @@
binary-arch: build install
dh_testdir
dh_testroot
+ dh_install
dh_installdocs
dh_installexamples
# dh_installlogrotate
@@ -414,7 +128,6 @@
dh_installman -p opensips opensipsdbctl.8
dh_installman -p opensips-console osipsconsole.8
dh_installman -p opensips-berkeley-module bdb_recover.8
- dh_install
dh_installinfo
dh_installchangelogs ChangeLog
dh_link