[Pkg-voip-commits] r3416 - asterisk/trunk/debian

[Mark Purcell]

Author: msp
Date: 2007-04-14 10:19:30 +0000 (Sat, 14 Apr 2007)
New Revision: 3416

Added:
   asterisk/trunk/debian/asterisk-config.default
Removed:
   asterisk/trunk/debian/asterisk.default
Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/rules
Log:
* Only ship default/asterisk in asterisk-config package
  - Asterisk-config and asterisk 1:1.4.2~dfsg-4 both contain
  /etc/default/asterisk (Closes: #418656)

Copied: asterisk/trunk/debian/asterisk-config.default (from rev 3415, asterisk/trunk/debian/asterisk.default)

Deleted: asterisk/trunk/debian/asterisk.default
===================================================================
--- asterisk/trunk/debian/asterisk.default	2007-04-13 17:50:44 UTC (rev 3415)
+++ asterisk/trunk/debian/asterisk.default	2007-04-14 10:19:30 UTC (rev 3416)
@@ -1,35 +0,0 @@
-# This file allows you to alter the configuration of the Asterisk
-# init.d script. Normally you should leave the file as-is.
-#
-# RUNASTERISK: If set to anything other that 'yes', the asterisk init.d script
-#              will not run. The default is 'yes'.
-#RUNASTERISK=no
-#
-#
-# AST_REALTIME: if set to anything other than "no", asterisk will run in 
-#               real-time priority (pass '-p' to asterisk). un-rem the 
-#               following line to disable asterisk from running in real-time 
-#               priority
-#AST_REALTIME=no
-#
-# PARAMS: extra parameters to pass to asterisk: generate cores in 
-#         case of crash, and be more verbose. -F guarantees that Asterisk 
-#         will still run daemonized.
-#
-#         Instead of adding switches here, consider editing 
-#         /etc/asterisk/asterisk.conf
-#PARAMS="-F -g -vvv"
-#
-#
-# RUNASTSAFE: run safe_asterisk rather than asterisk (will auto-restart upon
-#             crash). This is generally less tested and has some known issues
-#             with properly starting and stopping Asterisk.
-#RUNASTSAFE=yes
-#
-# 
-# AST_DUMPCORE: if set to anything other than "no", asterisk will be run with
-#               the option -g (to tell it to dump core on crash) and its
-#               working directory will be set to /var/spool/asterisk, as that
-#               directory is writable and hence core files can be written there.
-#               See /etc/init.d/asterisk for some other relevant variables.
-#AST_DUMPCORE=yes

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2007-04-13 17:50:44 UTC (rev 3415)
+++ asterisk/trunk/debian/changelog	2007-04-14 10:19:30 UTC (rev 3416)
@@ -1,11 +1,11 @@
-asterisk (1:1.4.2~dfsg-5) UNRELEASED; urgency=low
+asterisk (1:1.4.2~dfsg-5) unstable; urgency=low
 
-  * NOT RELEASED YET
-
-  * Upload to unstable
   * Bump Build-Depends: libsnmp10-dev | libsnmp-dev
+  * Only ship default/asterisk in asterisk-config package
+    - Asterisk-config and asterisk 1:1.4.2~dfsg-4 both contain
+    /etc/default/asterisk (Closes: #418656)
 
- -- Mark Purcell <mark at purcell.id.au>  Fri, 13 Apr 2007 18:50:05 +0100
+ -- Mark Purcell <msp at debian.org>  Sat, 14 Apr 2007 11:19:07 +0100
 
 asterisk (1:1.4.2~dfsg-4) experimental; urgency=low
 

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2007-04-13 17:50:44 UTC (rev 3415)
+++ asterisk/trunk/debian/rules	2007-04-14 10:19:30 UTC (rev 3416)
@@ -154,7 +154,7 @@
 
 	dh_install -i --sourcedir=debian/tmp
 
-	cp $(CURDIR)/debian/asterisk.default $(CURDIR)/debian/asterisk-config/etc/default/asterisk
+	cp $(CURDIR)/debian/asterisk-config.default $(CURDIR)/debian/asterisk-config/etc/default/asterisk
 	chmod +x $(CURDIR)/debian/asterisk-web-vmail/usr/lib/cgi-bin/asterisk/vmail.cgi