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

[Mark Purcell]

Author: msp
Date: 2006-12-02 14:34:54 +0100 (Sat, 02 Dec 2006)
New Revision: 2774

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch
Log:
* New Upstream Release
  - Fixes: Fails to build with pristine upstream kernel, very recent version
  (Closes: #400705)
  - Fixes: Please package version 1.2.11 (Closes: #399634)
* Cleanup debian/patches/wct4xxp-dfsg.dpatch

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-12-02 13:31:30 UTC (rev 2773)
+++ zaptel/trunk/debian/changelog	2006-12-02 13:34:54 UTC (rev 2774)
@@ -1,6 +1,7 @@
-zaptel (1:1.2.10.dfsg-3) UNRELEASED; urgency=low
+zaptel (1:1.2.11.dfsg-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+
   [ Tzafrir Cohen ]
   * Reverting my changes from 1:1.2.9.1.dfsg-2. Moved to the experimental
     branch.
@@ -9,8 +10,15 @@
   * Remove bogus zaptel-modules from being Recommends (Closes: #387961)
   * Update vzaphfc as proposed by Jens Wilke
 
- -- Kilian Krause <kilian at debian.org>  Sun, 26 Nov 2006 20:35:48 +0100
+  [ Mark Purcell ]
+  * New Upstream Release
+    - Fixes: Fails to build with pristine upstream kernel, very recent version
+    (Closes: #400705)
+    - Fixes: Please package version 1.2.11 (Closes: #399634)
+  * Cleanup debian/patches/wct4xxp-dfsg.dpatch
 
+ -- Mark Purcell <msp at debian.org>  Sat,  2 Dec 2006 13:34:34 +0000
+
 zaptel (1:1.2.10.dfsg-2) unstable; urgency=low
 
   * bristuff-0.3.0-PRE-1v

Modified: zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch
===================================================================
--- zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch	2006-12-02 13:31:30 UTC (rev 2773)
+++ zaptel/trunk/debian/patches/wct4xxp-dfsg.dpatch	2006-12-02 13:34:54 UTC (rev 2774)
@@ -8,15 +8,15 @@
 ## DP: TE4XXP card (and most users do not have those modules).
 
 @DPATCH@
-diff -urNad trunk~/wct4xxp/Kbuild trunk/wct4xxp/Kbuild
---- trunk~/wct4xxp/Kbuild	2006-08-27 12:02:42.000000000 +1000
-+++ trunk/wct4xxp/Kbuild	2006-10-09 13:14:30.000000000 +1000
+diff -urNad zaptel-1.2.11.dfsg~/wct4xxp/Kbuild zaptel-1.2.11.dfsg/wct4xxp/Kbuild
+--- zaptel-1.2.11.dfsg~/wct4xxp/Kbuild	2006-11-05 06:44:13.000000000 +0000
++++ zaptel-1.2.11.dfsg/wct4xxp/Kbuild	2006-12-02 13:25:37.000000000 +0000
 @@ -12,7 +12,7 @@
  $(obj)/base.o: $(src)/vpm450m.h $(src)/wct4xxp.h
  $(obj)/base.o: $(src)/../zaptel.h
  
--$(obj)/vpm450m.o: $(obj)/vpm450m_fw.h $(src)/vpm450m.h
+-$(obj)/vpm450m.o: $(obj)/vpmoct128_fw.h $(obj)/vpmoct064_fw.h $(src)/vpm450m.h
 +$(obj)/vpm450m.o: $(src)/vpm450m.h
  $(obj)/vpm450m.o: $(src)/../oct612x/include/oct6100api/oct6100_api.h
  
- $(obj)/vpm450m_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h
+ $(obj)/vpmoct128_fw.h: $(src)/OCT6114-128D.ima $(obj)/fw2h