[Pkg-voip-commits] r7590 - in /dahdi-linux/trunk/debian: changelog patches/series patches/zaphfc patches/zaphfc_no_owner rules

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Sep 12 19:07:48 2009
New Revision: 7590

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7590
Log:
Patch zaphfc_no_owner accpted upstream. Updating zaphfc to r4

(With one minor fix: the while(0);)

Removed:
    dahdi-linux/trunk/debian/patches/zaphfc_no_owner
Modified:
    dahdi-linux/trunk/debian/changelog
    dahdi-linux/trunk/debian/patches/series
    dahdi-linux/trunk/debian/patches/zaphfc
    dahdi-linux/trunk/debian/rules

Modified: dahdi-linux/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/changelog?rev=7590&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/changelog (original)
+++ dahdi-linux/trunk/debian/changelog Sat Sep 12 19:07:48 2009
@@ -8,9 +8,8 @@
   * Remove obsolete bristuff drivers we don't build anyway.
     Leave vzaphfc for now as this is practically upstream.
   * Not applying bri_dchan. Astribank BRI spans will use hardhdlc.
-  * Patch zaphfc_no_owner: Fix zaphfc with kernel 2.6.30.
-
- -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Tue, 11 Aug 2009 15:11:53 +0300
+
+ -- Tzafrir Cohen <tzafrir.cohen at xorcom.com>  Sat, 12 Sep 2009 21:27:40 +0300
 
 dahdi-linux (1:2.2.0~dfsg~rc5-1) unstable; urgency=low
 

Modified: dahdi-linux/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/series?rev=7590&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/series (original)
+++ dahdi-linux/trunk/debian/patches/series Sat Sep 12 19:07:48 2009
@@ -13,4 +13,3 @@
 oslec_kbuild
 no_firmware_download
 mmx_auto
-zaphfc_no_owner

Modified: dahdi-linux/trunk/debian/patches/zaphfc
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/patches/zaphfc?rev=7590&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/patches/zaphfc (original)
+++ dahdi-linux/trunk/debian/patches/zaphfc Sat Sep 12 19:07:48 2009
@@ -1,9 +1,9 @@
-zaphfc r3
+zaphfc r4
 
 diff -Npur old/drivers/dahdi/zaphfc/base.c new/drivers/dahdi/zaphfc/base.c
 --- old/drivers/dahdi/zaphfc/base.c	1970-01-01 02:00:00.000000000 +0200
-+++ new/drivers/dahdi/zaphfc/base.c	2009-08-07 08:08:57.000000000 +0300
-@@ -0,0 +1,1701 @@
++++ new/drivers/dahdi/zaphfc/base.c	2009-09-08 03:49:24.000000000 +0300
+@@ -0,0 +1,1707 @@
 +/*
 + * zaphfc.c - Dahdi driver for HFC-S PCI A based ISDN BRI cards
 + *
@@ -74,6 +74,12 @@
 +#endif
 +#ifndef TRUE
 +#define TRUE (!FALSE)
++#endif
++
++#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)
++#define	SET_PROC_DIRENTRY_OWNER(p)	do { (p)->owner = THIS_MODULE; } while(0);
++#else
++#define	SET_PROC_DIRENTRY_OWNER(p)	do { } while(0);
 +#endif
 +
 +static struct pci_device_id hfc_pci_ids[] = {
@@ -1562,7 +1568,7 @@
 +			sizeof(card->proc_dir_name),
 +			"%d", card->cardnum);
 +	card->proc_dir = proc_mkdir(card->proc_dir_name, hfc_proc_zaphfc_dir);
-+	card->proc_dir->owner = THIS_MODULE;
++	SET_PROC_DIRENTRY_OWNER(card->proc_dir);
 +
 +	hfc_resetCard(card);
 +

Modified: dahdi-linux/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-voip/dahdi-linux/trunk/debian/rules?rev=7590&op=diff
==============================================================================
--- dahdi-linux/trunk/debian/rules (original)
+++ dahdi-linux/trunk/debian/rules Sat Sep 12 19:07:48 2009
@@ -185,7 +185,7 @@
 #   rm -rf old new
 #   mkdir -p old new/drivers/dahdi
 #   svn export http://zaphfc.googlecode.com/svn/branches/2.2/zaphfc/ new/drivers/dahdi/zaphfc
-#   diff -Npur old new >debian/patches/zaphfc
+#   diff -Npur  --no-timestamps old new >debian/patches/zaphfc
 #   rm -rf old new
 
 TARBALL_DIR=../tarballs/$(PACKAGE_SRC)-$(UPVERSION).tmp