[Pkg-voip-commits] [dahdi-linux] 02/04: Bump version: 1:2.11.1.0.20170917~dfsg-1

[tzafrir at debian.org]

This is an automated email from the git hooks/post-receive script.

tzafrir pushed a commit to branch master
in repository dahdi-linux.

commit e3978f340ccbe203a79e02169372693e4c0914b6
Author: Tzafrir Cohen <tzafrir at debian.org>
Date:   Sun Sep 17 08:00:05 2017 +0300

    Bump version: 1:2.11.1.0.20170917~dfsg-1
    
    wcfxo-wctdm-set-spantype.patch dropped: merged upstream
---
 debian/changelog                              |  7 +++++
 debian/patches/series                         |  1 -
 debian/patches/wcfxo-wctdm-set-spantype.patch | 37 ---------------------------
 3 files changed, 7 insertions(+), 38 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81a9e33..aa7aa94 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dahdi-linux (1:2.11.1.0.20170917~dfsg-1) UNRELEASED; urgency=medium
+
+  * New upstream git snapshot (Closes: #872838)
+    - debian/patches/wcfxo-wctdm-set-spantype.patch dropped: merged upsteram
+
+ -- Tzafrir Cohen <tzafrir at debian.org>  Sun, 17 Sep 2017 07:58:42 +0300
+
 dahdi-linux (1:2.11.1~dfsg-1) unstable; urgency=medium
 
   [ Tzafrir Cohen ]
diff --git a/debian/patches/series b/debian/patches/series
index 66fbae3..0d1c5d2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,4 +6,3 @@ notest
 tor2-request_firmware
 pciradio-request_firmware
 hotplug_mod_params
-wcfxo-wctdm-set-spantype.patch
diff --git a/debian/patches/wcfxo-wctdm-set-spantype.patch b/debian/patches/wcfxo-wctdm-set-spantype.patch
deleted file mode 100644
index 4507167..0000000
--- a/debian/patches/wcfxo-wctdm-set-spantype.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From e3a3d19d2a22ce397ed742bebb978795b902025f Mon Sep 17 00:00:00 2001
-From: Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Date: Wed, 21 Sep 2016 11:51:45 +0300
-Subject: [PATCH] wcfxo, wctdm: set spantype
-
----
- drivers/dahdi/wcfxo.c |    1 +
- drivers/dahdi/wctdm.c |    1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/drivers/dahdi/wcfxo.c b/drivers/dahdi/wcfxo.c
-index b79d2fe..bf1d467 100644
---- a/drivers/dahdi/wcfxo.c
-+++ b/drivers/dahdi/wcfxo.c
-@@ -685,6 +685,7 @@ static int wcfxo_initialize(struct wcfxo *wc)
- 
- 	wc->chan->pvt = wc;
- 	wc->span.ops = &wcfxo_span_ops;
-+	wc->span.spantype = SPANTYPE_ANALOG_FXO;
- 	list_add_tail(&wc->span.device_node, &wc->ddev->spans);
- 	if (dahdi_register_device(wc->ddev, &wc->dev->dev)) {
- 		printk(KERN_NOTICE "Unable to register span with DAHDI\n");
-diff --git a/drivers/dahdi/wctdm.c b/drivers/dahdi/wctdm.c
-index 9f43e52..cf5a537 100644
---- a/drivers/dahdi/wctdm.c
-+++ b/drivers/dahdi/wctdm.c
-@@ -2411,6 +2411,7 @@ static int wctdm_initialize(struct wctdm *wc)
- 	wc->span.channels = NUM_CARDS;
- 	wc->span.flags = DAHDI_FLAG_RBS;
- 	wc->span.ops = &wctdm_span_ops;
-+	wc->span.spantype = SPANTYPE_ANALOG_MIXED;
- 
- 	list_add_tail(&wc->span.device_node, &wc->ddev->spans);
- 	if (dahdi_register_device(wc->ddev, &wc->dev->dev)) {
--- 
-1.7.9.5
-

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/dahdi-linux.git