[Pkg-voip-commits] r3952 - in rate-engine/trunk: . debian debian/patches

Tue Aug 7 07:38:41 UTC 2007

Author: kilian
Date: 2007-08-07 07:38:41 +0000 (Tue, 07 Aug 2007)
New Revision: 3952

Removed:
   rate-engine/trunk/Makefile
Modified:
   rate-engine/trunk/debian/changelog
   rate-engine/trunk/debian/control
   rate-engine/trunk/debian/patches/fix-ftbfs.dpatch
Log:
  - still needs to be ported to asterisk 1.4.
* Build-Depends on asterisk1.2-dev for the time being.
* Move Makefile patch part into fix-ftbfs.dpatch

Deleted: rate-engine/trunk/Makefile
===================================================================

--- rate-engine/trunk/Makefile	2007-08-07 07:17:52 UTC (rev 3951)
+++ rate-engine/trunk/Makefile	2007-08-07 07:38:41 UTC (rev 3952)
@@ -1,65 +0,0 @@
-#
-# Copyright (C) 2003, 2004 by Voop as
-#
-# This program is distributed under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2, or (at your
-# option) any later version.
-#
-#	$Id: Makefile,v 1.14 2005/04/04 23:21:09 tholo Exp $
-#
-
-DEBUG+=		-g -fno-inline-functions
-
-SOFLAGS+=	-shared
-#SOFLAGS+=	-dynamic -bundle -undefined suppress -force_flat_namespace
-
-CFLAGS+=	-O3 -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
-		$(DEBUG) -D_REENTRANT -I/usr/include/pcre -fPIC
-LDFLAGS+=	$(DEBUG)
-LDLIBS+=	-lpthread
-
-CFLAGS+=	-DWITH_MYSQL -I/usr/include/mysql
-LDFLAGS+=	-L/usr/lib/mysql
-LDLIBS+=	-lmysqlclient -lz
-
-LDLIBS+=	-lpcre
-
-HDRS=
-SRCS=		rate_engine.c pcre_subst.c
-OBJS:=		$(SRCS:%.c=%.o)
-MOD=		rate_engine.so
-
-ASTLIBDIR=	$(DESTDIR)/usr/lib/asterisk/modules
-ASTCONFDIR=	$(DESTDIR)/etc/asterisk
-BINDIR=		/usr/bin
-
-.PHONY:		all
-
-all:		$(MOD)
-
-$(MOD):		$(OBJS)
-	$(CC) $(LDFLAGS) $(SOFLAGS) -o $@ $(OBJS) $(LDLIBS)
-
-.PHONY:		clean
-
-clean:
-	rm -f .depend $(MOD) $(OBJS) *.bak
-
-.PHONY:		depend
-
-depend .depend:
-	$(CC) -M $(SRCS) >.depend
-
-.PHONY:		install
-
-install:	all
-	install -m 755 $(MOD) $(ASTLIBDIR)
-
-.PHONY:		samples
-
-samples:
-	install -m 644 rate_engine.conf.sample $(ASTCONFDIR)/rate_engine.conf
-
-ifneq ($(wildcard .depend),)
-include .depend
-endif

Modified: rate-engine/trunk/debian/changelog
===================================================================
--- rate-engine/trunk/debian/changelog	2007-08-07 07:17:52 UTC (rev 3951)
+++ rate-engine/trunk/debian/changelog	2007-08-07 07:38:41 UTC (rev 3952)
@@ -1,11 +1,12 @@
 rate-engine (0.5.5-2) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
-    - still doesn't compile! Needs to be ported to asterisk 1.4 or may be
-      depend on asterisk1.2 and build-depend on asterisk1.2-dev?
+    - still needs to be ported to asterisk 1.4.
 
   [ Kilian Krause ]
   * Upgrade build-depends to libmysqlclient15-dev. (Closes: #356756)
+  * Build-Depends on asterisk1.2-dev for the time being.
+  * Move Makefile patch part into fix-ftbfs.dpatch
 
   [ Faidon Liambotis ]
   * Add myself to Uploaders.
@@ -13,10 +14,8 @@
   * Bump Standards-Version to 3.7.2, no changes needed.
   * Don't ignore make clean's exit code (fixes a lintian warning).
   * Add dpatch patch management system.
-  * Add fix-ftbfs patch which fixes compilation, written by Barry deFreese for
-    Ubuntu. Thanks!
 
- -- Faidon Liambotis <paravoid at debian.org>  Tue, 07 Aug 2007 09:08:35 +0300
+ -- Kilian Krause <kilian at debian.org>  Tue, 07 Aug 2007 09:37:37 +0200
 
 rate-engine (0.5.5-1) unstable; urgency=low
 

Modified: rate-engine/trunk/debian/control
===================================================================
--- rate-engine/trunk/debian/control	2007-08-07 07:17:52 UTC (rev 3951)
+++ rate-engine/trunk/debian/control	2007-08-07 07:38:41 UTC (rev 3952)
@@ -2,8 +2,8 @@
 Section: comm
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Faidon Liambotis
-Build-Depends: debhelper (>= 5), dpatch, libpcre3-dev, libmysqlclient15-dev, asterisk-dev
+Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Faidon Liambotis <paravoid at debian.org>
+Build-Depends: debhelper (>= 5), dpatch, libpcre3-dev, libmysqlclient15-dev, asterisk1.2-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/

Modified: rate-engine/trunk/debian/patches/fix-ftbfs.dpatch
===================================================================
--- rate-engine/trunk/debian/patches/fix-ftbfs.dpatch	2007-08-07 07:17:52 UTC (rev 3951)
+++ rate-engine/trunk/debian/patches/fix-ftbfs.dpatch	2007-08-07 07:38:41 UTC (rev 3952)
@@ -1,10 +1,33 @@
 #! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-ftbfs.dpatch by Barry deFreese <bddebian at comcast.net>
+## fix-ftbfs.dpatch by Kilian Krause <kilian at debian.org>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix several compilation problems.
+## DP: Fix several compilation problems. Taken from Ubuntu gutsy (0.5.5-1ubuntu2)
+## DP: Based on a patch from Barry deFreese <bddebian at comcast.net>
 
 @DPATCH@
+--- rate-engine-0.5.5.orig/Makefile
++++ rate-engine-0.5.5/Makefile
+@@ -14,7 +14,7 @@
+ #SOFLAGS+=	-dynamic -bundle -undefined suppress -force_flat_namespace
+ 
+ CFLAGS+=	-O3 -W -Wall -Wmissing-prototypes -Wstrict-prototypes -Wshadow \
+-		$(DEBUG) -D_REENTRANT -I/usr/include/pcre
++		$(DEBUG) -D_REENTRANT -I/usr/include/pcre -fPIC
+ LDFLAGS+=	$(DEBUG)
+ LDLIBS+=	-lpthread
+ 
+@@ -29,8 +29,8 @@
+ OBJS:=		$(SRCS:%.c=%.o)
+ MOD=		rate_engine.so
+ 
+-ASTLIBDIR=	/usr/lib/asterisk/modules
+-ASTCONFDIR=	/etc/asterisk
++ASTLIBDIR=	$(DESTDIR)/usr/lib/asterisk/modules
++ASTCONFDIR=	$(DESTDIR)/etc/asterisk
+ BINDIR=		/usr/bin
+ 
+ .PHONY:		all
 diff -urNad rate-engine-0.5.5~/rate_engine.c rate-engine-0.5.5/rate_engine.c
 --- rate-engine-0.5.5~/rate_engine.c	2005-11-04 00:00:59.000000000 +0200
 +++ rate-engine-0.5.5/rate_engine.c	2007-08-07 09:00:05.000000000 +0300


