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

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: 2007-08-24 22:09:52 +0000 (Fri, 24 Aug 2007)
New Revision: 4284

Added:
   zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch
Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/modulestest
   zaptel/trunk/debian/patches/00list
Log:
* xpp_m_subdirs.dpatch: Fixed building of xpp modules with M= .
* modulestest -r: test current kernel.


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2007-08-24 17:14:58 UTC (rev 4283)
+++ zaptel/trunk/debian/changelog	2007-08-24 22:09:52 UTC (rev 4284)
@@ -4,7 +4,7 @@
 
   [ Kilian Krause ]
   * Add dpkg-dev (>= 1.13.19) to Build-Depends for binary:Version
-  * Correct the zaptel.init to point to correct path of fxotune 
+  * Correct the zaptel.init to point to correct path of fxotune
    (Closes: #439310)
 
   [ Tzafrir Cohen ]
@@ -17,8 +17,10 @@
   * Don't install man pages. 'make install' does that already (Closes: #422943)
   * Fixed building vzaphfc, opvx1200p and ds1x1f of kernel >=2.6.22
     (>= 2.6.19?).
+  * xpp_m_subdirs.dpatch: Fixed building of xpp modules with M= .
+  * modulestest -r: test current kernel.
 
- -- Kilian Krause <kilian at debian.org>  Fri, 24 Aug 2007 09:05:23 +0200
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 25 Aug 2007 01:05:45 +0300
 
 zaptel (1:1.4.5~dfsg-1) unstable; urgency=low
 

Modified: zaptel/trunk/debian/modulestest
===================================================================
--- zaptel/trunk/debian/modulestest	2007-08-24 17:14:58 UTC (rev 4283)
+++ zaptel/trunk/debian/modulestest	2007-08-24 22:09:52 UTC (rev 4284)
@@ -26,7 +26,7 @@
   set -- $MODULESTEST_ARGS
 fi
 
-while getopts ah:s:txX arg
+while getopts ah:rs:t arg
 do
   case "$arg" in
     a) # All of the kernel-headers packages installed:
@@ -34,40 +34,10 @@
       ;;
     h) KERNEL_HEADERS=$OPTARG;;
     s) KERNEL_SOURCES=$OPTARG;;
+    r) KERNEL_HEADERS=`uname -r`;;
     t) # TODO: make this test per-distro or something 
       KERNEL_HEADERS=2.4.27-2-386,2.6.8-2-686-smp
       ;;
-    x)
-      # used internally in xorcom. Don't like it: file a bug report to remove
-      # it (Tzafrir)
-      for conf in 386 686 686-smp k7 k7-smp
-      do
-        for ver in 2.4.27-2 2.4.27-3 2.6.8-2 2.6.8-3
-        do
-          KERNEL_HEADERS=$KERNEL_HEADERS,$ver-$conf
-        done
-      done
-      for conf in 386 686 k7 rapidbox2
-      do
-        for ver in 2.6.12-1
-        do
-          KERNEL_HEADERS=$KERNEL_HEADERS,$ver-$conf
-        done
-      done
-      # remove the leading ',':
-      KERNEL_HEADERS=${KERNEL_HEADERS#,}
-      ;;
-    X)
-      for conf in 386 686 k7 rapidbox2
-      do
-        for ver in 2.6.12-1
-        do
-          KERNEL_HEADERS=$KERNEL_HEADERS,$ver-$conf
-        done
-      done
-      # remove the leading ',':
-      KERNEL_HEADERS=${KERNEL_HEADERS#,}
-      ;;
   esac
 done
 shift $(( $OPTIND-1 ))

Modified: zaptel/trunk/debian/patches/00list
===================================================================
--- zaptel/trunk/debian/patches/00list	2007-08-24 17:14:58 UTC (rev 4283)
+++ zaptel/trunk/debian/patches/00list	2007-08-24 22:09:52 UTC (rev 4284)
@@ -3,3 +3,4 @@
 bristuff
 zaphfc-florz
 zaptel_perl
+xpp_m_subdirs

Added: zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch
===================================================================
--- zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch	                        (rev 0)
+++ zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch	2007-08-24 22:09:52 UTC (rev 4284)
@@ -0,0 +1,22 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## xpp_m_subdirs.dpatch by Tzafrir Cohen <tzafrir.cohen at xorcom.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: The xpp makefile has a tweak for allowing it to be a symlink
+## DP: rather than a real subdir.
+## DP: However this requires knowing if we were called with SUBDIRS=
+## DP: (as zaptel does) or with M= (as linux-2.6-modules-extra does).
+
+ at DPATCH@
+diff -urNad zaptel-1.4.5.1~dfsg~/xpp/Makefile zaptel-1.4.5.1~dfsg/xpp/Makefile
+--- zaptel-1.4.5.1~dfsg~/xpp/Makefile	2007-08-24 23:17:40.000000000 +0300
++++ zaptel-1.4.5.1~dfsg/xpp/Makefile	2007-08-24 23:19:01.000000000 +0300
+@@ -1,4 +1,8 @@
++ifdef SUBDIRS
+ ZAPTEL_DIR	= $(SUBDIRS)
++else
++ZAPTEL_DIR	= $(M)
++endif
+ 
+ EXTRA_CFLAGS	=	$(XPP_LOCAL_CFLAGS)	\
+ 			-I$(ZAPTEL_DIR)	\


Property changes on: zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch
___________________________________________________________________
Name: svn:executable
   + *