[Pkg-fglrx-devel] r325 - in fglrx-driver/trunk/debian: . dkms

[Patrick Matthäi]

Author: pmatthaei
Date: 2009-11-03 14:30:42 +0000 (Tue, 03 Nov 2009)
New Revision: 325

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/dkms/dkms.conf.template
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install
   fglrx-driver/trunk/debian/rules
Log:
Try to workaround some dkms bugs.


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2009-11-03 10:00:31 UTC (rev 324)
+++ fglrx-driver/trunk/debian/changelog	2009-11-03 14:30:42 UTC (rev 325)
@@ -5,7 +5,7 @@
   * Fix VERSION and UPSTREAM_VERSION in debian/rules.
   * Replace my old email address in the dpatch headers.
 
- -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 03 Nov 2009 10:59:43 +0100
+ -- Patrick Matthäi <pmatthaei at debian.org>  Tue, 03 Nov 2009 11:00:57 +0100
 
 fglrx-driver (1:9-10-1) unstable; urgency=low
 

Modified: fglrx-driver/trunk/debian/dkms/dkms.conf.template
===================================================================
--- fglrx-driver/trunk/debian/dkms/dkms.conf.template	2009-11-03 10:00:31 UTC (rev 324)
+++ fglrx-driver/trunk/debian/dkms/dkms.conf.template	2009-11-03 14:30:42 UTC (rev 325)
@@ -3,5 +3,6 @@
 BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
 DEST_MODULE_LOCATION[0]="/updates/dkms/"
 AUTOINSTALL=yes
+PRE_BUILD="chmod 0755 ${dkms_tree}/fglrx/_VERSION_/build/2.6.x"
 MAKE[0]="pushd ${dkms_tree}/fglrx/_VERSION_/build; sh make.sh --nohints --norootcheck; popd"
 CLEAN="rm -f *.*o"

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2009-11-03 10:00:31 UTC (rev 324)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2009-11-03 14:30:42 UTC (rev 325)
@@ -1,4 +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/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-VERSION/2.6.x/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2009-11-03 10:00:31 UTC (rev 324)
+++ fglrx-driver/trunk/debian/rules	2009-11-03 14:30:42 UTC (rev 325)
@@ -125,6 +125,7 @@
 	# Rename the DKMSBASE to DKMSSRCDIR and fix permissions.
 	mv debian/$(PKG_dkms)/$(DKMSBASE) debian/$(PKG_dkms)/$(DKMSSRCDIR)
 	chmod -x debian/$(PKG_dkms)/$(DKMSSRCDIR)/*
+	chmod 0755 debian/$(PKG_dkms)/$(DKMSSRCDIR)/2.6.x
 	chmod 0755 debian/$(PKG_dkms)/$(DKMSSRCDIR)/make.sh
 	# Create symlinks to shared libs; fixes a lintian error.
 	/sbin/ldconfig -n debian/$(PKG_glx)/usr/lib