[Pkg-voip-commits] r5291 - in /ser/trunk/debian: changelog rules
marcusb-guest at alioth.debian.org
marcusb-guest at alioth.debian.org
Sun Mar 16 15:09:42 UTC 2008
Author: marcusb-guest
Date: Sun Mar 16 15:09:42 2008
New Revision: 5291
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5291
Log:
New upstream snapshot.
Modified:
ser/trunk/debian/changelog
ser/trunk/debian/rules
Modified: ser/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/changelog?rev=5291&op=diff
==============================================================================
--- ser/trunk/debian/changelog (original)
+++ ser/trunk/debian/changelog Sun Mar 16 15:09:42 2008
@@ -1,3 +1,9 @@
+ser (2.0.0~cvs20080310-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Marcus Better <marcus at better.se> Thu, 13 Mar 2008 19:50:19 +0000
+
ser (0.9.7-1) unstable; urgency=low
* Extremadura release ;-)
Modified: ser/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/ser/trunk/debian/rules?rev=5291&op=diff
==============================================================================
--- ser/trunk/debian/rules (original)
+++ ser/trunk/debian/rules Sun Mar 16 15:09:42 2008
@@ -27,34 +27,8 @@
FILENAME := ser_$(UPVERSION).orig.tar.gz
URL := http://ftp.iptel.org/pub/ser/latest/src/ser-$(UPVERSION)_src.tar.gz
-# modules not in the "main" package or unstable
-EXCLUDED_MODULES= mysql jabber auth_radius group_radius uri_radius \
- avp_radius pa postgres snmp cpl cpl-c ext extcmd
-
-# modules depending on mysql
-MYSQL_MODULES=mysql
-#jabber related modules
-JABBER_MODULES=jabber
-#module depending on radiusclient
-RADIUS_MODULES=auth_radius group_radius uri_radius avp_radius
-#cpl related modules
-CPL_MODULES=cpl-c
-# pa related modules
-PA_MODULES=pa
-# postgres modules
-POSTGRES_MODULES=postgres
-# acc module
-ACC_MODULE=acc
-
-# the same but with path prepended (needed for modules="...")
-MYSQL_MOD_PATH=$(addprefix modules/, $(MYSQL_MODULES))
-JABBER_MOD_PATH=$(addprefix modules/, $(JABBER_MODULES))
-RADIUS_MOD_PATH=$(addprefix modules/, $(RADIUS_MODULES))
-CPL_MOD_PATH=$(addprefix modules/, $(CPL_MODULES))
-PA_MOD_PATH=$(addprefix modules/, $(PA_MODULES))
-POSTGRES_MOD_PATH=$(addprefix modules/, $(POSTGRES_MODULES))
-ACC_MOD_PATH=$(addprefix modules/, $(ACC_MODULE))
-
+MODULE_GROUPS := group_include="standard standard-dep stable" skip_modules="osp"
+MAKEARGS := $(MODULE_GROUPS) prefix=/usr cfg-target=/etc/ser cfg-prefix=$(CURDIR)/debian/tmp
CFLAGS = -Wall
@@ -88,33 +62,14 @@
build-stamp: configure-stamp
dh_testdir
-
- # Add here commands to compile the package.
- CFLAGS="$(CFLAGS)" $(MAKE) all skip_modules="$(EXCLUDED_MODULES)" cfg-target=/etc/ser/
- CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(MYSQL_MOD_PATH)" cfg-target=/etc/ser/
- CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(JABBER_MOD_PATH)" cfg-target=/etc/ser/
- CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(RADIUS_MOD_PATH)" cfg-target=/etc/ser/
- CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(CPL_MOD_PATH)" cfg-target=/etc/ser/
- CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(PA_MOD_PATH)" cfg-target=/etc/ser/
- # postgres will generate lots of warnings
- CFLAGS="$(CFLAGS)" $(MAKE) modules modules="$(POSTGRES_MOD_PATH)" cfg-target=/etc/ser/
- # acc-db & acc-radius are compiled on install, because they share
- # the same source tree with acc
- #/usr/bin/docbook-to-man debian/ser.sgml > ser.1
+ CFLAGS="$(CFLAGS)" $(MAKE) $(MAKEARGS) all
touch build-stamp
clean:
dh_testdir
dh_testroot
rm -f build-stamp configure-stamp
- [ ! -f Makefile ]||$(MAKE) include_modules="\
- $(MYSQL_MODULES) \
- $(JABBER_MODULES) \
- $(RADIUS_MODULES) \
- $(CPL_MODULES) \
- $(PA_MODULES) \
- $(POSTGRES_MODULES)\
- " proper
+ [ ! -f Makefile ]||$(MAKE) $(MAKEARGS) proper
dh_clean
install: build
@@ -122,77 +77,7 @@
dh_testroot
dh_clean -k
dh_installdirs
-
- # Add here commands to install the package into debian/ser
- $(MAKE) install skip_modules="$(EXCLUDED_MODULES)" \
- basedir=$(CURDIR)/debian/ser \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser \
- cfg-target=/etc/ser/
- # install only the mysql module
- $(MAKE) install-modules-all modules="$(MYSQL_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-mysql-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-mysql-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-mysql-module
- #install only the jabber module
- $(MAKE) install-modules-all modules="$(JABBER_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-jabber-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-jabber-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-jabber-module
- #install only the radius modules
- $(MAKE) install-modules-all modules="$(RADIUS_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-radius-modules \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-radius-modules \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-radius-modules
- #install only the cpl module
- $(MAKE) install-modules-all modules="$(CPL_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-cpl-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-cpl-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-cpl-module
- #install only the pa module
- $(MAKE) install-modules-all modules="$(PA_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-pa-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-pa-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-pa-module
- #install only the postgres module
- $(MAKE) install-modules-all modules="$(POSTGRES_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-postgres-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-postgres-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-postgres-module
- # Ugly hacks to make 2 new versions from acc: ac_db & acc_radius
- #install only the acc db version module
- cd $(ACC_MOD_PATH); $(MAKE) proper; cd ../..; \
- $(MAKE) install-modules-all modules="$(ACC_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-acc-db-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-acc-db-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-acc-db-module \
- NAME=acc_db.so modules_names=acc_db.so EXTRA_DEFS=-DSQL_ACC ;\
- cd $(ACC_MOD_PATH); $(MAKE) proper NAME=acc_db.so; cd ../..
- #install only the acc radius version module
- $(MAKE) install-modules-all modules="$(ACC_MOD_PATH)" \
- basedir=$(CURDIR)/debian/ser-acc-radius-module \
- prefix=/usr \
- cfg-prefix=$(CURDIR)/debian/ser-acc-radius-module \
- cfg-target=/etc/ser/ \
- doc-dir=share/doc/ser-acc-radius-module \
- NAME=acc_radius.so modules_names=acc_radius.so EXTRA_DEFS=-DRAD_ACC \
- LIBS=-lradiusclient-ng ; \
- cd $(ACC_MOD_PATH); $(MAKE) proper NAME=acc_radius.so; cd ../..
-
+ $(MAKE) install $(MAKEARGS) basedir=$(CURDIR)/debian/tmp
# This single target is used to build all the packages, all at once, or
# one at a time. So keep in mind: any options passed to commands here will
@@ -201,6 +86,7 @@
binary-common:
dh_testdir
dh_testroot
+ dh_install --sourcedir=debian/tmp
dh_installdocs
dh_installexamples
dh_installmenu
More information about the Pkg-voip-commits
mailing list