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

[Kilian Krause]

Author: kilian
Date: 2006-01-11 21:42:54 +0000 (Wed, 11 Jan 2006)
New Revision: 1163

Modified:
   zaptel/trunk/debian/changelog
   zaptel/trunk/debian/rules
Log:
trial and error yielded setting KVERS is useless....


Modified: zaptel/trunk/debian/changelog
===================================================================
--- zaptel/trunk/debian/changelog	2006-01-11 19:32:10 UTC (rev 1162)
+++ zaptel/trunk/debian/changelog	2006-01-11 21:42:54 UTC (rev 1163)
@@ -1,8 +1,8 @@
 zaptel (1:1.2.1-4) UNRELEASED; urgency=low
 
   [ Kilian Krause ]
-  * Use KSRC as proposed on http://wiki.debian.org/KernelModulesPackaging to
-    build zaptel kernel module (Closes: #343521)
+  * Install zaptel kernel modules into properly named directory (Closes: #343521)
+
   [ Tzafrir Cohen ]
   * ukcid.dpatch: for UK Caller ID support (Zaptel part, closes: #302380)
   * newer versions of genzaptelconf and xpp.dpatch

Modified: zaptel/trunk/debian/rules
===================================================================
--- zaptel/trunk/debian/rules	2006-01-11 19:32:10 UTC (rev 1162)
+++ zaptel/trunk/debian/rules	2006-01-11 21:42:54 UTC (rev 1163)
@@ -40,14 +40,8 @@
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	KVERS="$(uname -r)"
-	if [ -e "/lib/modules/$(KVERS)/build" ]; then
-	    export KSRC="/lib/modules/$(KVERS)/build"
-	elif [ -d "/usr/src/linux-headers-$(KVERS)" ]; then
-	    export KSRC="/usr/src/linux-headers-$(KVERS)"
-	fi
 	make modules KERNEL_SOURCES=$(KSRC) MODVERSIONS=detect KERNEL=linux-$(KVERS)
-	make install-modules  INSTALL_PREFIX=$(CURDIR)/debian/$(PKGNAME)
+	make install-modules KERNELRELEASE=$(KVERS) INSTALL_PREFIX=$(CURDIR)/debian/$(PKGNAME)
 ifeq (2.6,$(shell echo $(KVERS) | cut -d. -f1-2))
 	# The 2.6 modules are way too big. This is only in kernel 2.6
 	find debian/$(PKGNAME)/lib/modules -name '*.ko' |xargs strip -g