[Pkg-voip-commits] r2989 - in asterisk/trunk/debian: . patches

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2007-01-09 18:21:55 +0100 (Tue, 09 Jan 2007)
New Revision: 2989

Modified:
   asterisk/trunk/debian/control
   asterisk/trunk/debian/patches/00list
   asterisk/trunk/debian/rules
Log:
Build Asterisk with the system libedit (a newer version of editline) rather 
than the bundeled editline.

Libedit has a GPL-compatible license, yey!


Modified: asterisk/trunk/debian/control
===================================================================
--- asterisk/trunk/debian/control	2007-01-09 16:14:12 UTC (rev 2988)
+++ asterisk/trunk/debian/control	2007-01-09 17:21:55 UTC (rev 2989)
@@ -4,7 +4,7 @@
 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>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Simon Richter <sjr at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 Standards-Version: 3.6.1
-Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.2.3-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev (>= 1.1.12-3), graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), dpkg ( >= 1.13.19), libogg-dev, libvorbis-dev
+Build-Depends: debhelper (>= 4.0.4), sed (>= 3.95), zlib1g-dev, libreadline5-dev, libgsm1-dev, libssl-dev, libzap-dev, libtonezone-dev (>= 1:1.2.3-1), bison, libasound2-dev, libpq-dev, unixodbc-dev, libpri-dev (>= 1.2.3-1), dpatch (>= 2.0.10), zaptel-source (>= 1:1.2.3-1), autotools-dev, libnewt-dev, libsqlite-dev, libspeex-dev (>= 1.1.12-3), graphviz, libcurl3-dev, doxygen, gsfonts, libpopt-dev, libopenh323-dev (>= 1.17.4-1), dpkg ( >= 1.13.19), libogg-dev, libvorbis-dev, libedit-dev
 
 Package: asterisk
 Architecture: all

Modified: asterisk/trunk/debian/patches/00list
===================================================================
--- asterisk/trunk/debian/patches/00list	2007-01-09 16:14:12 UTC (rev 2988)
+++ asterisk/trunk/debian/patches/00list	2007-01-09 17:21:55 UTC (rev 2989)
@@ -7,7 +7,7 @@
 50_debian-libgsm.dpatch
 #95_conf_sample.dpatch
 98_fpm-sounds.dpatch
-#sys_readline
+sys_editline
 func_odbc_12
 brazilian_syntax
 vm_he

Modified: asterisk/trunk/debian/rules
===================================================================
--- asterisk/trunk/debian/rules	2007-01-09 16:14:12 UTC (rev 2988)
+++ asterisk/trunk/debian/rules	2007-01-09 17:21:55 UTC (rev 2989)
@@ -54,22 +54,6 @@
 	dh_testdir
 	# Add here commands to configure the package.
 	touch .cleancount
-	- (cd editline ; \
-	if [ -f config.sub.old ]; then \
-	  rm -f config.sub; \
-	else \
-	  mv config.sub config.sub.old; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	  rm -f config.guess; \
-	else \
-	  mv config.guess config.guess.old; \
-	fi; \
-	ln -s /usr/share/misc/config.sub config.sub; \
-	ln -s /usr/share/misc/config.guess config.guess; \
-	cd ..)
-
-	cd editline;./configure $(confflags)
 	touch $@
 
 debian/build/asterisk-bristuff/config.status: config.status check-sounds patch-stamp
@@ -80,8 +64,6 @@
 	set -e; cd $(BRISTUFF_DIR) ; \
 	  patch -p1 <../../patches/bristuff.dpatch ; \
 	  patch -p1 <../../patches/libpri_bristuffed.dpatch 
-	
-	cd $(BRISTUFF_DIR)/editline; ./configure $(confflags)
 	touch $@
 
 build-arch: build-arch-stamp
@@ -126,14 +108,6 @@
 	#-$(RM) -f fxstest ztmonitor ztspeed zttest
 	-$(RM) -fR doc/api agi/eagi-test agi/eagi-sphinx-test
 	-$(RM) debian/asterisk.8.gz
-	-(test -d editline &&cd editline; \
-	if [ -f config.sub.old ]; then \
-	   mv config.sub.old config.sub; \
-	fi; \
-	if [ -f config.guess.old ]; then \
-	   mv config.guess.old config.guess; \
-	fi; \
-	cd ..)
 	-test -d configs && chmod -x configs/*.sample
 	-$(RM) -f build-arch-stamp build-indep-stamp config.status check-sounds
 
@@ -230,6 +204,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)/codecs/ilbc 
 	@@rm -rf ../tarballs/asterisk-$(UPVERSION).tmp/asterisk-$(UPVERSION)/contrib/firmware/
 	@@cd ../tarballs/asterisk-$(UPVERSION).tmp ; \
 	tar cfz ../$(FILENAME) *