[Pkg-voip-commits] r8281 - in /dahdi-linux/trunk/debian: changelog patches/chanmute patches/dahdi_linux_extra patches/no_dummy patches/no_firmware_download patches/series patches/wcb4xxp_extra_trunk rules
tzafrir at alioth.debian.org
tzafrir at alioth.debian.org
Mon Apr 19 18:28:04 UTC 2010
Author: tzafrir
Date: Mon Apr 19 18:28:02 2010
New Revision: 8281
URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=8281
Log:
* New upstream version - 2.3.0 (Closes: #546319).
* Patch no_dummy removed: merged upstream.
* Patch wcb4xxp_extra_trunk: merged upstream.
Removed:
dahdi-linux/trunk/debian/patches/no_dummy
dahdi-linux/trunk/debian/patches/wcb4xxp_extra_trunk
Modified:
dahdi-linux/trunk/debian/changelog
dahdi-linux/trunk/debian/patches/chanmute
dahdi-linux/trunk/debian/patches/dahdi_linux_extra
dahdi-linux/trunk/debian/patches/no_firmware_download
dahdi-linux/trunk/debian/patches/series
dahdi-linux/trunk/debian/rules
Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=8281&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Mon Apr 19 18:28:02 2010
@@ -1,3 +1,11 @@
+dahdi-linux (1:2.3.0+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream version (Closes: #546319).
+ * Patch no_dummy removed: merged upstream.
+ * Patch wcb4xxp_extra_trunk: merged upstream.
+
+ -- Tzafrir Cohen <tzafrir at debian.org> Mon, 19 Apr 2010 21:04:30 +0300
+
dahdi-linux (1:2.2.1.1+dfsg-1) unstable; urgency=low
* New upstream minor release.
Modified: dahdi-linux/trunk/debian/patches/chanmute
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/chanmute?rev=8281&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/chanmute (original)
+++ dahdi-linux/trunk/debian/patches/chanmute Mon Apr 19 18:28:02 2010
@@ -16,4 +16,4 @@
+#define OPTIMIZE_CHANMUTE
-
+ /*
Modified: dahdi-linux/trunk/debian/patches/dahdi_linux_extra
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/dahdi_linux_extra?rev=8281&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/dahdi_linux_extra (original)
+++ dahdi-linux/trunk/debian/patches/dahdi_linux_extra Mon Apr 19 18:28:02 2010
@@ -1,21 +1,22 @@
Subject: dahdi-extra: out-of-tree DAHDI drivers
Origin: http://git.tzafrir.org.il/?p=dahdi-extra.git
Forwarded: No
-Last-Update: 2010-03-10
+Last-Update: 2010-04-19
This patch includes a number of out-of-tree DAHDI drivers from the
dahdi-extra repository. They are all out-of-tree and are highly likely
not to be included in DAHDI-linux in the forseeable future.
-Git-Commit: a50c69e27aeed2e66e6a7a8feedab30c9628b862
-
+Git-Commit: dc5f7b425aaca0db635a54c96d6e4b90212d94d9
+---
+
diff -urN dahdi-svn-orig/drivers/dahdi/Kbuild dahdi-svn-new/drivers/dahdi/Kbuild
---- dahdi-svn-orig/drivers/dahdi/Kbuild 2009-06-13 01:30:02.000000000 +0300
-+++ dahdi-svn-new/drivers/dahdi/Kbuild 2010-03-10 20:49:40.000000000 +0200
-@@ -1,10 +1,16 @@
+--- dahdi-svn-orig/drivers/dahdi/Kbuild 2010-02-25 21:10:02.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/Kbuild 2010-04-19 21:02:04.000000000 +0300
+@@ -1,9 +1,15 @@
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI) += dahdi.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_OPVXA1200) += opvxa1200.o
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o
+ #obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DUMMY) += dahdi_dummy.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCOPENPCI) += wcopenpci.o
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC) += dahdi_dynamic.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ZAPHFC) += zaphfc/
@@ -23,16 +24,15 @@
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_ECHO) += ../staging/echo/
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETH) += dahdi_dynamic_eth.o
+obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_ECHOCAN_OSLEC) += dahdi_echocan_oslec.o
+ obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_DYNAMIC_ETHMF) += dahdi_dynamic_ethmf.o
++
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_TRANSCODE) += dahdi_transcode.o
-+
obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCT4XXP) += wct4xxp/
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTC4XXP) += wctc4xxp/
- obj-$(DAHDI_BUILD_ALL)$(CONFIG_DAHDI_WCTDM24XXP) += wctdm24xxp/
diff -urN dahdi-svn-orig/drivers/dahdi/Kconfig dahdi-svn-new/drivers/dahdi/Kconfig
---- dahdi-svn-orig/drivers/dahdi/Kconfig 2009-04-29 20:48:39.000000000 +0300
-+++ dahdi-svn-new/drivers/dahdi/Kconfig 2010-03-10 20:49:40.000000000 +0200
-@@ -279,3 +279,54 @@
+--- dahdi-svn-orig/drivers/dahdi/Kconfig 2010-02-25 21:10:02.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/Kconfig 2010-04-19 21:02:04.000000000 +0300
+@@ -292,3 +292,54 @@
If unsure, say Y.
source "drivers/dahdi/xpp/Kconfig"
@@ -89,7 +89,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/opvxa1200.c dahdi-svn-new/drivers/dahdi/opvxa1200.c
--- dahdi-svn-orig/drivers/dahdi/opvxa1200.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/opvxa1200.c 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/opvxa1200.c 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,3018 @@
+/*
+ * OpenVox A1200P FXS/FXO Interface Driver for DAHDI Telephony interface
@@ -3111,7 +3111,7 @@
+module_exit(wctdm_cleanup);
diff -urN dahdi-svn-orig/drivers/dahdi/wcopenpci.c dahdi-svn-new/drivers/dahdi/wcopenpci.c
--- dahdi-svn-orig/drivers/dahdi/wcopenpci.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/wcopenpci.c 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/wcopenpci.c 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,1842 @@
+/*
+ * Voicetronix OpenPCI Interface Driver for Zapata Telephony interface
@@ -4957,7 +4957,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/base.c dahdi-svn-new/drivers/dahdi/zaphfc/base.c
--- dahdi-svn-orig/drivers/dahdi/zaphfc/base.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/base.c 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/base.c 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,1706 @@
+/*
+ * zaphfc.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -6667,7 +6667,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.c dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c
--- dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.c 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,375 @@
+/*
+ * fifo.c - HFC FIFO management routines
@@ -7046,7 +7046,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.h dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h
--- dahdi-svn-orig/drivers/dahdi/zaphfc/fifo.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/fifo.h 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,139 @@
+/*
+ * fifo.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -7189,7 +7189,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/Kbuild dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild
--- dahdi-svn-orig/drivers/dahdi/zaphfc/Kbuild 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/Kbuild 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,10 @@
+obj-m += zaphfc.o
+
@@ -7203,7 +7203,7 @@
+
diff -urN dahdi-svn-orig/drivers/dahdi/zaphfc/zaphfc.h dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h
--- dahdi-svn-orig/drivers/dahdi/zaphfc/zaphfc.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/dahdi/zaphfc/zaphfc.h 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,414 @@
+/*
+ * zaphfc.h - Dahdi driver for HFC-S PCI A based ISDN BRI cards
@@ -7621,7 +7621,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/staging/echo/echo.c dahdi-svn-new/drivers/staging/echo/echo.c
--- dahdi-svn-orig/drivers/staging/echo/echo.c 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/echo.c 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/echo.c 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,662 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8287,7 +8287,7 @@
+MODULE_VERSION("0.3.0");
diff -urN dahdi-svn-orig/drivers/staging/echo/echo.h dahdi-svn-new/drivers/staging/echo/echo.h
--- dahdi-svn-orig/drivers/staging/echo/echo.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/echo.h 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/echo.h 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,175 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8466,7 +8466,7 @@
+#endif /* __ECHO_H */
diff -urN dahdi-svn-orig/drivers/staging/echo/fir.h dahdi-svn-new/drivers/staging/echo/fir.h
--- dahdi-svn-orig/drivers/staging/echo/fir.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/fir.h 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/fir.h 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,286 @@
+/*
+ * SpanDSP - a series of DSP components for telephony
@@ -8756,7 +8756,7 @@
+#endif
diff -urN dahdi-svn-orig/drivers/staging/echo/Kbuild dahdi-svn-new/drivers/staging/echo/Kbuild
--- dahdi-svn-orig/drivers/staging/echo/Kbuild 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/Kbuild 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/Kbuild 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,6 @@
+ifdef DAHDI_USE_MMX
+EXTRA_CFLAGS += -DUSE_MMX
@@ -8766,7 +8766,7 @@
+obj-m += echo.o
diff -urN dahdi-svn-orig/drivers/staging/echo/mmx.h dahdi-svn-new/drivers/staging/echo/mmx.h
--- dahdi-svn-orig/drivers/staging/echo/mmx.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/mmx.h 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/mmx.h 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,288 @@
+/*
+ * mmx.h
@@ -9058,7 +9058,7 @@
+#endif /* AVCODEC_I386MMX_H */
diff -urN dahdi-svn-orig/drivers/staging/echo/oslec.h dahdi-svn-new/drivers/staging/echo/oslec.h
--- dahdi-svn-orig/drivers/staging/echo/oslec.h 1970-01-01 02:00:00.000000000 +0200
-+++ dahdi-svn-new/drivers/staging/echo/oslec.h 2010-03-10 20:49:40.000000000 +0200
++++ dahdi-svn-new/drivers/staging/echo/oslec.h 2010-04-19 21:02:04.000000000 +0300
@@ -0,0 +1,94 @@
+/*
+ * OSLEC - A line echo canceller. This code is being developed
Modified: dahdi-linux/trunk/debian/patches/no_firmware_download
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/no_firmware_download?rev=8281&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/no_firmware_download (original)
+++ dahdi-linux/trunk/debian/patches/no_firmware_download Mon Apr 19 18:28:02 2010
@@ -17,5 +17,5 @@
-prereq: include/dahdi/version.h firmware-loaders
+prereq: include/dahdi/version.h
- stackcheck: checkstack modules
- ./checkstack kernel/*.ko kernel/*/*.ko
+ stackcheck: $(CHECKSTACK) modules
+ objdump -d drivers/dahdi/*.ko drivers/dahdi/*/*.ko | $(CHECKSTACK)
Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=8281&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Mon Apr 19 18:28:02 2010
@@ -4,5 +4,3 @@
mmx_auto
uk_rotary
chanmute
-no_dummy
-wcb4xxp_extra_trunk
Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=8281&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Mon Apr 19 18:28:02 2010
@@ -35,7 +35,7 @@
UPFILENAME := $(PACKAGE_SRC)_$(UPVERSION).orig.tar.gz
FILENAME := $(PACKAGE_SRC)_$(DEB_BASE_VERSION).orig.tar.gz
-URL := http://downloads.digium.com/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz
+URL := http://downloads.asterisk.org/pub/telephony/$(PACKAGE_SRC)/releases/$(PACKAGE_SRC)-$(UPVERSION).tar.gz
# If the makefile was properly-writen, there was a good separation
# between kernel and userspace. As things stand now I'd like to work
More information about the Pkg-voip-commits
mailing list