[Pkg-voip-commits] r5811 - in /zaptel/trunk/debian: changelog patches/00list patches/beronet patches/series patches/xpp_fix_t1

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Thu May 29 10:32:27 2008
New Revision: 5811

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5811
Log:
* New upstream release.
* Patch xpp_fix_t1 dropped: merged upstream.
* Finally removing 00list.

Removed:
    zaptel/trunk/debian/patches/00list
    zaptel/trunk/debian/patches/xpp_fix_t1
Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/beronet
    zaptel/trunk/debian/patches/series

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5811&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Thu May 29 10:32:27 2008
@@ -1,4 +1,4 @@
-zaptel (1:1.4.10.1~dfsg-2) UNRELEASED; urgency=low
+zaptel (1:1.4.11~dfsg-1) UNRELEASED; urgency=low
 
   [Faidon Liambotis]
   * Update qozap from bristuff-0.4.0-RC1.
@@ -14,6 +14,9 @@
     - added AT commands for shutting down/starting GSM modules
 
   [Tzafrir Cohen]
+  * New upstream release.
+  * Patch xpp_fix_t1 dropped: merged upstream.
+  * Finally removing 00list.
   * Patch sigcap_dacs: tell zaphfc and vzaphfc to report support for
     ZT_SIG_DACS. Makes ztscan report then as digital spans.
 

Modified: zaptel/trunk/debian/patches/beronet
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/beronet?rev=5811&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/beronet (original)
+++ zaptel/trunk/debian/patches/beronet Thu May 29 10:32:27 2008
@@ -4,8 +4,8 @@
 ## Source: http://blog.eth0.cc/zaptel-patchwork/
 
 diff -urNad zaptel-1.4.7.1~dfsg~/cwain/cwain.c zaptel-1.4.7.1~dfsg/cwain/cwain.c
---- zaptel-1.4.7.1~dfsg~/cwain/cwain.c	2007-12-30 10:26:20.000000000 +0200
-+++ zaptel-1.4.7.1~dfsg/cwain/cwain.c	2007-12-30 10:44:27.000000000 +0200
+--- zaptel-1.4.7.1~dfsg~/kernel/cwain/cwain.c	2007-12-30 10:26:20.000000000 +0200
++++ zaptel-1.4.7.1~dfsg/kernel/cwain/cwain.c	2007-12-30 10:44:27.000000000 +0200
 @@ -12,6 +12,13 @@
   * This program is free software and may be modified and
   * distributed under the terms of the GNU Public License.
@@ -179,9 +179,9 @@
  	    dips = (cwain_inb(cwaintmp,cwain_R_GPI_IN0) >> 5);
  	    cid = 7;
  	    for (i=0;i<3;i++) {
-diff -urNad zaptel-1.4.7.1~dfsg~/qozap/qozap.c zaptel-1.4.7.1~dfsg/qozap/qozap.c
---- zaptel-1.4.7.1~dfsg~/qozap/qozap.c	2007-12-30 10:26:21.000000000 +0200
-+++ zaptel-1.4.7.1~dfsg/qozap/qozap.c	2007-12-30 10:44:21.000000000 +0200
+diff -urNad qozap/qozap.c qozap/qozap.c
+--- a/kernel/qozap/qozap.c	2007-12-30 10:26:21.000000000 +0200
++++ b/kernel/qozap/qozap.c	2007-12-30 10:44:21.000000000 +0200
 @@ -9,6 +9,14 @@
   * This program is free software and may be modified and
   * distributed under the terms of the GNU Public License.
@@ -210,8 +210,8 @@
      */
  	    qoz_outb(qoztmp,qoz_R_GPIO_OUT1, leds);
  
--    } else if ((qoztmp->type == 0xb556) && (qoztmp->stports == 2)){
-+    } else if (((qoztmp->type == 0xb556) || (qoztmp->type == 0xb566)) && (qoztmp->stports == 2)){
+-    } else if (((qoztmp->type == 0xb556) || (qoztmp->type == 0xb751)) && (qoztmp->stports == 2)){
++    } else if (((qoztmp->type == 0xb556) || (qoztmp->type == 0xb566) || (qoztmp->type == 0xb751)) && (qoztmp->stports == 2)){
  	    qoz_outb(qoztmp,qoz_R_GPIO_SEL,0x80 | 0x40 | 0x20 | 0x10);
      	    qoz_outb(qoztmp,qoz_R_GPIO_EN1,0xff);
  	    leds = 0x0;
@@ -257,23 +257,6 @@
          qoz_outb(qoztmp,qoz_R_FIFO_MD,0x16);
      } else {
          qoz_outb(qoztmp,qoz_R_FIFO_MD,0x26);
-@@ -335,13 +343,13 @@
- 	    qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x0); 
- 	} else if (qoztmp->type == 0xb550) {
- 	    qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x20); 
--	} else if (qoztmp->type == 0xb556) {
-+	} else if ((qoztmp->type == 0xb556) || (qoztmp->type == 0xb566)) {
- 	    qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x20); 
- 	} else if (qoztmp->type == 0xb557) {
- 	    qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x20); 
--	} else if (qoztmp->type == 0xb558) {
-+	} else if ((qoztmp->type == 0xb558) || (qoztmp->type == 0xb568)) {
- 	    qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x20); 
--	} else if (qoztmp->type == 0xb520) {
-+	} else if ((qoztmp->type == 0xb520) || (qoztmp->type == 0xb560)) {
- 	    qoz_outb(qoztmp,qoz_R_BRG_PCM_CFG,0x20); 
- 	} else {
- 	    /* you are on your own here! */
 @@ -360,11 +368,11 @@
      qoztmp->leds[6] = 0x0;
      qoztmp->leds[7] = 0x0;

Modified: zaptel/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/series?rev=5811&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/series (original)
+++ zaptel/trunk/debian/patches/series Thu May 29 10:32:27 2008
@@ -6,5 +6,4 @@
 ztcfg-start_stop
 zaphfc-florz
 zaptel_perl
-xpp_fix_t1
 #sigcap_dacs