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

tzafrir-guest at alioth.debian.org tzafrir-guest at alioth.debian.org
Tue Jul 17 11:28:21 UTC 2007


Author: tzafrir-guest
Date: 2007-07-17 11:28:20 +0000 (Tue, 17 Jul 2007)
New Revision: 3752

Added:
   zaptel1.2/trunk/debian/zaptel1.2.doc-base.astribank
   zaptel1.2/trunk/debian/zaptel1.2.doc-base.readme
   zaptel1.2/trunk/debian/zaptel1.2.doc-base.zaptel.conf
Modified:
   zaptel1.2/trunk/debian/changelog
   zaptel1.2/trunk/debian/control
   zaptel1.2/trunk/debian/docs
   zaptel1.2/trunk/debian/patches/00list
   zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch
   zaptel1.2/trunk/debian/rules
Log:
* New upstream release: 1.2.19.
* Makefile_deps_utils.diff: dropped: not going to be merged now.
* README.Linux26 is not here anymore (and not really needed).
* Adding a build requirement of asciidoc to produce README.html from README.
* Added doc-base entries for package documentation.


Modified: zaptel1.2/trunk/debian/changelog
===================================================================
--- zaptel1.2/trunk/debian/changelog	2007-07-16 20:07:11 UTC (rev 3751)
+++ zaptel1.2/trunk/debian/changelog	2007-07-17 11:28:20 UTC (rev 3752)
@@ -1,4 +1,4 @@
-zaptel1.2 (1:1.2.18~dfsg-1) UNRELEASED; urgency=low
+zaptel1.2 (1:1.2.19~dfsg-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Bristuff 0.3.0-PRE-1y-h .
@@ -11,10 +11,13 @@
   * 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.
+  * Makefile_deps_utils.diff: Fixed for 1.2.18, but then dropped: not going to
+    be merged now.
+  * README.Linux26 is not here anymore (and not really needed).
+  * Adding a build requirement of asciidoc to produce README.html from README.
+  * Added doc-base entries for the improved README and the Astribank README.
 
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Mon, 11 Jun 2007 10:24:48 +0300
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 17 Jul 2007 13:28:08 +0300
 
 zaptel (1:1.2.16~dfsg-1) unstable; urgency=low
 

Modified: zaptel1.2/trunk/debian/control
===================================================================
--- zaptel1.2/trunk/debian/control	2007-07-16 20:07:11 UTC (rev 3751)
+++ zaptel1.2/trunk/debian/control	2007-07-17 11:28:20 UTC (rev 3752)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian VoIP Team <pkg-voip-maintainers at lists.alioth.debian.org>
 Uploaders: Kilian Krause <kilian at debian.org>, Jose Carlos Garcia Sogo <jsogo at debian.org>, Mark Purcell <msp at debian.org>, Santiago Garcia Mantinan <manty at debian.org>, Santiago Ruano Rincón <santiago at debian.org>, Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-Build-Depends: debhelper (>= 5.0.37), libnewt-dev, dpatch (>= 2.0.9), bzip2, libusb-dev
+Build-Depends: debhelper (>= 5.0.37), libnewt-dev, dpatch (>= 2.0.9), bzip2, libusb-dev, asciidoc
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.debian.org/pkg-voip/
 XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-voip/

Modified: zaptel1.2/trunk/debian/docs
===================================================================
--- zaptel1.2/trunk/debian/docs	2007-07-16 20:07:11 UTC (rev 3751)
+++ zaptel1.2/trunk/debian/docs	2007-07-17 11:28:20 UTC (rev 3752)
@@ -1,6 +1,6 @@
 README
+README.html
 README.fxotune
 README.fxsusb
-README.Linux26
 xpp/README.Astribank
 tonezones.txt

Modified: zaptel1.2/trunk/debian/patches/00list
===================================================================
--- zaptel1.2/trunk/debian/patches/00list	2007-07-16 20:07:11 UTC (rev 3751)
+++ zaptel1.2/trunk/debian/patches/00list	2007-07-17 11:28:20 UTC (rev 3752)
@@ -1,4 +1,4 @@
-Makefile_deps_utils
+#Makefile_deps_utils
 Makefile_uname
 Makefile_targets
 Makefile_kbuild
@@ -17,4 +17,3 @@
 xpp_all_platforms
 zaptel_perl
 conglomerate_fixes
-man_fixes

Modified: zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch
===================================================================
--- zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch	2007-07-16 20:07:11 UTC (rev 3751)
+++ zaptel1.2/trunk/debian/patches/zaptel_perl.dpatch	2007-07-17 11:28:20 UTC (rev 3752)
@@ -2,31 +2,19 @@
 ## zaptel_perl.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
 ##
 ## All lines beginning with `## DP:' are a description of the patch.
-## 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: Point Zaptel PERL modules to the right directory under
 ## DP: which to install perl modules.
-## DP: Also includes the script zaptel_hardware which is still not 
-## DP: included by default in upstream.
 
 @DPATCH@
 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 @@
+ MANDIR		= $(mandir)/man8
  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	:= $(shell eval `perl -V:vendor`; echo "$$vendor")
+-PERLLIBDIR	= $(shell eval `perl -V:sitelib`; echo "$$sitelib")
++PERLLIBDIR	= $(shell eval `perl -V:vendorlib`; echo "$$vendorlib")
  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 @@
- 
- %.8: %
- 	pod2man --section 8 $^ > $@ || $(RM) $@
--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

Modified: zaptel1.2/trunk/debian/rules
===================================================================
--- zaptel1.2/trunk/debian/rules	2007-07-16 20:07:11 UTC (rev 3751)
+++ zaptel1.2/trunk/debian/rules	2007-07-17 11:28:20 UTC (rev 3752)
@@ -79,6 +79,12 @@
 
 ## END OF M-A SECTION
 
+# this uses asciidoc. 
+# With asciidoc 8.2 from sid it will produce a table of contents. With
+# the Etch version it will just produce a nice file.
+README.html: README
+	make README.html
+
 tonezones.txt: zonedata.c
 	echo >$@ "# A list of tonezones supported by this copy of zaptel and libtonezones:"
 	grep '[[:space:]]\+{[[:space:]]\+[[:digit:]]\+,' zonedata.c \
@@ -86,7 +92,7 @@
 	>>$@
 
 build: build-stamp
-build-stamp: patch-stamp tonezones.txt
+build-stamp: patch-stamp tonezones.txt README.html
 	dh_testdir
 	
 	if [ ! -f fxotune.c_1.2 ]; then \
@@ -106,6 +112,7 @@
 	# Add here commands to clean up after the build process.
 	rm -rf $(MOD_EXAMPLES_DIR)
 	rm -f tonezones.txt
+	rm -f README.html
 	rm -f $(GENERATED_SOURCES)
 	if [ -f fxotune.c_1.2 ]; then \
 	  mv fxotune.c_1.2 fxotune.c; \
@@ -128,6 +135,8 @@
 	# Add here commands to install the package into debian/tmp
 	
 	$(MAKE) install-programs INSTALL_PREFIX=$(TARGET_DIR)
+	# makefw is an internal build utility
+	rm -f $(TARGET_DIR)/sbin/makefw
 	$(MAKE) -C xpp/utils install DESTDIR=$(TARGET_DIR)
 	/sbin/ldconfig -n $(TARGET_DIR)/usr/lib
 

Added: zaptel1.2/trunk/debian/zaptel1.2.doc-base.astribank
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.doc-base.astribank	                        (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.doc-base.astribank	2007-07-17 11:28:20 UTC (rev 3752)
@@ -0,0 +1,9 @@
+Document: zaptel.astribank
+Title: Xorcom Astribank Documentation
+Author: Tzafrir Cohen
+Abstract: Technical Documentation ofd the Xorcom Astribank
+Section: Comm
+
+Format: text
+Files: /usr/share/doc/zaptel1.2/README.Astribank.gz
+

Added: zaptel1.2/trunk/debian/zaptel1.2.doc-base.readme
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.doc-base.readme	                        (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.doc-base.readme	2007-07-17 11:28:20 UTC (rev 3752)
@@ -0,0 +1,12 @@
+Document: zaptel
+Title: Zapata Telephony Interface Driver
+Author: Tzafrir Cohen
+Abstract: Basic documentation of the Zaptel telephony interface
+Section: Comm
+
+Format: HTML
+Files: /usr/share/doc/zaptel1.2/README.html
+
+Format: text
+Files: /usr/share/doc/zaptel1.2/README.gz
+

Added: zaptel1.2/trunk/debian/zaptel1.2.doc-base.zaptel.conf
===================================================================
--- zaptel1.2/trunk/debian/zaptel1.2.doc-base.zaptel.conf	                        (rev 0)
+++ zaptel1.2/trunk/debian/zaptel1.2.doc-base.zaptel.conf	2007-07-17 11:28:20 UTC (rev 3752)
@@ -0,0 +1,10 @@
+Document: zaptel.conf
+Title: Reference Zaptel Configuration File
+Author: Zapata Telephony Project
+Abstract: A sample annotated zaptel.conf . This is the closest
+ thing to a reference for zaptel.conf (used by ztcfg(1) ).
+Section: Comm
+
+Format: text
+Files: /usr/share/doc/zaptel1.2/examples/zaptel.conf.sample.gz
+




More information about the Pkg-voip-commits mailing list