[Pkg-voip-commits] [asterisk] 09/11: New upstream release: 13.1.0

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository asterisk.

commit f4759d9d9b1148f797127e47c7907fe45e752f72
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Wed Dec 17 07:48:22 2014 +0200

    New upstream release: 13.1.0
    
    * Patch systemd updated
    * Patch Makefile_kfreebsd removed: merged upstream
    * Patch bigendian removed: merged upstream
---
 debian/changelog                 |  6 ++++++
 debian/patches/Makefile_kfreebsd | 19 -------------------
 debian/patches/bigendian.patch   | 15 ---------------
 debian/patches/series            |  2 --
 debian/patches/systemd.patch     |  2 +-
 5 files changed, 7 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 349e706..a717c46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+asterisk (1:13.1.0~dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Wed, 17 Dec 2014 07:47:50 +0200
+
 asterisk (1:13.0.0~dfsg-3) unstable; urgency=medium
 
   * sanity check to avoid changing the ABI hash
diff --git a/debian/patches/Makefile_kfreebsd b/debian/patches/Makefile_kfreebsd
deleted file mode 100644
index d103f12..0000000
--- a/debian/patches/Makefile_kfreebsd
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Tzafrir Cohen <tzafrir at debian.org>
-Subject: install service and init.d files on GNU/kFreeBSD
-
-The only effect this patch has is to install the systemd service on
-kFreeBSD. Not very useful, but keeps from breaking our configuration.
-
-And yes, the HURD is missing from here as well.
-
---- a/Makefile
-+++ b/Makefile
-@@ -790,7 +790,7 @@ install-logrotate:
- 	rm -f contrib/scripts/asterisk.logrotate.tmp
- 
- config:
--	@if [ "${OSARCH}" = "linux-gnu" ]; then \
-+	@if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \
- 		$(INSTALL) -d $(DESTDIR)/lib/systemd/system; \
- 		./build_tools/install_subst -d contrib/asterisk.service $(DESTDIR)/lib/systemd/system/asterisk.service; \
- 		if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \
diff --git a/debian/patches/bigendian.patch b/debian/patches/bigendian.patch
deleted file mode 100644
index f39b754..0000000
--- a/debian/patches/bigendian.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Tzafrir Cohen <tzafrir at debian.org>
-Subject: Fix building chan_phone on big endian systems
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-24458
-
---- a/channels/chan_phone.c
-+++ b/channels/chan_phone.c
-@@ -827,7 +827,7 @@ static int phone_write(struct ast_channe
- 		} else {
- 			int swap = 0;
- #if __BYTE_ORDER == __BIG_ENDIAN
--			if (frame->subclass.format.id == AST_FORMAT_SLINEAR)
-+			if (ast_format_cmp(frame->subclass.format, ast_format_slin) == AST_FORMAT_CMP_EQUAL)
- 				swap = 1; /* Swap big-endian samples to little-endian as we copy */
- #endif
- 			res = phone_write_buf(p, pos, expected, maxfr, swap);
diff --git a/debian/patches/series b/debian/patches/series
index 7b1354a..115607b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -22,6 +22,4 @@ reenable
 smsq_enable.patch
 aelparse_enable.patch
 systemd.patch
-Makefile_kfreebsd
-bigendian.patch
 #test_framework.patch
diff --git a/debian/patches/systemd.patch b/debian/patches/systemd.patch
index b1ec4c6..433a4ed 100644
--- a/debian/patches/systemd.patch
+++ b/debian/patches/systemd.patch
@@ -168,7 +168,7 @@ Index: trunk/Makefile
 @@ -791,6 +791,8 @@
  
  config:
- 	@if [ "${OSARCH}" = "linux-gnu" ]; then \
+ 	@if [ "${OSARCH}" = "linux-gnu" -o "${OSARCH}" = "kfreebsd-gnu" ]; then \
 +		$(INSTALL) -d $(DESTDIR)/lib/systemd/system; \
 +		./build_tools/install_subst -d contrib/asterisk.service $(DESTDIR)/lib/systemd/system/asterisk.service; \
  		if [ -f /etc/redhat-release -o -f /etc/fedora-release ]; then \

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git