[Pkg-voip-commits] r4040 - in zaptel/trunk/debian: . patches

[msp at alioth.debian.org]

Author: msp
Date: 2007-08-18 11:39:07 +0000 (Sat, 18 Aug 2007)
New Revision: 4040

Removed:
   zaptel/trunk/debian/patches/echocan_env.dpatch
   zaptel/trunk/debian/patches/zaptel_perl.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
Log:
* New Upstream Release
* Remove echocan_env.dpatch - merged upstream
* Remove zaptel_perl.dpatch - merged upstream

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-08-16 17:30:40 UTC (rev 4039)
+++ zaptel/trunk/debian/changelog	2007-08-18 11:39:07 UTC (rev 4040)
@@ -1,7 +1,10 @@
-zaptel (1:1.4.4~dfsg-2) UNRELEASED; urgency=low
+zaptel (1:1.4.5~dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
 
+  [ Mark Purcell ]
+  * New Upstream Release
+
   [ Tzafrir Cohen ]
   * zaptel_perl.dpatch: install perl modules to vendorlib rather than to
     sitelib. This fixes the zaptel-perl utilities (e.g: zaptel_hardware).
@@ -18,8 +21,12 @@
   * Add florz' patch to zaphfc; removes RTAI support. (Closes: #382227)
   * Don't fail on mknod errors; helps on vserver setups. (Closes: #411850)
 
- -- Faidon Liambotis <paravoid at debian.org>  Thu, 16 Aug 2007 09:06:46 +0300
+  [ Mark Purcell ]
+  * Remove echocan_env.dpatch - merged upstream
+  * Remove zaptel_perl.dpatch - merged upstream
 
+ -- Mark Purcell <msp at debian.org>  Sat, 18 Aug 2007 12:38:14 +0100
+
 zaptel (1:1.4.4~dfsg-1) unstable; urgency=low
 
   * New Upstream Release

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-08-16 17:30:40 UTC (rev 4039)
+++ zaptel/trunk/debian/patches/00list	2007-08-18 11:39:07 UTC (rev 4040)
@@ -1,6 +1,4 @@
 ztdiag
-echocan_env
 oslec_zaptel
-zaptel_perl
 bristuff
 zaphfc-florz

Deleted: zaptel/trunk/debian/patches/echocan_env.dpatch
===================================================================
--- zaptel/trunk/debian/patches/echocan_env.dpatch	2007-08-16 17:30:40 UTC (rev 4039)
+++ zaptel/trunk/debian/patches/echocan_env.dpatch	2007-08-18 11:39:07 UTC (rev 4040)
@@ -1,45 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ec_env.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: A hopefully non-intrusive patch to set the echo canceller from
-## DP: the build system. Add ECHO_CAN_NAME=JP1 for a noticable change
-## DP: of audio quality...
-
- at DPATCH@
-diff -urNad zaptel-1.2.17.1.xpp.r3965~/Makefile.kernel26 zaptel-1.2.17.1.xpp.r3965/Makefile.kernel26
---- zaptel-1.2.17.1.xpp.r3965~/Makefile.kernel26	2007-04-28 19:22:27.000000000 +0300
-+++ zaptel-1.2.17.1.xpp.r3965/Makefile.kernel26	2007-05-09 04:11:32.000000000 +0300
-@@ -1,4 +1,10 @@
-+ifndef ECHO_CAN_NAME
-+  ECHO_CAN_NAME	:= MG2
-+endif
-+ECHO_CAN_CFLAGS	:= -DECHO_CAN_FROMENV -DECHO_CAN_$(ECHO_CAN_NAME)
-+
- EXTRA_CFLAGS := -I$(src)
-+EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
- 
- zaptel-objs := zaptel-base.o
- 
-diff -urNad zaptel-1.2.17.1.xpp.r3965~/zconfig.h zaptel-1.2.17.1.xpp.r3965/zconfig.h
---- zaptel-1.2.17.1.xpp.r3965~/zconfig.h	2007-05-01 21:11:30.000000000 +0300
-+++ zaptel-1.2.17.1.xpp.r3965/zconfig.h	2007-05-09 04:05:41.000000000 +0300
-@@ -44,6 +44,9 @@
-  */
- /* #define CONFIG_ZAPTEL_MMX */
- 
-+/** If defined: the user must define exactly one ECH_CAN_ var: */
-+#ifndef ECHO_CAN_FROMENV 
-+
- /*
-  * Pick your echo canceller.
-  * 
-@@ -71,7 +74,7 @@
-  * MARK2 echo canceller
-  */
- /* #define AGGRESSIVE_SUPPRESSOR */
--
-+#endif /* ifndef ECHO_CAN_FROMENV */
- /*
-  * Define to turn off the echo canceler disable tone detector,
-  * which will cause zaptel to ignore the 2100 Hz echo cancel disable

Deleted: zaptel/trunk/debian/patches/zaptel_perl.dpatch
===================================================================
--- zaptel/trunk/debian/patches/zaptel_perl.dpatch	2007-08-16 17:30:40 UTC (rev 4039)
+++ zaptel/trunk/debian/patches/zaptel_perl.dpatch	2007-08-18 11:39:07 UTC (rev 4040)
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## zaptel_perl.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Point Zaptel PERL modules to the right directory under
-## DP: which to install perl modules.
-
- at DPATCH@
-diff -urNad zaptel1.2-1.2.18~dfsg~/xpp/utils/Makefile zaptel1.2-1.2.18~dfsg/xpp/utils/Makefile
---- zaptel1.2-1.2.18~dfsg~/xpp/utils/Makefile	2007-05-17 22:34:32.000000000 +0300
-+++ zaptel1.2-1.2.18~dfsg/xpp/utils/Makefile	2007-06-11 09:51:13.000000000 +0300
-@@ -24,7 +24,7 @@
- MANDIR		= $(mandir)/man8
- HOTPLUG_USB_DIR	= /etc/hotplug/usb
- UDEV_RULES_DIR	= /etc/udev/rules.d
--PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
-+PERLLIBDIR	= $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
- PERL_DIRS	:= Zaptel Zaptel/Hardware Zaptel/Xpp
- PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
- PERL_MODS	:= $(shell cd zconf; echo $(PERL_MODS_PAT))