[Pkg-voip-commits] r4503 - in /zaptel/trunk/debian: changelog patches/oslec_zaptel.dpatch rules zaptel.lintian

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sun Sep 16 05:56:56 2007
New Revision: 4503

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=4503
Log:
* Don't build oslec if it is not the Zaptel echo canceller.
* Adjust line numbers in Lintian ignore file.

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/oslec_zaptel.dpatch
    zaptel/trunk/debian/rules
    zaptel/trunk/debian/zaptel.lintian

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=4503&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Sun Sep 16 05:56:56 2007
@@ -14,8 +14,10 @@
   * vzaphfc: fix building with Sarge 2.6 kernels.
   * Fix asciidoc buildign in Sarge (temporary fix, until we get upstream fix
     in 1.4.6).
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 15 Sep 2007 04:43:53 +0300
+  * Don't build oslec if it is not the Zaptel echo canceller.
+  * Adjust line numbers in Lintian ignore file.
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sun, 16 Sep 2007 07:14:52 +0200
 
 zaptel (1:1.4.5.1~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/oslec_zaptel.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/oslec_zaptel.dpatch?rev=4503&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/oslec_zaptel.dpatch (original)
+++ zaptel/trunk/debian/patches/oslec_zaptel.dpatch Sun Sep 16 05:56:56 2007
@@ -6,18 +6,6 @@
 ## DP: canceller. The zaptap device is not included.
 
 @DPATCH@
-diff -urNad zaptel-1.4.3~dfsg~/Makefile.kernel26 zaptel-1.4.3~dfsg/Makefile.kernel26
---- zaptel-1.4.3~dfsg~/Makefile.kernel26	2007-06-16 21:33:45.000000000 +0300
-+++ zaptel-1.4.3~dfsg/Makefile.kernel26	2007-06-16 21:36:02.000000000 +0300
-@@ -6,6 +6,8 @@
- EXTRA_CFLAGS := -I$(src)
- EXTRA_CFLAGS += $(ECHO_CAN_CFLAGS)
- 
-+obj-m		+= oslec/
-+
- zaptel-objs := zaptel-base.o
- 
- ifeq ($(HPEC_PRESENT),yes)
 diff -urNad zaptel-1.4.3~dfsg~/zaptel-base.c zaptel-1.4.3~dfsg/zaptel-base.c
 --- zaptel-1.4.3~dfsg~/zaptel-base.c	2007-06-16 21:33:45.000000000 +0300
 +++ zaptel-1.4.3~dfsg/zaptel-base.c	2007-06-16 21:33:47.000000000 +0300

Modified: zaptel/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/rules?rev=4503&op=diff
==============================================================================
--- zaptel/trunk/debian/rules (original)
+++ zaptel/trunk/debian/rules Sun Sep 16 05:56:56 2007
@@ -42,7 +42,6 @@
 GENERATED_SOURCES := version.h radfw.h tor2fw.h tones.h 
 
 EXTRA_MODS=ds1x1f opvxa1200
-EXTRA_SUBDIRS=oslec
 
 MOD_EXAMPLES_DIR:=modexamples
 ifeq (1,$(USE_BRISTUFF))
@@ -51,7 +50,11 @@
   # directory.
   GENERATED_SOURCES+=$(BRISTUFF_MODULES:%=%.c) $(BRISTUFF_MODULES:%=%.h)
   EXTRA_MODS+=$(BRISTUFF_MODULES)
-  EXTRA_SUBDIRS=vzaphfc
+  EXTRA_SUBDIRS += vzaphfc
+endif
+
+ifeq ($(ECHO_CAN_NAME),OSLEC)
+  EXTRA_SUBDIRS += oslec
 endif
 
 MOD_ARGS=MODULES_EXTRA="$(EXTRA_MODS)" SUBDIRS_EXTRA="$(EXTRA_SUBDIRS)"

Modified: zaptel/trunk/debian/zaptel.lintian
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/zaptel.lintian?rev=4503&op=diff
==============================================================================
--- zaptel/trunk/debian/zaptel.lintian (original)
+++ zaptel/trunk/debian/zaptel.lintian Sun Sep 16 05:56:56 2007
@@ -2,4 +2,5 @@
 zaptel: mknod-in-maintainer-script postinst:32
 zaptel: mknod-in-maintainer-script postinst:33
 zaptel: mknod-in-maintainer-script postinst:34
-zaptel: mknod-in-maintainer-script postinst:38
+zaptel: mknod-in-maintainer-script postinst:35
+zaptel: mknod-in-maintainer-script postinst:40