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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-07-23 03:50:11 +0000 (Sat, 23 Jul 2011)
New Revision: 638

Modified:
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install
   fglrx-driver/trunk/debian/rules
Log:
fix a couple regressions in dkms build process

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2011-07-23 03:21:37 UTC (rev 637)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install	2011-07-23 03:50:11 UTC (rev 638)
@@ -1,5 +1,6 @@
 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/
 debian/reportbug/script usr/share/bug/fglrx-modules-dkms/
+debian/dkms/dkms.conf usr/src/fglrx-VERSION/
+blib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-VERSION/

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-07-23 03:21:37 UTC (rev 637)
+++ fglrx-driver/trunk/debian/rules	2011-07-23 03:50:11 UTC (rev 638)
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 packagename=fglrx-driver
+upstream_version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
 NEW_UPSTREAM_VERSION=$(subst VER=,,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
@@ -22,7 +23,7 @@
 override_dh_auto_clean:
 	test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
 	rm -f arch/x86/usr/X11R6/lib/libGL.so.1.2 xlib/libGL.so.1.2
-	rm -rf bin sbin lib xlib mlib debian/dkms/dkms.conf
+	rm -rf bin sbin lib xlib blib mlib debian/dkms/dkms.conf
 
 override_dh_auto_configure:
 	cd debian/man && chmod +x autogen.sh && ./autogen.sh --copy
@@ -34,19 +35,21 @@
 	ln -s $(arch)/usr/X11R6/bin bin
 	ln -s $(arch)/usr/$(lib) lib
 	ln -s $(arch)/usr/X11R6/$(lib) xlib
+	ln -s $(arch)/lib blib
 	ln -s $(pic)/usr/X11R6/$(lib) mlib
 
 	cp arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 arch/x86/usr/X11R6/lib/libGL.so.1.2
 	cp xlib/fglrx/fglrx-libGL.so.1.2 xlib/libGL.so.1.2
 
-	sed s/_VERSION_/$(UPSTREAM_VERSION)/g < debian/dkms/dkms.conf.template > debian/dkms/dkms.conf
+	sed s/_VERSION_/$(upstream_version)/g < debian/dkms/dkms.conf.template > debian/dkms/dkms.conf
 
 override_dh_installdeb:
 	chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
 	chmod -x debian/fglrx-control/usr/share/icons/*
+	chmod -x debian/fglrx-driver/etc/ati/atiogl.xml
 	chmod -x debian/fglrx-modules-dkms/usr/src/fglrx-VERSION/*
-	chmod +x debian/fglrx-modules-dkms/usr/src/fglrx-VERSION/make.sh
-	chmod -x debian/fglrx-driver/etc/ati/atiogl.xml
+	mv debian/fglrx-modules-dkms/usr/src/fglrx-VERSION/ \
+	    debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version) 
 	dh_installdeb
 
 get-orig-source-checks::