[Pkg-voip-commits] r2692 - zaptel/trunk/debian

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-11-12 04:16:34 +0100 (Sun, 12 Nov 2006)
New Revision: 2692

Modified:
   zaptel/trunk/debian/rules
Log:
Starting to revert zaptel-1.4 compatibility attempts. Reverting changeset:2689

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2006-11-12 03:03:33 UTC (rev 2691)
+++ zaptel/trunk/debian/rules	2006-11-12 03:16:34 UTC (rev 2692)
@@ -30,11 +30,10 @@
 
 DEBVERSION:=$(shell head -n 1 debian/changelog \
 		    | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-DEBTARVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//')
-UPVERSION:=$(shell echo $(DEBTARVERSION) | sed -e 's/~beta/.0-beta/' -e 's/.dfsg$$//')
+UPVERSION:=$(shell echo $(DEBVERSION) | sed -e 's/^.*://' -e 's/-[0-9.]*$$//' -e 's/.dfsg$$//')
 
 UPFILENAME := zaptel_$(UPVERSION).orig.tar.gz
-FILENAME := zaptel_$(DEBTARVERSION).orig.tar.gz
+FILENAME := zaptel_$(UPVERSION).dfsg.orig.tar.gz
 URL := http://ftp2.digium.com/pub/zaptel/releases/zaptel-$(UPVERSION).tar.gz
 
 MOD_EXAMPLES_DIR:=modexamples
@@ -50,7 +49,6 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	if [ -x ./configure ]; then ./configure; fi
 	make modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS)
 	make install-modules KERNELRELEASE=$(KVERS) INSTALL_PREFIX=$(CURDIR)/debian/$(PKGNAME)
 ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
@@ -78,7 +76,6 @@
 build-arch-stamp: configure-stamp 
 	dh_testdir
 	
-	if [ -x ./configure ]; then ./configure; fi
 	$(MAKE) programs
 	$(MAKE) -C xpp/utils
 	touch $@
@@ -136,10 +133,7 @@
 	for dir in build_tools include cwain qozap vzaphfc oct612x wct4xxp xpp zaphfc ztgsm; do \
 	  if [ -d $$dir ]; then cp -r $$dir $(TARDIR); fi; \
 	done
-	dh_install -i zaptel.h usr/include/linux/
-	if [ -f torisa.h ]; then \
-	  dh_install -i torisa.h usr/include/linux/ ; \
-	fi
+	dh_install -i zaptel.h torisa.h usr/include/linux/
 	
 	# Packaging infrastructure
 	cp -r debian/*-modules.* debian/rules debian/changelog debian/copyright\