[Pkg-iscsi-maintainers] [SCM] Debian iscsitarget packaging branch, master, updated. debian/1.4.20.1-2-21-gcff6ba4

[Ritesh Raj Sarraf]

The following commit has been merged in the master branch:
commit 11f435240009c688d8e8624d17abe8b5dc3168d6
Author: Ritesh Raj Sarraf <rrs at researchut.com>
Date:   Mon Aug 2 19:51:59 2010 +0530

    install to correct path for dkms

diff --git a/debian/rules b/debian/rules
index cbad9c5..2bd46af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -231,34 +231,34 @@ install-indep:
 	
 	# For DKMS
 	# Create the directories to install the source into
-	dh_installdirs -p$(pdkms)  usr/src/modules/$(PACKAGE)
-	dh_installdirs -p$(pdkms)  usr/src/modules/$(PACKAGE)/debian
-	dh_installdirs -p$(pdkms)  usr/src/modules/$(PACKAGE)/include
-	dh_installdirs -p$(pdkms)  usr/src/modules/$(PACKAGE)/kernel
-	dh_installdirs -p$(pdkms)  usr/src/modules/$(PACKAGE)/patches
+	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)
+	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
+	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/include
+	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/kernel
+	dh_installdirs -p$(pdkms)  usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/patches
 	
 	# Copy only the driver source to the proper location
-	cp kernel/*  debian/$(pdkms)/usr/src/modules/$(PACKAGE)/kernel/
-	cp include/* debian/$(pdkms)/usr/src/modules/$(PACKAGE)/include/
-	cp patches/* debian/$(pdkms)/usr/src/modules/$(PACKAGE)/patches/
+	cp kernel/*  debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/kernel/
+	cp include/* debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/include/
+	cp patches/* debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/patches/
 	
 	# Copy the needed debian/ pieces to the proper location
 	cp debian/*-module-* \
-		debian/$(pdkms)/usr/src/modules/$(PACKAGE)/debian
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
 	cp debian/control.modules.in \
-		debian/$(pdkms)/usr/src/modules/$(PACKAGE)/debian/control.in
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian/control.in
 	cp debian/rules \
-		debian/$(pdkms)/usr/src/modules/$(PACKAGE)/debian
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
 	cp debian/changelog \
-		debian/$(pdkms)/usr/src/modules/$(PACKAGE)/debian
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
 	cp debian/copyright \
-		debian/$(pdkms)/usr/src/modules/$(PACKAGE)/debian
+		debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
 	
 	# install debian/ files
-	cd debian ; cp changelog control compat *.modules.in rules copyright $(pdkms)/usr/src/modules/$(PACKAGE)/debian
+	cd debian ; cp changelog control compat *.modules.in rules copyright $(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/debian
 	
 	# create toplevel module Makefile
-	echo "obj-m = kernel/" > debian/$(pdkms)/usr/src/modules/$(PACKAGE)/Makefile
+	echo "obj-m = kernel/" > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/Makefile
 	
 	# Prepare dkms.conf from the dkms.conf.in template
 	sed "s/__VERSION__/$(DEB_UPSTREAM_VERSION)/g" debian/dkms.conf.in > debian/$(pdkms)/usr/src/$(PACKAGE)-$(DEB_UPSTREAM_VERSION)/dkms.conf

-- 
Debian iscsitarget packaging