[Pkg-voip-commits] r6836 - in /asterisk/trunk/debian: changelog patches/dahdiras_1606 patches/series rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Mar  1 19:26:50 2009
New Revision: 6836

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=6836
Log:
* New upstream release: 1.6.0.6 .
* Patch dahdiras_1606: Fix a build issue in app_dahdiras.c .
* Remove hashtest and hashtest2: debugging utilities.

Added:
    asterisk/trunk/debian/patches/dahdiras_1606
Modified:
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/patches/series
    asterisk/trunk/debian/rules

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=6836&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Sun Mar  1 19:26:50 2009
@@ -1,4 +1,4 @@
-asterisk (1:1.6.0.3~dfsg~rc1-1) UNRELEASED; urgency=low
+asterisk (1:1.6.0.6~dfsg-1) UNRELEASED; urgency=low
 
   [ Tzafrir Cohen ]
   * Experimental 1.6.x branch.
@@ -27,6 +27,8 @@
   * Depend on libss7 and newer libpri (1.4.7) for latest chan_dahdi abilities.
   * Depend on libtonezone from dahdi (ver. 2.0).
   * Includes fix for AST-2009-001 (Closes: #513413).
+  * Patch dahdiras_1606: Fix a build issue in app_dahdiras.c .
+  * Remove hashtest and hashtest2: debugging utilities.
 
   [ Mark Purcell ]
   * Update debian/watch

Added: asterisk/trunk/debian/patches/dahdiras_1606
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/dahdiras_1606?rev=6836&op=file
==============================================================================
--- asterisk/trunk/debian/patches/dahdiras_1606 (added)
+++ asterisk/trunk/debian/patches/dahdiras_1606 Sun Mar  1 19:26:50 2009
@@ -1,0 +1,27 @@
+Change include order to make compile on Centos 5 with DAHDI
+
+If BIT_TYPES_DEFINED gets defined before linux/types.h is included, the
+__s32 type doesn't get defined.
+
+Source: svn diff -c 178306 http://svn.digium.com/svn/asterisk/branches/1.6.0
+
+Should be included in 1.6.0.7 and/or 1.6.1 .
+
+--- a/apps/app_dahdiras.c	(revision 178305)
++++ b/apps/app_dahdiras.c	(revision 178306)
+@@ -42,13 +42,13 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
+ #include <signal.h>
+ #endif /* __linux__ */
+ 
++#include <dahdi/user.h>
++
+ #include <fcntl.h>
+ #ifdef HAVE_CAP
+ #include <sys/capability.h>
+ #endif /* HAVE_CAP */
+ 
+-#include <dahdi/user.h>
+-
+ #include "asterisk/lock.h"
+ #include "asterisk/file.h"
+ #include "asterisk/channel.h"

Modified: asterisk/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/patches/series?rev=6836&op=diff
==============================================================================
--- asterisk/trunk/debian/patches/series (original)
+++ asterisk/trunk/debian/patches/series Sun Mar  1 19:26:50 2009
@@ -21,3 +21,4 @@
 zap-fix-timing-source
 disable_moh
 libtonezone_libm
+dahdiras_1606

Modified: asterisk/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/rules?rev=6836&op=diff
==============================================================================
--- asterisk/trunk/debian/rules (original)
+++ asterisk/trunk/debian/rules Sun Mar  1 19:26:50 2009
@@ -148,6 +148,7 @@
 
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/streamplayer
 	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/stereorize
+	$(RM) -f $(CURDIR)/debian/asterisk/usr/sbin/hashtest*
 	touch $@
 
 install-indep: build-indep