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

[Mark Purcell]

Author: msp
Date: 2006-09-13 07:59:42 +0000 (Wed, 13 Sep 2006)
New Revision: 2385

Modified:
   asterisk/trunk/debian/changelog
   asterisk/trunk/debian/copyright
   asterisk/trunk/debian/rules
Log:
* binary blob in asterisk-classic package (Closes: #386361)

Modified: asterisk/trunk/debian/changelog
===================================================================
--- asterisk/trunk/debian/changelog	2006-09-13 07:08:06 UTC (rev 2384)
+++ asterisk/trunk/debian/changelog	2006-09-13 07:59:42 UTC (rev 2385)
@@ -1,12 +1,16 @@
 asterisk (1:1.2.12.1.dfsg-1) UNRELEASED; 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)
 
+ -- 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]

Modified: asterisk/trunk/debian/copyright
===================================================================
--- asterisk/trunk/debian/copyright	2006-09-13 07:08:06 UTC (rev 2384)
+++ asterisk/trunk/debian/copyright	2006-09-13 07:59:42 UTC (rev 2385)
@@ -9,14 +9,16 @@
 
 Debian asterisk-xxx.dfsg.tar.gz
 ===============================
-The Debian version of the upstream asterisk source has had the fpm Music
+ * The Debian version of the upstream asterisk source has had the fpm Music
 on Hold removed as this music has only been licenced for use within 
 asterisk which is incompatible with the Debian Free Software Guildlines (DFSG)
 <http://www.debian.org/social_contract#guidelines>.
 
-The iLBC codec library code has been removed from the Debian asterisk
+ * The iLBC codec library code has been removed from the Debian asterisk
 package as it does not conform with the DFSG.
 
+ * The contrib/firmware/iax/iaxy.bin binary firmware without source has been removed.
+
 Copyright:
 
 Copyright (C) 2001-2004 Digium and others....

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2006-09-13 07:08:06 UTC (rev 2384)
+++ asterisk/trunk/debian/rules	2006-09-13 07:59:42 UTC (rev 2385)
@@ -164,7 +164,6 @@
 	chmod +x $(CURDIR)/debian/asterisk/usr/share/asterisk/bin/asterisk_fix
 	
 	mkdir -p $(CURDIR)/debian/tmp/usr/share/asterisk/firmware/iax
-	cp contrib/firmware/iax/*.bin $(CURDIR)/debian/tmp/usr/share/asterisk/firmware/iax
 	
 	# bristuff
 	$(MAKE) -C $(BRISTUFF_DIR) DESTDIR=$(CURDIR)/debian/tmp/bristuff install
@@ -232,6 +231,7 @@
 	tar xfz ../$(UPFILENAME) 
 	@@find ../tarballs/asterisk-$(UPVERSION).tmp -type f -name 'fpm-*.mp3'|xargs -r rm 
 	@@rm -rf ../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)/codecs/ilbc 
+	@@rm -rf ../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)/contrib/firmware/iax/iaxy.bin
 	@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
 	tar cfz ../$(FILENAME) *
 	@@echo Cleaning up...