[Pkg-voip-commits] r7452 - in /asterisk/trunk/debian: asterisk.init changelog control

[paravoid at alioth.debian.org]

Author: paravoid
Date: Mon Jul 27 18:17:41 2009
New Revision: 7452

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7452
Log:
* Update Standards-Version to 3.8.2, no changes needed.
* Remove init script's "zaptel-fix" action; there's no zaptel anymore and
  was also lintian-buggy in its current form.

Modified:
    asterisk/trunk/debian/asterisk.init
    asterisk/trunk/debian/changelog
    asterisk/trunk/debian/control

Modified: asterisk/trunk/debian/asterisk.init
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/asterisk.init?rev=7452&op=diff
==============================================================================
--- asterisk/trunk/debian/asterisk.init (original)
+++ asterisk/trunk/debian/asterisk.init Mon Jul 27 18:17:41 2009
@@ -1,27 +1,15 @@
-#! /bin/sh
+#!/bin/sh
 #
 # asterisk	start the asterisk PBX
 # (c) Mark Purcell <msp at debian.org>
 # (c) Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 # (c) Faidon Liambotis <paravoid at debian.org>
-
+#
 #   This package is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
 #   the Free Software Foundation; either version 2 of the License, or
 #   (at your option) any later version.
 #
-# Based on:
-#
-# skeleton	example file to build /etc/init.d/ scripts.
-#		This file should be used to construct scripts for /etc/init.d.
-#
-#		Written by Miquel van Smoorenburg <miquels at cistron.nl>.
-#		Modified for Debian GNU/Linux
-#		by Ian Murdock <imurdock at gnu.ai.mit.edu>.
-#
-# Version:	@(#)skeleton  1.9  26-Feb-2001  miquels at cistron.nl
-#
-
 ### BEGIN INIT INFO
 # Provides:          asterisk
 # Required-Start:    $local_fs zaptel
@@ -42,7 +30,7 @@
 DESC="Asterisk PBX"
 PIDFILE="/var/run/asterisk/asterisk.pid"
 ASTSAFE_PIDFILE="/var/run/asterisk/asterisk_safe.pid"
-PIDFILE_DIR=`dirname $PIDFILE`
+PIDFILE_DIR="/var/run"
 UMASK=007 # by default
 #MAXFILES=1024 # (the system default)
 
@@ -222,16 +210,6 @@
 	status
 	exit $?
 	;;
-  zaptel-fix) 	 
-	echo "Unloading and reloading loading Asterisk and Zaptel:" 	 
-	$0 stop 	 
-	/etc/init.d/zaptel unload 	 
-	# load modules from /etc/modules. This will break if you count on 	 
-	# discover/hotplug 	 
-	/etc/init.d/module-init-tools 	 
-	/etc/init.d/zaptel start 	 
-	$0 start 	 
-	;; 	 
   *)
 	N=/etc/init.d/$NAME
 	echo "Usage: $N {start|stop|restart|reload|status|debug|logger-reload|extensions-reload|restart-convenient|force-reload}" >&2

Modified: asterisk/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/changelog?rev=7452&op=diff
==============================================================================
--- asterisk/trunk/debian/changelog (original)
+++ asterisk/trunk/debian/changelog Mon Jul 27 18:17:41 2009
@@ -14,6 +14,9 @@
     the API is not backwards compatible and Debian still has 3.4.2.
   * Accommodate for the rename of libcap2-dev to libcap-dev (Closes: #532971).
   * Add dependency to libspandsp to build the fax applications.
+  * Update Standards-Version to 3.8.2, no changes needed.
+  * Remove init script's "zaptel-fix" action; there's no zaptel anymore and
+    was also lintian-buggy in its current form.
 
   [ Tzafrir Cohen ]
   * New upstream release.
@@ -25,7 +28,7 @@
   [ Lionel Elie Mamane ]
   * Install UPGRADE-1.6.txt, useful for people upgrading from lenny
 
- -- Lionel Elie Mamane <lmamane at debian.org>  Fri, 24 Jul 2009 13:28:04 +0200
+ -- Faidon Liambotis <paravoid at debian.org>  Mon, 27 Jul 2009 21:17:31 +0300
 
 asterisk (1:1.6.1.0~dfsg-1) unstable; urgency=low
 

Modified: asterisk/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-voip/asterisk/trunk/debian/control?rev=7452&op=diff
==============================================================================
--- asterisk/trunk/debian/control (original)
+++ asterisk/trunk/debian/control Mon Jul 27 18:17:41 2009
@@ -2,7 +2,7 @@
 Priority: optional
 Section: comm
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
-Uploaders: Mark Purcell <msp at debian.org>, Kilian Krause <kilian at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
+Uploaders: Mark Purcell <msp at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>, Faidon Liambotis <paravoid at debian.org>
 Build-Depends: quilt, 
  debhelper (>= 6.0.7),
  libreadline5-dev, 
@@ -42,9 +42,7 @@
  libspandsp-dev,
  libopenais-dev,
  zlib1g-dev 
-# libtonezone with an epoch of 1 is from Zaptel. TODO: this is lousy.
-#Build-Conflicts: libtonezone-dev (>> 1:1.0.0-1)
-Standards-Version: 3.8.0
+Standards-Version: 3.8.2
 Homepage: http://www.asterisk.org/
 Vcs-Svn: svn://svn.debian.org/pkg-voip/asterisk/trunk/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/asterisk/?op=log