[Pkg-voip-commits] r5089 - in /zaptel/trunk/debian: changelog patches/00list patches/xpp_m_subdirs.dpatch

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Tue Dec 11 15:03:16 2007
New Revision: 5089

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=5089
Log:
* Actually fix building xpp with M instead of SUBDIRS.

Modified:
    zaptel/trunk/debian/changelog
    zaptel/trunk/debian/patches/00list
    zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch

Modified: zaptel/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/changelog?rev=5089&op=diff
==============================================================================
--- zaptel/trunk/debian/changelog (original)
+++ zaptel/trunk/debian/changelog Tue Dec 11 15:03:16 2007
@@ -1,6 +1,5 @@
 zaptel (1:1.4.7~dfsg-1) UNRELEASED; urgency=low
 
-  [ Kilian Krause ]
   * NOT RELEASED YET
 
   [ Tzafrir Cohen ]
@@ -19,6 +18,7 @@
   * Don't run ztcfg if zaptel was not loaded. But do fail if ztcfg has failed.
     (Closes: #407996).
   * Don't build wcopenpci on big endian platforms (Module gives #error there).
+  * Actually fix building xpp with M instead of SUBDIRS.
 
   [ Faidon Liambotis ]
   * Don't delete old device nodes on installations since it's needed only for

Modified: zaptel/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/00list?rev=5089&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/00list (original)
+++ zaptel/trunk/debian/patches/00list Tue Dec 11 15:03:16 2007
@@ -3,3 +3,4 @@
 bristuff
 zaphfc-florz
 zaptel_perl
+xpp_m_subdirs

Modified: zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch
URL: http://svn.debian.org/wsvn/pkg-voip/zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch?rev=5089&op=diff
==============================================================================
--- zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch (original)
+++ zaptel/trunk/debian/patches/xpp_m_subdirs.dpatch Tue Dec 11 15:03:16 2007
@@ -4,19 +4,20 @@
 ## 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).
+## DP: The fix from a previous version was commited, but aparantly with 
+## DP: a typo. 
+## DP: This patch should be included in zaptel 1.4.8 .
 
 @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
+diff -urNad zaptel-1.4.7~dfsg~/xpp/Makefile zaptel-1.4.7~dfsg/xpp/Makefile
+--- zaptel-1.4.7~dfsg~/xpp/Makefile	2007-10-18 20:21:02.000000000 +0200
++++ zaptel-1.4.7~dfsg/xpp/Makefile	2007-12-11 15:22:17.988431432 +0200
+@@ -1,7 +1,7 @@
+ ifdef SUBDIRS
+   ZAPTEL_DIR	= $(SUBDIRS)
+ else
+-  ZAPTEL_DIRS	= $(M)
++  ZAPTEL_DIR	= $(M)
+ endif
  
  EXTRA_CFLAGS	=	$(XPP_LOCAL_CFLAGS)	\
- 			-I$(ZAPTEL_DIR)	\