[Pkg-voip-commits] r2388 - in asterisk/branches/sarge/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-09-13 19:35:31 +0000 (Wed, 13 Sep 2006)
New Revision: 2388

Modified:
   asterisk/branches/sarge/debian/changelog
   asterisk/branches/sarge/debian/patches/bristuff.dpatch
Log:
* Version 1.2.12.1
* Update bristuff.dpatch's version (and remove a generated file)
* Merge changelog changes from trunk

Modified: asterisk/branches/sarge/debian/changelog
===================================================================
--- asterisk/branches/sarge/debian/changelog	2006-09-13 19:33:05 UTC (rev 2387)
+++ asterisk/branches/sarge/debian/changelog	2006-09-13 19:35:31 UTC (rev 2388)
@@ -1,13 +1,18 @@
-asterisk (1:1.2.12.dfsg-1) unstable; urgency=low
+asterisk (1:1.2.12.1.dfsg-1) unstable; urgency=low
 
+  [ Tzafrir Cohen ]
+  * NOT RELEASED YET
   * New upstream release
   * bristuff.dpatch: version adapted.
   * apprecord_sprintf.dpatch removed: already applied.
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 10 Sep 2006 01:13:08 +0300
+  [ Mark Purcell ]
+  * binary blob in asterisk-classic package (Closes: #386361)
 
-asterisk (1:1.2.11.dfsg-1) unstable; urgency=low
+ -- Mark Purcell <msp at debian.org>  Wed, 13 Sep 2006 08:55:36 +0100
 
+asterisk (1:1.2.11.dfsg-1) unstable; urgency=high
+
   [ Tzafrir Cohen]
   * apprecord_sprintf.dpatch: fix format string issue in app_record.so .
 

Modified: asterisk/branches/sarge/debian/patches/bristuff.dpatch
===================================================================
--- asterisk/branches/sarge/debian/patches/bristuff.dpatch	2006-09-13 19:33:05 UTC (rev 2387)
+++ asterisk/branches/sarge/debian/patches/bristuff.dpatch	2006-09-13 19:35:31 UTC (rev 2388)
@@ -10,8 +10,8 @@
 --- asterisk-1.2.10.orig/.version	2006-07-14 23:29:33.000000000 +0200
 +++ asterisk-1.2.10/.version	2006-07-31 14:13:27.000000000 +0200
 @@ -1 +1 @@
--1.2.12
-+1.2.12-BRIstuffed-0.3.0-PRE-1s
+-1.2.12.1
++1.2.12.1-BRIstuffed-0.3.0-PRE-1s
 diff -urN asterisk-1.2.10.orig/HARDWARE asterisk-1.2.10/HARDWARE
 --- asterisk-1.2.10.orig/HARDWARE	2005-11-29 19:24:39.000000000 +0100
 +++ asterisk-1.2.10/HARDWARE	2006-07-31 14:13:08.000000000 +0200
@@ -10388,21 +10388,6 @@
  
  [files]
  ; Changing the following lines may compromise your security
-diff -urN asterisk-1.2.10.orig/editline/cygdef.h asterisk-1.2.10/editline/cygdef.h
---- asterisk-1.2.10.orig/editline/cygdef.h	1970-01-01 01:00:00.000000000 +0100
-+++ asterisk-1.2.10/editline/cygdef.h	2006-07-31 14:13:08.000000000 +0200
-@@ -0,0 +1,11 @@
-+/* cygdef.h. Generated automatically by configure. */ 
-+#ifndef _CYGDEF_H_
-+#define _CYGDEF_H_ 1
-+#include <sys/ioctl.h>
-+#define __linux__ 1
-+ 
-+
-+typedef void (*sig_t)(int);
-+ 
-+
-+#endif /* _CYGDEF_H_ */
 diff -urN asterisk-1.2.10.orig/include/asterisk/agi.h asterisk-1.2.10/include/asterisk/agi.h
 --- asterisk-1.2.10.orig/include/asterisk/agi.h	2005-11-29 19:24:39.000000000 +0100
 +++ asterisk-1.2.10/include/asterisk/agi.h	2006-07-31 14:13:08.000000000 +0200