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

[Mark Purcell]

Author: msp
Date: 2005-11-01 19:55:15 +0000 (Tue, 01 Nov 2005)
New Revision: 907

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/Makefile_targets.dpatch
Log:
* New upstream release
* Update Makefile_targets.dpatch

Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2005-11-01 18:00:33 UTC (rev 906)
+++ zaptel/trunk/debian/changelog	2005-11-01 19:55:15 UTC (rev 907)
@@ -1,8 +1,9 @@
 zaptel (1:1.2.0-beta2-1) UNRELEASED; urgency=low
 
-  * (NOT RELEASED YET) New upstream release
+  * New upstream release
+  * Update Makefile_targets.dpatch
 
- -- Mark Purcell <msp at debian.org>  Tue,  1 Nov 2005 07:36:56 +0000
+ -- Mark Purcell <msp at debian.org>  Tue,  1 Nov 2005 19:54:51 +0000
 
 zaptel (1:1.2.0-0beta1-1) experimental; urgency=low
 

Modified: zaptel/trunk/debian/patches/Makefile_targets.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_targets.dpatch	2005-11-01 18:00:33 UTC (rev 906)
+++ zaptel/trunk/debian/patches/Makefile_targets.dpatch	2005-11-01 19:55:15 UTC (rev 907)
@@ -6,9 +6,9 @@
 ## DP: allow separate installation of the programs and the modules
 
 @DPATCH@
-diff -urNad zaptel-1.2.0-0beta1/Makefile /tmp/dpep.Im0qyt/zaptel-1.2.0-0beta1/Makefile
---- zaptel-1.2.0-0beta1/Makefile	2005-09-10 16:33:32.350010029 +0300
-+++ /tmp/dpep.Im0qyt/zaptel-1.2.0-0beta1/Makefile	2005-09-10 16:34:00.908020091 +0300
+diff -urNad zaptel-1.2.0-beta2~/Makefile zaptel-1.2.0-beta2/Makefile
+--- zaptel-1.2.0-beta2~/Makefile	2005-11-01 19:52:00.000000000 +0000
++++ zaptel-1.2.0-beta2/Makefile	2005-11-01 19:53:45.000000000 +0000
 @@ -118,6 +118,16 @@
  endif
  MODULESO:=$(MODULES:%=%.o)
@@ -26,12 +26,12 @@
  
  ifneq (,$(wildcard /usr/include/newt.h))
  ZTTOOL:=zttool
-@@ -129,7 +139,11 @@
+@@ -132,7 +142,11 @@
  #PRIMARY=wcfxo
  PWD:=$(shell pwd)
  
--all: $(BUILDVER) $(LIBTONEZONE_SO) manpages
-+all: modules $(LIBTONEZONE_SO) manpages
+-all: $(BUILDVER) $(LIBTONEZONE_SO)
++all: modules manpages $(LIBTONEZONE_SO)
 +
 +programs: $(BINS)
 +
@@ -39,7 +39,7 @@
  
  linux24: $(MODULESO) $(BINS)
  
-@@ -411,6 +425,20 @@
+@@ -378,6 +392,20 @@
  		echo "Not CVS";  \
  	fi
  
@@ -60,3 +60,28 @@
  clean:
  	rm -f torisatool makefw tor2fw.h radfw.h
  	rm -f ${BINS}
+diff -urNad zaptel-1.2.0-beta2~/Makefile.rej zaptel-1.2.0-beta2/Makefile.rej
+--- zaptel-1.2.0-beta2~/Makefile.rej	1970-01-01 01:00:00.000000000 +0100
++++ zaptel-1.2.0-beta2/Makefile.rej	2005-11-01 19:52:00.000000000 +0000
+@@ -0,0 +1,21 @@
++***************
++*** 129,135 ****
++  #PRIMARY=wcfxo
++  PWD:=$(shell pwd)
++  
++- all: $(BUILDVER) $(LIBTONEZONE_SO) manpages
++  
++  linux24: $(MODULESO) $(BINS)
++  
++--- 139,149 ----
++  #PRIMARY=wcfxo
++  PWD:=$(shell pwd)
++  
+++ all: modules $(LIBTONEZONE_SO) manpages
+++ 
+++ programs: $(BINS)
+++ 
+++ modules: $(BUILDVER)
++  
++  linux24: $(MODULESO) $(BINS)
++