[Pkg-voip-commits] r10413 - in /dahdi-tools/trunk/debian: changelog dahdi.examples patches/example_scriptlet patches/series rules

[tzafrir at alioth.debian.org]

Author: tzafrir
Date: Tue Jan 28 16:28:55 2014
New Revision: 10413

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=10413
Log:
Don't add spans automatically in Asterisk (it's the job of asterisk).

Added:
    dahdi-tools/trunk/debian/patches/example_scriptlet
Modified:
    dahdi-tools/trunk/debian/changelog
    dahdi-tools/trunk/debian/dahdi.examples
    dahdi-tools/trunk/debian/patches/series
    dahdi-tools/trunk/debian/rules

Modified: dahdi-tools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/changelog?rev=10413&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/changelog	(original)
+++ dahdi-tools/trunk/debian/changelog	Tue Jan 28 16:28:55 2014
@@ -3,6 +3,7 @@
   * New upstream release.
     - Init script no longer exists if no system.conf (Closes: #567072).
     - hotplug/* patches removed (a better version included upstream).
+  * Don't add spans automatically in Asterisk (it's the job of asterisk).
 
  -- Tzafrir Cohen <tzafrir at debian.org>  Mon, 30 Dec 2013 12:45:03 +0200
 

Modified: dahdi-tools/trunk/debian/dahdi.examples
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/dahdi.examples?rev=10413&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/dahdi.examples	(original)
+++ dahdi-tools/trunk/debian/dahdi.examples	Tue Jan 28 16:28:55 2014
@@ -1,3 +1,4 @@
+hotplug/span_config.d/50-asterisk
 xpp/genconf_parameters
 *.conf.sample
 *.conf

Added: dahdi-tools/trunk/debian/patches/example_scriptlet
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/example_scriptlet?rev=10413&op=file
==============================================================================
--- dahdi-tools/trunk/debian/patches/example_scriptlet	(added)
+++ dahdi-tools/trunk/debian/patches/example_scriptlet	Tue Jan 28 16:28:55 2014
@@ -0,0 +1,36 @@
+From d1fb614ac850b89344e9fc0949ee4774e8b85b0f Mon Sep 17 00:00:00 2001
+From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+Date: Tue, 28 Jan 2014 11:32:31 +0200
+Subject: [PATCH] hotplug: document asterisk scriptlet
+
+A well-behaving distribution may choose not to install
+span_config.d/50-asterisk as part of dahdi-tools, as it belongs in
+asterisk. Still, it would be nice to be able to keep it as a documented
+usage example. So just writ where this file needs to go and what it
+does.
+
+No other change: it is still installed by default.
+
+Signed-off-by: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+---
+ hotplug/span_config.d/50-asterisk |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/hotplug/span_config.d/50-asterisk b/hotplug/span_config.d/50-asterisk
+index 2e7adbd..3b75899 100755
+--- a/hotplug/span_config.d/50-asterisk
++++ b/hotplug/span_config.d/50-asterisk
+@@ -1,5 +1,10 @@
+ #! /bin/sh
+ 
++# This file, if installed under /usr/share/dahdi/span_config.d/ , will
++# attempt to add a newly-generated span to a running copy of Asterisk.
++# Asterisk has to be running (if not: it will pick the span on its
++# startup), and has to have the channels already configured.
++
+ if [ "$ACTION" != 'add' ]; then
+ 	# Nothing to do here
+ 	exit 0
+-- 
+1.7.10.4
+

Modified: dahdi-tools/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/patches/series?rev=10413&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/patches/series	(original)
+++ dahdi-tools/trunk/debian/patches/series	Tue Jan 28 16:28:55 2014
@@ -2,3 +2,4 @@
 echocan_oslec
 init_unload_oslec
 remove_dahdi_speed
+example_scriptlet

Modified: dahdi-tools/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-tools/trunk/debian/rules?rev=10413&op=diff
==============================================================================
--- dahdi-tools/trunk/debian/rules	(original)
+++ dahdi-tools/trunk/debian/rules	Tue Jan 28 16:28:55 2014
@@ -36,6 +36,7 @@
 override_dh_auto_install:
 	# also run the 'config' target, in addition to the 'install' target:
 	dh_auto_install -- config
+	rm $(CURDIR)/debian/tmp/usr/share/dahdi/span_config.d/50-asterisk
 
 print-version:
 	@@echo "Debian version:          $(DEBVERSION)"