[Pkg-fglrx-devel] r315 - fglrx-driver/trunk/debian

[Patrick Matthäi]

Author: pmatthaei
Date: 2009-11-02 21:28:11 +0000 (Mon, 02 Nov 2009)
New Revision: 315

Added:
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install
Modified:
   fglrx-driver/trunk/debian/rules
Log:
Try to install all needed dkms files etc.


Copied: fglrx-driver/trunk/debian/fglrx-modules-dkms.install (from rev 311, fglrx-driver/trunk/debian/fglrx-source.install)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2009-11-02 21:28:11 UTC (rev 315)
@@ -0,0 +1,4 @@
+common/lib/modules/fglrx/build_mod/*.c usr/src/fglrx-VERSION/
+common/lib/modules/fglrx/build_mod/*.h usr/src/fglrx-VERSION/
+common/lib/modules/fglrx/build_mod/*.sh usr/src/fglrx-VERSION/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-VERSION/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2009-11-02 21:19:12 UTC (rev 314)
+++ fglrx-driver/trunk/debian/rules	2009-11-02 21:28:11 UTC (rev 315)
@@ -26,6 +26,7 @@
 UPSTREAM_VERSION := $(shell dpkg-parsechangelog|egrep '^Version:'|cut -d' ' -f2|cut -d':' -f2|sed 's/-.+*$//')
 
 KSRCDIR  := usr/src/modules/fglrx
+DKMSBASE	:= usr/src/fglrx-VERSION
 DKMSSRCDIR := usr/src/fglrx-$(UPSTREAM_VERSION)
 
 ifeq ($(DEB_BUILD_ARCH),amd64)
@@ -75,7 +76,6 @@
 	dh_clean
 	rm -rf usr lib etc opt
 	rm -rf extra_src
-	rm -f debian/dkms/dkms.conf
 	# Clean manpages.
 	[ ! -f debian/man/Makefile ] || $(MAKE) -C debian/man distclean
 
@@ -103,6 +103,7 @@
 	dh_install -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri"
 	dh_install -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib/xorg/modules"
 	dh_install -p$(PKG_source)  "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(KSRCDIR)"
+	dh_install -p$(PKG_dkms)	"$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)"
 	dh_install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin"
 ifeq ($(DEB_BUILD_ARCH),amd64)
     # Replace library paths -- careful, these are binary files!
@@ -120,7 +121,9 @@
 endif
 	# Generate dkms.conf.
 	cat debian/dkms/dkms.conf.template|sed "s/_VERSION_/$(UPSTREAM_VERSION)/g" \
-		> debian/dkms/dkms.conf
+		> debian/$(PKG_dkms)/$(DKMSBASE)/dkms.conf
+	# Rename the DKMSBASE to DKMSSRCDIR.
+	mv debian/$(PKG_dkms)/$(DKMSBASE) debian/$(PKG_dkms)/$(DKMSSRCDIR)
 	# Create symlinks to shared libs; fixes a lintian error.
 	/sbin/ldconfig -n debian/$(PKG_glx)/usr/lib
 	/sbin/ldconfig -n debian/$(PKG_glx_ia32)/usr/lib32