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

[Mark Purcell]

Author: msp
Date: 2005-11-01 20:02:36 +0000 (Tue, 01 Nov 2005)
New Revision: 908

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_man.dpatch
Log:
* Update Makefile_man

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2005-11-01 19:55:15 UTC (rev 907)
+++ zaptel/trunk/debian/changelog	2005-11-01 20:02:36 UTC (rev 908)
@@ -2,8 +2,9 @@
 
   * New upstream release
   * Update Makefile_targets.dpatch
+  * Update Makefile_man
 
- -- Mark Purcell <msp at debian.org>  Tue,  1 Nov 2005 19:54:51 +0000
+ -- Mark Purcell <msp at debian.org>  Tue,  1 Nov 2005 20:02:19 +0000
 
 zaptel (1:1.2.0-0beta1-1) experimental; urgency=low
 

Modified: zaptel/trunk/debian/patches/Makefile_man.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_man.dpatch	2005-11-01 19:55:15 UTC (rev 907)
+++ zaptel/trunk/debian/patches/Makefile_man.dpatch	2005-11-01 20:02:36 UTC (rev 908)
@@ -5,31 +5,71 @@
 ## DP: use implicit rules for man pages generation
 
 @DPATCH@
-diff -urNad zaptel-1.2.0-0beta1/Makefile /tmp/dpep.Gfmetd/zaptel-1.2.0-0beta1/Makefile
---- zaptel-1.2.0-0beta1/Makefile	2005-09-09 13:11:24.000000000 +0300
-+++ /tmp/dpep.Gfmetd/zaptel-1.2.0-0beta1/Makefile	2005-09-10 13:34:20.793721137 +0300
-@@ -297,20 +297,10 @@
+diff -urNad zaptel-1.2.0-beta2~/Makefile zaptel-1.2.0-beta2/Makefile
+--- zaptel-1.2.0-beta2~/Makefile	2005-11-01 19:59:45.000000000 +0000
++++ zaptel-1.2.0-beta2/Makefile	2005-11-01 20:01:45.000000000 +0000
+@@ -144,6 +144,13 @@
  
- manpages: doc/ztcfg.8.gz doc/ztmonitor.8.gz doc/zttool.8.gz
+ all: modules manpages $(LIBTONEZONE_SO)
  
--doc/ztcfg.8.gz: doc/ztcfg.sgml
--	rm -f doc/ztcfg.8.gz
--	docbook2man -o doc doc/ztcfg.sgml
--	gzip doc/ztcfg.8
--
--doc/zttool.8.gz: doc/zttool.sgml
--	rm -f doc/zttool.8.gz
--	docbook2man -o doc doc/zttool.sgml
--	gzip doc/zttool.8
--
--doc/ztmonitor.8.gz: doc/ztmonitor.sgml
--	rm -f doc/ztmonitor.8.gz
--	docbook2man -o doc doc/ztmonitor.sgml
--	gzip doc/ztmonitor.8
++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
++       rm -f $@
++       docbook2man -o doc $<
++       gzip doc/$*.8
++
+ programs: $(BINS)
  
- install: all devices
- 	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
+ modules: $(BUILDVER)
+diff -urNad zaptel-1.2.0-beta2~/Makefile.rej zaptel-1.2.0-beta2/Makefile.rej
+--- zaptel-1.2.0-beta2~/Makefile.rej	2005-11-01 19:59:45.000000000 +0000
++++ zaptel-1.2.0-beta2/Makefile.rej	2005-11-01 19:59:45.000000000 +0000
+@@ -1,21 +1,33 @@
+ ***************
+-*** 129,135 ****
+-  #PRIMARY=wcfxo
+-  PWD:=$(shell pwd)
++*** 297,316 ****
+   
+-- all: $(BUILDVER) $(LIBTONEZONE_SO) manpages
++  manpages: doc/ztcfg.8.gz doc/ztmonitor.8.gz doc/zttool.8.gz
+   
+-  linux24: $(MODULESO) $(BINS)
++- doc/ztcfg.8.gz: doc/ztcfg.sgml
++- 	rm -f doc/ztcfg.8.gz
++- 	docbook2man -o doc doc/ztcfg.sgml
++- 	gzip doc/ztcfg.8
++- 
++- doc/zttool.8.gz: doc/zttool.sgml
++- 	rm -f doc/zttool.8.gz
++- 	docbook2man -o doc doc/zttool.sgml
++- 	gzip doc/zttool.8
++- 
++- doc/ztmonitor.8.gz: doc/ztmonitor.sgml
++- 	rm -f doc/ztmonitor.8.gz
++- 	docbook2man -o doc doc/ztmonitor.sgml
++- 	gzip doc/ztmonitor.8
+   
+---- 139,149 ----
+-  #PRIMARY=wcfxo
+-  PWD:=$(shell pwd)
++  install: all devices
++  	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg
++--- 297,306 ----
+   
+-+ all: modules $(LIBTONEZONE_SO) manpages
+-+ 
+-+ programs: $(BINS)
+-+ 
+-+ modules: $(BUILDVER)
++  manpages: doc/ztcfg.8.gz doc/ztmonitor.8.gz doc/zttool.8.gz
+   
+-  linux24: $(MODULESO) $(BINS)
+++ doc/%.8.gz: doc/%.sgml
+++ 	rm -f $@
+++ 	docbook2man -o doc $<
+++ 	gzip doc/$*.8
+   
++  install: all devices
++  	install -D -m 755 ztcfg $(INSTALL_PREFIX)/sbin/ztcfg