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

[Tzafrir Cohen]

Author: tzafrir-guest
Date: 2006-02-16 09:01:47 +0000 (Thu, 16 Feb 2006)
New Revision: 1288

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/patches/00list
   zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
Log:
* unreleased yet, as it is pending rebuildig yet.
* new upstrream release
* removing xpp.dpatch: merged in upstream
* removing dot_version: bug fixed upstream
* Makefile_kbuild.dpatch: modified, as it was not properly merged in
  upstream


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-02-14 20:39:01 UTC (rev 1287)
+++ zaptel/trunk/debian/changelog	2006-02-16 09:01:47 UTC (rev 1288)
@@ -1,8 +1,13 @@
-zaptel (1:1.2.3-3) UNRELEASED; urgency=low
+zaptel (1:1.2.4-1) UNRELEASED; urgency=low
 
   * NOT RELEASED YET
+  * new upstrream release
+  * removing xpp.dpatch: merged in upstream
+  * removing dot_version: bug fixed upstream
+  * Makefile_kbuild.dpatch: modified, as it was not properly merged in
+    upstream
 
- -- Kilian Krause <kilian at debian.org>  Thu,  9 Feb 2006 17:52:53 +0000
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Thu, 16 Feb 2006 06:10:04 +0200
 
 zaptel (1:1.2.3-2) unstable; urgency=low
 

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2006-02-14 20:39:01 UTC (rev 1287)
+++ zaptel/trunk/debian/patches/00list	2006-02-16 09:01:47 UTC (rev 1288)
@@ -3,11 +3,11 @@
 Makefile_uname
 #Makefile_pscmd
 Makefile_targets
-Makefile_kbuild
+#Makefile_kbuild
 #Makefile_xpp
 # touches the Makefile as well:
 echocan_env
 ukcid
-xpp
-dot_version
+#xpp
+#dot_version
 bristuff

Modified: zaptel/trunk/debian/patches/Makefile_kbuild.dpatch
===================================================================
--- zaptel/trunk/debian/patches/Makefile_kbuild.dpatch	2006-02-14 20:39:01 UTC (rev 1287)
+++ zaptel/trunk/debian/patches/Makefile_kbuild.dpatch	2006-02-16 09:01:47 UTC (rev 1288)
@@ -23,10 +23,10 @@
  linux26: prereq $(BINS)
  	@echo $(KSRC)
  	@if [ -z "$(KSRC)" -o ! -d "$(KSRC)" ]; then echo "You do not appear to have the sources for the $(KVERS) kernel installed."; exit 1 ; fi
--	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) modules
+-	$(MAKE) -C $(KSRC) SUBDIRS=$(PWD) XPPMOD=$(XPPMOD) modules
 +	$(KMAKE) modules
  
--obj-m := $(MODULESO)
+-xpp: linux26
 +obj-m += $(MODULESO)
  
  #ifneq ($(TOPDIR),)
@@ -40,7 +40,7 @@
  		if ! [ -f wcfxsusb.ko ]; then \
  			rm -f $(INSTALL_PREFIX)/lib/modules/$(KVERS)/misc/wcfxsusb.ko; \
  		fi; \
-@@ -404,16 +407,22 @@
+@@ -404,18 +407,22 @@
  	install -m 644 tonezone.h $(INC_DIR)
  	install -m 644 zaptel.h torisa.h $(INC_DIR)/linux
  
@@ -59,6 +59,8 @@
  	rm -f *.o ztcfg tzdriver sethdlc sethdlc-new
  	rm -f $(TZOBJS) $(LIBTONEZONE_SO) *.lo
 -	rm -f *.ko *.mod.c .*o.cmd
+-	rm -f xpp/*.ko xpp/*.mod.c xpp/.*o.cmd
+-	rm -f xpp/*.o xpp/*.mod.o
 +ifeq (${BUILDVER},linux26)
 +	$(KMAKE) clean
 +endif