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

[Mark Purcell]

Author: msp
Date: 2006-09-02 10:52:26 +0000 (Sat, 02 Sep 2006)
New Revision: 2333

Modified:
   asterisk/trunk/debian/asterisk.init
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/control
Log:
* apprecord_sprintf.dpatch: fix format string issue in app_record.so .
* Better error handling on init.d reload, if asterisk isn't running
* Lintian cleanup: not-binnmuable-any-depends-all

Modified: asterisk/trunk/debian/asterisk.init
===================================================================
--- asterisk/trunk/debian/asterisk.init	2006-08-30 20:35:01 UTC (rev 2332)
+++ asterisk/trunk/debian/asterisk.init	2006-09-02 10:52:26 UTC (rev 2333)
@@ -141,14 +141,14 @@
 	;;
   reload)
 	echo "Reloading $DESC configuration files."
-	$DAEMON -rx 'reload'
+	$DAEMON -rx 'reload' || true
 	;;
   logger-reload)
-	$DAEMON -rx 'logger reload'
+	$DAEMON -rx 'logger reload' || true
 	;;
   extensions-reload)
 	echo "Reloading $DESC configuration files."
-	$DAEMON -rx 'extensions reload'
+	$DAEMON -rx 'extensions reload' || true
 	;;
   restart|force-reload)
 	$0 stop

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-08-30 20:35:01 UTC (rev 2332)
+++ asterisk/trunk/debian/changelog	2006-09-02 10:52:26 UTC (rev 2333)
@@ -1,16 +1,18 @@
 asterisk (1:1.2.11.dfsg-1) UNRELEASED; urgency=high
 
-  * NOT RELEASED YET
+  [ Tzafrir Cohen]
+  * apprecord_sprintf.dpatch: fix format string issue in app_record.so .
+
+  [ Mark Purcell ]
   * New Upstream Release
   * Urgency high as fixes CVE-2006-4346
   * CVE-2006-4346: Asterisk MGCP AUEP Response Handling Buffer
     Overflow (Closes: Bug#385060)
   * Please package Asterisk 1.2.11 and Zaptel 1.2.8 (Closes: #384283)
-  
-  [ Tzafrir Cohen]
-  * apprecord_sprintf.dpatch: fix format string issue in app_record.so .
+  * Better error handling on init.d reload, if asterisk isn't running
+  * Lintian cleanup: not-binnmuable-any-depends-all
 
- -- Mark Purcell <msp at debian.org>  Wed, 30 Aug 2006 19:24:42 +0100
+ -- Mark Purcell <msp at debian.org>  Sat,  2 Sep 2006 11:50:48 +0100
 
 asterisk (1:1.2.10.dfsg-3) unstable; urgency=low
 

Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2006-08-30 20:35:01 UTC (rev 2332)
+++ asterisk/trunk/debian/control	2006-09-02 10:52:26 UTC (rev 2333)
@@ -38,7 +38,7 @@
 Package: asterisk-classic
 Architecture: any
 Section: comm
-Depends: ${shlibs:Depends}, asterisk (= ${Source-Version}), asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
+Depends: ${shlibs:Depends}, asterisk (= ${source:Version}), asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
 Conflicts: asterisk-bristuff
 Description: Open Source Private Branch Exchange (PBX) - original Digium version
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a
@@ -66,7 +66,7 @@
 Package: asterisk-bristuff
 Architecture: any
 Section: comm
-Depends: ${shlibs:Depends}, asterisk (= ${Source-Version}), asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
+Depends: ${shlibs:Depends}, asterisk (= ${source:Version}), asterisk-sounds-main (>= 1:1.0.2), asterisk-config (= ${Source-Version}) | asterisk-config-custom, adduser (>= 3.63)
 Conflicts: asterisk-classic
 Description: Open Source Private Branch Exchange (PBX) - BRIstuff-enabled version
  Asterisk is an Open Source PBX and telephony toolkit.  It is, in a