[Pkg-voip-commits] r8668 - in /asterisk/branches/experimental/debian: asterisk-dahdi.install asterisk.init changelog control patches/safe_asterisk-nobg rules

tzafrir at alioth.debian.org tzafrir at alioth.debian.org
Fri Nov 19 00:18:49 UTC 2010


Author: tzafrir
Date: Fri Nov 19 00:18:44 2010
New Revision: 8668

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8668
Log:
Extra sub-package asterisk-dahdi for the dahdi modules.

Added:
    asterisk/branches/experimental/debian/asterisk-dahdi.install
Modified:
    asterisk/branches/experimental/debian/asterisk.init
    asterisk/branches/experimental/debian/changelog
    asterisk/branches/experimental/debian/control
    asterisk/branches/experimental/debian/patches/safe_asterisk-nobg
    asterisk/branches/experimental/debian/rules

Added: asterisk/branches/experimental/debian/asterisk-dahdi.install
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk-dahdi.install?rev=8668&op=file
==============================================================================
--- asterisk/branches/experimental/debian/asterisk-dahdi.install (added)
+++ asterisk/branches/experimental/debian/asterisk-dahdi.install Fri Nov 19 00:18:44 2010
@@ -1,0 +1,4 @@
+usr/lib/asterisk/modules/app_meetme.so
+usr/lib/asterisk/modules/chan_dahdi.so
+usr/lib/asterisk/modules/codec_dahdi.so
+usr/lib/asterisk/modules/res_timing_dahdi.so

Modified: asterisk/branches/experimental/debian/asterisk.init
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/asterisk.init?rev=8668&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/asterisk.init (original)
+++ asterisk/branches/experimental/debian/asterisk.init Fri Nov 19 00:18:44 2010
@@ -151,6 +151,7 @@
 			echo "$DESC is already running. Use restart."
 			exit 0
 		fi
+		export SAFE_AST_BACKGROUND=1
 		start-stop-daemon --start --group $GROUP --pidfile "$PIDFILE" \
 			$CHDIR_PARM \
 			--exec $REALDAEMON -- $PARAMS > /dev/null

Modified: asterisk/branches/experimental/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/changelog?rev=8668&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/changelog (original)
+++ asterisk/branches/experimental/debian/changelog Fri Nov 19 00:18:44 2010
@@ -11,8 +11,9 @@
   * Patch typos dropped: merged upstream.
   * Patch rtcp_cli_fix dropped: merged upstream.
   * Sound files: version 1.4.20
-
- -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 22 Oct 2010 14:07:59 +0200
+  * Extra sub-package asterisk-dahdi for the dahdi modules.
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Fri, 19 Nov 2010 02:17:58 +0200
 
 asterisk (1:1.6.2.9-2) unstable; urgency=high
 

Modified: asterisk/branches/experimental/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/control?rev=8668&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/control (original)
+++ asterisk/branches/experimental/debian/control Fri Nov 19 00:18:44 2010
@@ -50,7 +50,7 @@
 
 Package: asterisk
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser, asterisk-prompt-en, dahdi
+Depends: ${shlibs:Depends}, ${misc:Depends}, asterisk-config (= ${source:Version}) | asterisk-config-custom, adduser, asterisk-prompt-en
 Provides: asterisk-1.6.2
 Recommends: sox
 Suggests: asterisk-doc, asterisk-dev, asterisk-h323
@@ -81,7 +81,7 @@
 Package: asterisk-h323
 Architecture: any
 Depends: asterisk, ${shlibs:Depends}, ${misc:Depends}
-Description: H.323 protocol support for Asterisk
+Description: H.323 protocol support for the Asterisk PBX
  Asterisk is an Open Source PBX and telephony toolkit.
  .
  This channel driver (chan_h323) provides support for the H.323 protocol
@@ -92,6 +92,22 @@
  This is one of many H.323 channel implementations for Asterisk with others
  being chan_oh323 and chan_ooh323c, distributed by Debian as asterisk-oh323 and
  asterisk-ooh323c, respectively.
+ .
+ For more information about the Asterisk PBX, have a look at the Asterisk
+ package.
+
+Package: asterisk-dahdi
+Architecture: any
+Depends: asterisk, ${shlibs:Depends}, ${misc:Depends}, dahdi
+Conflicts: asterisk (<<1.8.0)
+Replaces: asterisk (<<1.8.0)
+Description: DAHDI devices support for the Asterisk PBX
+ Asterisk is an Open Source PBX and telephony toolkit.
+ .
+ This package includes the DAHDI channel driver (chan_dahdi.so) and a
+ number of other Asterisk modules that require DAHDI support (app_meetme.so,
+ res_timing_dahdi.so). They will not be useful without kernel-level DAHDI
+ support.
  .
  For more information about the Asterisk PBX, have a look at the Asterisk
  package.

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=8668&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/patches/safe_asterisk-nobg (original)
+++ asterisk/branches/experimental/debian/patches/safe_asterisk-nobg Fri Nov 19 00:18:44 2010
@@ -2,7 +2,7 @@
 Author: Faidon Liambotis <paravoid at debian.org>
 Bug-Debian: http://bugs.debian.org/376514
 Forwarded: not-needed
-Last-Update: 2009-12-19
+Last-Update: 2010-10-21
 
 This is intended to work with start-stop-daemon's --background option which
 results in a correct pidfile since the process doesn't fork.
@@ -16,7 +16,7 @@
  ASTSBINDIR=__ASTERISK_SBIN_DIR__
  ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
  ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
-+BACKGROUND=0
++SAFE_AST_BACKGROUND=0
  
  # comment this line out to have this script _not_ kill all mpg123 processes when
  # asterisk exits
@@ -25,7 +25,7 @@
  }
  
 -run_asterisk &
-+if [ "$BACKGROUND" = "1" ]; then
++if [ "$SAFE_AST_BACKGROUND" = "1" ]; then
 +	run_asterisk &
 +else
 +	run_asterisk

Modified: asterisk/branches/experimental/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/branches/experimental/debian/rules?rev=8668&op=diff
==============================================================================
--- asterisk/branches/experimental/debian/rules (original)
+++ asterisk/branches/experimental/debian/rules Fri Nov 19 00:18:44 2010
@@ -187,6 +187,10 @@
 	dh_fixperms -a
 	dh_installdeb -a
 	rm -f debian/asterisk/usr/lib/asterisk/modules/chan_h323.so
+	rm -f debian/asterisk/usr/lib/asterisk/modules/app_meetme.so
+	rm -f debian/asterisk/usr/lib/asterisk/modules/chan_dahdi.so
+	rm -f debian/asterisk/usr/lib/asterisk/modules/codec_dahdi.so
+	rm -f debian/asterisk/usr/lib/asterisk/modules/res_timing_dahdi.so
 	dh_shlibdeps -a
 	dh_gencontrol -a
 	dh_md5sums -a




More information about the Pkg-voip-commits mailing list