[Pkg-voip-commits] r3659 - in zaptel1.2/trunk/debian: . patches

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Mon Jun 11 07:50:19 UTC 2007 

Author: tzafrir-guest
Date: 2007-06-11 07:50:19 +0000 (Mon, 11 Jun 2007)
New Revision: 3659

Added:
   zaptel1.2/trunk/debian/patches/man_fixes.dpatch
Modified:
   zaptel1.2/trunk/debian/changelog
   zaptel1.2/trunk/debian/patches/00list
   zaptel1.2/trunk/debian/patches/Makefile_deps_utils.dpatch
   zaptel1.2/trunk/debian/patches/bristuff.dpatch
   zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch
Log:
* New upstream release: 1.2.18.
* Bristuff 0.3.0-PRE-1y-g .
* Makefile_deps_utils.diff: fixed for 1.2.18.
* man_fixes.dpatch: man pages fixes from upstream subversion.


Modified: zaptel1.2/trunk/debian/changelog
===================================================================
--- zaptel1.2/trunk/debian/changelog	2007-06-10 20:45:10 UTC (rev 3658)
+++ zaptel1.2/trunk/debian/changelog	2007-06-11 07:50:19 UTC (rev 3659)
@@ -1,11 +1,7 @@
-zaptel1.2 (1:1.2.17.1~dfsg-1) UNRELEASED; urgency=low
+zaptel1.2 (1:1.2.18~dfsg-1) UNRELEASED; urgency=low
 
-  [ Kilian Krause ]
-  * NOT YET RELEASED
-
-  [ Tzafrir Cohen ]
   * New upstream release.
-  * Bristuff 0.3.0-PRE-1y-f .
+  * Bristuff 0.3.0-PRE-1y-g .
   * There shouldn't be a conflict between this package and the zaptel-source
     of 1.4 (different location for headers).
   * The modules packages should provide zaptel-modules (whatever this means).
@@ -15,8 +11,10 @@
   * s/zaptel1.2/$(PREFIX)
   * Including fxotune from 1.4 (sadly its man page is not et up-to-date)
     as it is much improved.
+  * Makefile_deps_utils.diff: fixed for 1.2.18.
+  * man_fixes.dpatch: man pages fixes from upstream subversion.
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Wed,  6 Jun 2007 09:03:34 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 11 Jun 2007 10:24:48 +0300
 
 zaptel (1:1.2.16~dfsg-1) unstable; urgency=low
 

Modified: zaptel1.2/trunk/debian/patches/00list
===================================================================
--- zaptel1.2/trunk/debian/patches/00list	2007-06-10 20:45:10 UTC (rev 3658)
+++ zaptel1.2/trunk/debian/patches/00list	2007-06-11 07:50:19 UTC (rev 3659)
@@ -17,3 +17,4 @@
 xpp_all_platforms
 zaptel_perl
 conglomerate_fixes
+man_fixes

Modified: zaptel1.2/trunk/debian/patches/Makefile_deps_utils.dpatch
===================================================================
--- zaptel1.2/trunk/debian/patches/Makefile_deps_utils.dpatch	2007-06-10 20:45:10 UTC (rev 3658)
+++ zaptel1.2/trunk/debian/patches/Makefile_deps_utils.dpatch	2007-06-11 07:50:19 UTC (rev 3659)
@@ -11,8 +11,8 @@
 +++ /tmp/dpep.GxuAYU/zaptel-1.2.0-0beta1/Makefile	2005-09-10 18:43:28.224686623 +0300
 @@ -109,7 +109,10 @@
  
- MOD_DESTDIR:=zaptel
- 
+ MANDIR			= /usr/share/man/man8
+ MAN_PAGES_BASE		= ztcfg 
 -BINS=ztcfg torisatool makefw ztmonitor ztspeed zttest fxotune
 +BINS=ztcfg ztmonitor ztspeed zttest fxotune
 +UTILS:=tor2ee ztspeed zttool ztmonitor sethdlc-new \
@@ -20,7 +20,7 @@
 +UTILSO:=$(UTILS:%=%.o)
  ifneq (,$(wildcard /usr/include/newt.h))
  BINS+=zttool
- endif
+ MAN_PAGES_BASE		+= zttool
 @@ -173,8 +176,7 @@
  
  tor2ee.o: tor2-hw.h
@@ -93,8 +93,8 @@
 +fxotune: LDFLAGS+=-lm
 +fxsdump: LDFLAGS+=-lm
  
- stackcheck: checkstack $(BUILDVER)
- 	./checkstack *.o
+ stackcheck: checkstack all
+ 	./checkstack *.ko */*.ko
  
 -ztdiag: ztdiag.o 
 -	$(CC) -o $@ $^

Modified: zaptel1.2/trunk/debian/patches/bristuff.dpatch
===================================================================
--- zaptel1.2/trunk/debian/patches/bristuff.dpatch	2007-06-10 20:45:10 UTC (rev 3658)
+++ zaptel1.2/trunk/debian/patches/bristuff.dpatch	2007-06-11 07:50:19 UTC (rev 3659)
@@ -5,7 +5,7 @@
 ## DP: This is the patch zaptel.patch from bristuff. Changes:
 ## DP: * Makefile removed.
 ## DP: * modules.symvers removed. 
-## DP: Version: bristuff-0.3.0-PRE-1y-f
+## DP: Version: bristuff-0.3.0-PRE-1y-g
 
 @DPATCH@
 diff -urN zaptel-1.2.17.1.orig/zaptel-base.c zaptel-1.2.17.1/zaptel-base.c
@@ -120,15 +120,6 @@
  #ifdef CONFIG_ZAPATA_NET
  				if (ms->flags & ZT_FLAG_NETDEV)
  					netif_wake_queue(ztchan_to_dev(ms));
-@@ -5154,7 +5223,7 @@
- 					tasklet_schedule(&ms->ppp_calls);
- 				}
- #endif
--			}
-+			} 
- 		} else if (ms->curtone && !(ms->flags & ZT_FLAG_PSEUDO)) {
- 			left = ms->curtone->tonesamples - ms->tonep;
- 			if (left > bytes)
 @@ -5200,6 +5269,12 @@
  				memset(txb, 0xFF, bytes);
  			}

Added: zaptel1.2/trunk/debian/patches/man_fixes.dpatch
===================================================================
--- zaptel1.2/trunk/debian/patches/man_fixes.dpatch	                        (rev 0)
+++ zaptel1.2/trunk/debian/patches/man_fixes.dpatch	2007-06-11 07:50:19 UTC (rev 3659)
@@ -0,0 +1,112 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## man_fixes.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: A few man pages fixes fixes from upstream's svn. Will be included
+## DP: in zaptel 1.2.19. A man page for fxstest and charset fixes
+## DP: for ztcfg.8, zttool.8 and ztmonitor.8 .
+
+ at DPATCH@
+diff -urNad zaptel1.2-1.2.18~dfsg~/doc/fxstest.8 zaptel1.2-1.2.18~dfsg/doc/fxstest.8
+--- zaptel1.2-1.2.18~dfsg~/doc/fxstest.8	1970-01-01 02:00:00.000000000 +0200
++++ zaptel1.2-1.2.18~dfsg/doc/fxstest.8	2007-06-11 10:01:46.000000000 +0300
+@@ -0,0 +1,60 @@
++.TH "FXSTEST" "8" "9 June 2007" "asterisk" "System Manager's Manuals: Asterisk"
++
++.SH NAME
++fxstest \- Simple tests for Zaptel FXS adapters
++.SH SYNOPSIS
++
++.B fxstest /dev/zap/\fIN comand\fR
++
++.SH DESCRIPTION
++fxstest can be used to issue one of a number simple tests to FXS
++adapters (analog adapters intended to connect phones). 
++
++.SH OPTIONS
++All of those tests operate on a single zaptel channel which has to be an
++FXS port, and must not be in use by Asterisk or any other program.
++
++The command has two mandatory parameters.
++The first parameter is the device file to operate on. It is typically
++/dev/zap/NN , a device file under /dev/zap .
++
++The second parameter is the name of the command to run on that channel:
++
++.I stats
++.RS
++Reports voltages
++.RE
++
++.I regdump
++.RS
++Dumps ProSLIC registers
++.RE
++
++.I tones
++.RS
++Plays a series of tones
++.RE
++
++.I polarity
++.RS
++Requests channel to reverse polarity.
++.RE
++
++.I ring
++.RS
++Rings phone
++.RE
++
++.SH "SEE ALSO"
++.PP
++zttool(8), ztcfg(8), ztmonitor(8), asterisk(8).
++.SH BUGS
++Does not allow testing channels beyond 249. Should support opening
++channels through /dev/zap/channel .
++.SH AUTHOR
++.PP
++This manual page was written by Tzafrir Cohen <tzafrir.cohen at xorcom.com> .
++Permission is granted to copy, distribute and/or modify this document 
++under the terms of the GNU General Public License, Version 2 any 
++later version published by the Free Software Foundation.
++.PP
+diff -urNad zaptel1.2-1.2.18~dfsg~/doc/ztcfg.8 zaptel1.2-1.2.18~dfsg/doc/ztcfg.8
+--- zaptel1.2-1.2.18~dfsg~/doc/ztcfg.8	2006-10-24 03:08:27.000000000 +0200
++++ zaptel1.2-1.2.18~dfsg/doc/ztcfg.8	2007-06-11 10:01:46.000000000 +0300
+@@ -50,7 +50,8 @@
+ zttool(8), ztmonitor(8), asterisk(8).
+ .SH "AUTHOR"
+ .PP
+-This manual page was written by Santiago Ruano Rincón <santiago at unicauca.edu.co> for
++This manual page was written by Santiago Ruano Rinc\['o]n 
++<santiago at unicauca.edu.co> for
+ the Debian system (but may be used by others).  Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the GNU General Public License, Version 2 any 
+diff -urNad zaptel1.2-1.2.18~dfsg~/doc/ztmonitor.8 zaptel1.2-1.2.18~dfsg/doc/ztmonitor.8
+--- zaptel1.2-1.2.18~dfsg~/doc/ztmonitor.8	2006-10-24 03:08:27.000000000 +0200
++++ zaptel1.2-1.2.18~dfsg/doc/ztmonitor.8	2007-06-11 10:01:46.000000000 +0300
+@@ -32,7 +32,8 @@
+ zttool(8), ztcfg(8), asterisk(8).
+ .SH "AUTHOR"
+ .PP
+-This manual page was written by Santiago Ruano Rincón <santiago at unicauca.edu.co> for
++This manual page was written by Santiago Ruano Rinc\['o]n 
++<santiago at unicauca.edu.co> for
+ the Debian system (but may be used by others).  Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the GNU General Public License, Version 2 any 
+diff -urNad zaptel1.2-1.2.18~dfsg~/doc/zttool.8 zaptel1.2-1.2.18~dfsg/doc/zttool.8
+--- zaptel1.2-1.2.18~dfsg~/doc/zttool.8	2006-10-24 03:08:27.000000000 +0200
++++ zaptel1.2-1.2.18~dfsg/doc/zttool.8	2007-06-11 10:01:46.000000000 +0300
+@@ -23,7 +23,8 @@
+ ztmonitor(8), asterisk (8).
+ .SH "AUTHOR"
+ .PP
+-This manual page was written by Santiago Ruano Rincón <santiago at unicauca.edu.co> for
++This manual page was written by Santiago Ruano Rinc\['o]n 
++<santiago at unicauca.edu.co> for
+ the Debian system (but may be used by others).  Permission is
+ granted to copy, distribute and/or modify this document under
+ the terms of the GNU General Public License, Version 2 any 


Property changes on: zaptel1.2/trunk/debian/patches/man_fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *

Modified: zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch
===================================================================
--- zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch	2007-06-10 20:45:10 UTC (rev 3658)
+++ zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch	2007-06-11 07:50:19 UTC (rev 3659)
@@ -5,36 +5,28 @@
 ## DP: Enable installing the Zaptel perl modules. They are still disabled in
 ## DP: upstream to reduce surprise. Also point to the right directory under
 ## DP: which to install perl modules.
-## DP: Also includes some small fixes that will be included on next 
-## DP: release ofupstream.
+## DP: Also includes the script zaptel_hardware which is still not 
+## DP: included by default in upstream.
 
 @DPATCH@
-diff -urNad zaptel-1.2.15~dfsg~/xpp/utils/Makefile zaptel-1.2.15~dfsg/xpp/utils/Makefile
---- zaptel-1.2.15~dfsg~/xpp/utils/Makefile	2007-02-28 22:57:52.000000000 +0200
-+++ zaptel-1.2.15~dfsg/xpp/utils/Makefile	2007-03-10 01:03:26.000000000 +0200
+diff -urNad zaptel1.2-1.2.18~dfsg~/xpp/utils/Makefile zaptel1.2-1.2.18~dfsg/xpp/utils/Makefile
+--- zaptel1.2-1.2.18~dfsg~/xpp/utils/Makefile	2007-05-17 22:34:32.000000000 +0300
++++ zaptel1.2-1.2.18~dfsg/xpp/utils/Makefile	2007-06-11 09:51:13.000000000 +0300
 @@ -24,7 +24,7 @@
  HOTPLUG_USB_DIR	= /etc/hotplug/usb
  UDEV_RULES_DIR	= /etc/udev/rules.d
  # Perl disabled by default, until we see it is safe:
 -#PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
-+PERLLIBDIR	= $(datadir)/perl5
++PERLLIBDIR	:= $(shell eval `perl -V:vendor`; echo "$$vendor")
+ PERL_DIRS	:= Zaptel Zaptel/Hardware Zaptel/Xpp
+ PERL_MODS_PAT	:= *.pm $(PERL_DIRS:%=%/*.pm)
+ PERL_MODS	:= $(shell cd zconf; echo $(PERL_MODS_PAT))
+@@ -49,7 +49,7 @@
  
- XPD_FIRMWARE	= $(wildcard ../firmwares/*.hex)
- XPD_INIT_DATA	= $(XPD_FIRMWARE) init_fxo_modes
-@@ -47,7 +47,7 @@
  %.8: %
  	pod2man --section 8 $^ > $@ || $(RM) $@
- PERL_SCRIPTS	= zt_registration xpp_sync lszaptel
--PERL_MANS	= zt_registration.8 xpp_sync.8 lszaptel.8
-+PERL_MANS	= $(PERL_SCRIPTS:%=%.8)
+-PERL_SCRIPTS	= zt_registration xpp_sync lszaptel xpp_blink
++PERL_SCRIPTS	= zt_registration xpp_sync lszaptel xpp_blink zaptel_hardware
+ PERL_MANS	= $(PERL_SCRIPTS:%=%.8)
  
- TARGETS	= init_fxo_modes print_modes adj_clock
- PROG_INSTALL	= genzaptelconf adj_clock
-@@ -60,6 +60,7 @@
- ifneq	(,$(PERLLIBDIR))
- PROG_INSTALL	+= $(PERL_SCRIPTS)
- MAN_INSTALL	+= $(PERL_MANS)
-+TARGETS		+= $(PERL_MANS)
- endif
- 
- all: $(TARGETS)
+ TARGETS	= init_fxo_modes print_modes

More information about the Pkg-voip-commits mailing list