[Pkg-voip-commits] r10048 - in /asterisk/branches/experimental/debian: asterisk-doc.docs asterisk.default changelog control patches/allow-tilde-destdir patches/menuselect_cflags patches/safe_asterisk-nobg patches/sound_files rules

paravoid at alioth.debian.org paravoid at alioth.debian.org
Mon Dec 24 12:41:17 UTC 2012 

Author: paravoid
Date: Mon Dec 24 12:41:16 2012
New Revision: 10048

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10048
Log:
More Asterisk 11 updates, three-way merge PITA

Removed:
    asterisk/branches/experimental/debian/patches/menuselect_cflags
Modified:
    asterisk/branches/experimental/debian/asterisk-doc.docs
    asterisk/branches/experimental/debian/asterisk.default
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/control
    asterisk/branches/experimental/debian/patches/allow-tilde-destdir
    asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
    asterisk/branches/experimental/debian/patches/sound_files
    asterisk/branches/experimental/debian/rules

Modified: asterisk/branches/experimental/debian/asterisk-doc.docs
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk-doc.docs?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/asterisk-doc.docs (original)
+++ asterisk/branches/experimental/debian/asterisk-doc.docs Mon Dec 24 12:41:16 2012
@@ -6,6 +6,7 @@
 UPGRADE-1.4.txt
 UPGRADE-1.6.txt
 UPGRADE-1.8.txt
+UPGRADE-10.txt
 UPGRADE.txt
 Zaptel-to-DAHDI.txt
 doc/*.txt

Modified: asterisk/branches/experimental/debian/asterisk.default
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk.default?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/asterisk.default (original)
+++ asterisk/branches/experimental/debian/asterisk.default Mon Dec 24 12:41:16 2012
@@ -25,12 +25,6 @@
 #             crash). This is generally less tested and has some known issues
 #             with properly starting and stopping Asterisk.
 #RUNASTSAFE=yes
-#
-# ASTSAFE_CONSOLE: whether you want safe_asterisk to spawn a console for Asterisk.
-#ASTSAFE_CONSOLE=yes
-#
-# ASTSAFE_TTY: tty for Asterisk to run on (only for safe_asterisk)
-#ASTSAFE_TTY=9
 #
 # MAXFILES: Set this to the number of open file handles the Asterisk 
 #           process can have. Useful if you get "Too many open files" error.

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Mon Dec 24 12:41:16 2012
@@ -3,21 +3,23 @@
   [ Faidon Liambotis ]
   * New major upstream release.
     - Drop patch kfreebsd, fixed upstream.
-    - Drop patch httpd_port, never affected 10.x.
-    - Adapt patch menuselect_cflags, partially merged.
+    - Drop patch httpd_port.
+    - Drop patch menuselect_cflags, merged upstream.
+    - Replace libopenais-dev with corosync-dev, res_corosync replaces res_ais.
   * Do not ship the removed-but-reincluded docs, they're outdated by now.
     Upstream wants their Wiki to be the primary Asterisk documentation place.
-  * Ship UPGRADE-1.8.txt, UPGRADE-1.4.txt, UPGRADE-1.2.txt in asterisk-doc.
+  * Ship UPGRADE-{10,1.8,1.4,1.2}.txt in asterisk-doc.
   * Do not ship app_meetme.so and app_dahdibarge.so, deprecated by upstream.
     - Also remove them from asterisk-dahdi's full description.
-
-  [ Tzafrir Cohen ]
-  * Patch menuselect_cflags dropped: merged upstream.
+  * Remove ASTSAFE_CONSOLE and ASTSAFE_TTY from asterisk.default, they aren't
+    being unused for a while now.
+
+  [ Tzafrir Cohen ]
   * libasteriskssl - in its own package for now.
   * pjproject: the beast is disabled for now.
   * Patch undeprecate: undeprecate meetme.
 
- -- Faidon Liambotis <paravoid at debian.org>  Thu, 22 Nov 2012 01:45:18 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 24 Dec 2012 14:40:17 +0200
 
 asterisk (1:1.8.13.0~dfsg-1) unstable; urgency=high
 

Modified: asterisk/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/control?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/control (original)
+++ asterisk/branches/experimental/debian/control Mon Dec 24 12:41:16 2012
@@ -42,7 +42,7 @@
  libspandsp-dev,
  libopenr2-dev [linux-any],
  libresample1-dev,
- libopenais-dev,
+ corosync-dev,
  libncurses-dev,
  libneon27-gnutls-dev | libneon27-dev,
  libical-dev,

Modified: asterisk/branches/experimental/debian/patches/allow-tilde-destdir
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/allow-tilde-destdir?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/allow-tilde-destdir (original)
+++ asterisk/branches/experimental/debian/patches/allow-tilde-destdir Mon Dec 24 12:41:16 2012
@@ -14,7 +14,7 @@
 
 --- a/Makefile
 +++ b/Makefile
-@@ -546,7 +546,7 @@ oldmodcheck:
+@@ -608,7 +608,7 @@ oldmodcheck:
  	fi
  
  badshell:

Modified: asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/safe_asterisk-nobg?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/branches/experimental/debian/patches/safe_asterisk-nobg Mon Dec 24 12:41:16 2012
@@ -12,7 +12,7 @@
 
 --- a/contrib/scripts/safe_asterisk
 +++ b/contrib/scripts/safe_asterisk
-@@ -16,6 +16,7 @@ MACHINE=`hostname`				# To specify which
+@@ -22,6 +22,7 @@ DUMPDROP=${DUMPDROP:-/tmp}
  RUNDIR=${RUNDIR:-/tmp}
  SLEEPSECS=4
  ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
@@ -20,7 +20,7 @@
  
  # comment this line out to have this script _not_ kill all mpg123 processes when
  # asterisk exits
-@@ -199,4 +200,8 @@ run_asterisk()
+@@ -215,4 +216,8 @@ run_asterisk()
  	done
  }
  

Modified: asterisk/branches/experimental/debian/patches/sound_files
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/patches/sound_files?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/sound_files (original)
+++ asterisk/branches/experimental/debian/patches/sound_files Mon Dec 24 12:41:16 2012
@@ -1,7 +1,7 @@
 Subject: Avoid downloading extra sound files
 From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Forwarded: no
-Last-Update: 2010-02-03
+Last-Update: 2012-12-15
 
 Asterisk configures several sound files to be installed that are not
 included in the distribution tarball. Those files are downloaded by the
@@ -14,7 +14,7 @@
 
 --- a/sounds/sounds.xml
 +++ b/sounds/sounds.xml
-@@ -6,7 +6,6 @@
+@@ -10,7 +10,6 @@
  		</member>
  		<member name="CORE-SOUNDS-EN-GSM" displayname="English, GSM format" >
  			<support_level>core</support_level>
@@ -22,7 +22,7 @@
  		</member>
  		<member name="CORE-SOUNDS-EN-G729" displayname="English, G.729 format">
  			<support_level>core</support_level>
-@@ -93,7 +92,6 @@
+@@ -138,7 +137,6 @@
  	</category>
  	<category name="MENUSELECT_MOH" displayname="Music On Hold File Packages" positive_output="yes">
  		<member name="MOH-OPSOUND-WAV" displayname="opsound.org Music On Hold Files, WAV format" >

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=10048&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Mon Dec 24 12:41:16 2012
@@ -255,6 +255,8 @@
 	# in case the tarball is not clean:
 	@rm -rf $(TMP_TARBALL_TOP)/AST.txt
 	@rm -rf $(TMP_TARBALL_TOP)/AST.pdf
+	@rm -rf $(TMP_TARBALL_TOP)/doc/Asterisk-Admin-Guide/
+	@rm -rf $(TMP_TARBALL_TOP)/doc/Asterisk-Admin-Guide.pdf
 	@rm -rf $(TMP_TARBALL_TOP)/codecs/ilbc
 	# While we're at it: remove some generated files that will become
 	# invalid:

More information about the Pkg-voip-commits mailing list