[Astlinux-commits] SF.net SVN: astlinux: [1111] trunk/package/zaptel

[<kr...@us...>]

Revision: 1111
          http://svn.sourceforge.net/astlinux/?rev=1111&view=rev
Author:   krisk84
Date:     2007-06-29 12:15:33 -0700 (Fri, 29 Jun 2007)

Log Message:
-----------
zaptel version update

Modified Paths:
--------------
    trunk/package/zaptel/zaptel-makefile0.patch
    trunk/package/zaptel/zaptel.mk

Modified: trunk/package/zaptel/zaptel-makefile0.patch
===================================================================
--- trunk/package/zaptel/zaptel-makefile0.patch	2007-06-29 19:08:21 UTC (rev 1110)
+++ trunk/package/zaptel/zaptel-makefile0.patch	2007-06-29 19:15:33 UTC (rev 1111)
@@ -1,5 +1,9 @@
---- zaptel/Makefile.orig	2007-03-02 16:29:04.000000000 -0600
-+++ zaptel/Makefile		2007-03-04 12:51:27.000000000 -0600
+Common subdirectories: zaptel-1.2.18.orig/build_tools and zaptel-1.2.18/build_tools
+Common subdirectories: zaptel-1.2.18.orig/doc and zaptel-1.2.18/doc
+Common subdirectories: zaptel-1.2.18.orig/hpec and zaptel-1.2.18/hpec
+diff -u zaptel-1.2.18.orig/Makefile zaptel-1.2.18/Makefile
+--- zaptel-1.2.18.orig/Makefile	2007-06-08 11:19:15.000000000 -0400
++++ zaptel-1.2.18/Makefile	2007-06-29 15:11:21.000000000 -0400
 @@ -6,6 +6,7 @@
  #
  
@@ -8,16 +12,16 @@
  
  ifeq ($(MAKELEVEL),0)
  PWD:=$(shell pwd)
-@@ -143,7 +144,7 @@ LIBTONEZONE_SO_MAJOR_VER:=1
- LIBTONEZONE_SO_MINOR_VER:=0
- 
+@@ -145,7 +146,7 @@
+ MANDIR			= /usr/share/man/man8
+ MAN_PAGES_BASE		= ztcfg 
  BINS=ztcfg torisatool makefw ztmonitor ztspeed zttest fxotune
 -ifneq (,$(wildcard /usr/include/newt.h))
 +ifneq (,$(wildcard ./newt.h))
  BINS+=zttool
+ MAN_PAGES_BASE		+= zttool
  endif
- 
-@@ -226,13 +227,13 @@ torisatool: torisatool.o
+@@ -230,13 +231,13 @@
  	$(CC) -o $@ $^
  
  tones.h: gendigits
@@ -34,7 +38,7 @@
  
  gendigits: gendigits.o
  	$(CC) -o $@ $^ -lm
-@@ -346,13 +347,13 @@ b410p:
+@@ -351,13 +352,13 @@
  	$(MAKE) -C mISDNuser install
  
  install: all devices firmware
@@ -49,10 +53,10 @@
  	fi
 -	if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/sbin/zttool; fi
 +	if [ -f zttool ]; then install -D -m 755 zttool $(INSTALL_PREFIX)/$(INSTALL_BASE)/sbin/zttool; fi
+ 	install -d                  $(INSTALL_PREFIX)$(MANDIR)
+ 	install -m 644 $(MAN_PAGES) $(INSTALL_PREFIX)$(MANDIR)
  ifeq ($(BUILDVER),linux26)
- 	for x in $(MODULESKO); do \
- 		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/extra/$$x ; \
-@@ -368,25 +369,18 @@ endif
+@@ -375,25 +376,18 @@
  		rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.o; \
  	fi; \
  	rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxs.o
@@ -87,3 +91,8 @@
  
  install-udev: devices
  
+Only in zaptel-1.2.18: Makefile.orig
+Common subdirectories: zaptel-1.2.18.orig/oct612x and zaptel-1.2.18/oct612x
+Common subdirectories: zaptel-1.2.18.orig/wct4xxp and zaptel-1.2.18/wct4xxp
+Common subdirectories: zaptel-1.2.18.orig/wctc4xxp and zaptel-1.2.18/wctc4xxp
+Common subdirectories: zaptel-1.2.18.orig/xpp and zaptel-1.2.18/xpp

Modified: trunk/package/zaptel/zaptel.mk
===================================================================
--- trunk/package/zaptel/zaptel.mk	2007-06-29 19:08:21 UTC (rev 1110)
+++ trunk/package/zaptel/zaptel.mk	2007-06-29 19:15:33 UTC (rev 1111)
@@ -3,7 +3,7 @@
 # zaptel
 #
 ##############################################################
-ZAPTEL_VERSION := 1.2.17.1
+ZAPTEL_VERSION := 1.2.18
 ZAPTEL_SOURCE := zaptel-$(ZAPTEL_VERSION).tar.gz
 ZAPTEL_SITE := ftp://ftp.digium.com/pub/zaptel/releases
 ZAPTEL_DIR := $(BUILD_DIR)/zaptel-$(ZAPTEL_VERSION)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.