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

[Mark Purcell]

Author: msp
Date: 2005-11-01 21:22:26 +0000 (Tue, 01 Nov 2005)
New Revision: 926

Removed:
   zaptel/trunk/debian/patches/Makefile_man.dpatch
   zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch
Modified:
   zaptel/trunk/debian/patches/Makefile_targets.dpatch
   zaptel/trunk/debian/rules
Log:
releasing version 1:1.2.0-beta2-1

Deleted: zaptel/trunk/debian/patches/Makefile_man.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_man.dpatch	2005-11-01 21:15:56 UTC (rev 925)
+++ zaptel/trunk/debian/patches/Makefile_man.dpatch	2005-11-01 21:22:26 UTC (rev 926)
@@ -1,24 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## Makefile_man.dpatch by  Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: use implicit rules for man pages generation
-
- at DPATCH@
-diff -urNad zaptel-1.2.0-beta2~/Makefile zaptel-1.2.0-beta2/Makefile
---- zaptel-1.2.0-beta2~/Makefile	2005-11-01 20:40:34.000000000 +0000
-+++ zaptel-1.2.0-beta2/Makefile	2005-11-01 20:41:38.000000000 +0000
-@@ -144,6 +144,13 @@
- 
- all: modules manpages $(LIBTONEZONE_SO)
- 
-+manpages: doc/ztcfg.8.gz doc/ztmonitor.8.gz doc/zttool.8.gz
-+
-+doc/%.8.gz: doc/%.sgml
-+	rm -f $@
-+	docbook2man -o doc $<
-+	gzip doc/$*.8
-+
- programs: $(BINS)
- 
- modules: $(BUILDVER)

Modified: zaptel/trunk/debian/patches/Makefile_targets.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_targets.dpatch	2005-11-01 21:15:56 UTC (rev 925)
+++ zaptel/trunk/debian/patches/Makefile_targets.dpatch	2005-11-01 21:22:26 UTC (rev 926)
@@ -31,7 +31,7 @@
  PWD:=$(shell pwd)
  
 -all: $(BUILDVER) $(LIBTONEZONE_SO)
-+all: modules manpages $(LIBTONEZONE_SO)
++all: modules $(LIBTONEZONE_SO)
 +
 +programs: $(BINS)
 +

Deleted: zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch
===================================================================
--- zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch	2005-11-01 21:15:56 UTC (rev 925)
+++ zaptel/trunk/debian/patches/fxotune_tmpfile.dpatch	2005-11-01 21:22:26 UTC (rev 926)
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fxotune_tmpfile.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fixes insecure temporary file handling in fxotune (in detect mode, -i)
-
- at DPATCH@
-diff -urNad zaptel-1.2.0-beta2~/fxotune.c zaptel-1.2.0-beta2/fxotune.c
---- zaptel-1.2.0-beta2~/fxotune.c	2005-10-05 22:05:49.000000000 +0100
-+++ zaptel-1.2.0-beta2/fxotune.c	2005-11-01 20:08:56.000000000 +0000
-@@ -133,9 +133,10 @@
- 
- 
- 	if (debug) {
--		outfile = fopen("fxotune.vals", "w");
-+		outfile = tmpfile();
- 		if (!outfile) {
--			fprintf(stdout, "Cannot create fxotune.vals\n");
-+			fprintf(stdout, "Cannot create temporary file: %d (%s)\n",
-+		        errno, strerror(errno));
- 			return -1;
- 		}
- 	}

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2005-11-01 21:15:56 UTC (rev 925)
+++ zaptel/trunk/debian/rules	2005-11-01 21:22:26 UTC (rev 926)
@@ -179,7 +179,7 @@
 	#docbook2man -o debian/ debian/zttool.sgml
 
 	dh_installdocs -a
-	dh_installman -a debian/*.8
+	dh_installman -a doc
 	
 	# doc/ztmonitor.8.gz doc/ztcfg.8.gz doc/zttool.8.gz \