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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-02-16 10:56:06 +0000 (Thu, 16 Feb 2012)
New Revision: 852

Added:
   fglrx-driver/trunk/debian/fglrx-modules-dkms.dkms
Removed:
   fglrx-driver/trunk/debian/dkms.conf.in
   fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst.in
   fglrx-driver/trunk/debian/fglrx-modules-dkms.prerm.in
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
   fglrx-driver/trunk/debian/rules
Log:
Switch to dh --with dkms. Let dh_dkms generate the maintainer scripts.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/changelog	2012-02-16 10:56:06 UTC (rev 852)
@@ -6,6 +6,7 @@
     (Closes: #657604)
   * Bump debhelper dependency to 9.
   * Redirect bug reports against module binary packages to fglrx-source.
+  * Switch to dh --with dkms. Let dh_dkms generate the maintainer scripts.
 
   [ Patrick Matthäi ]
   * Include all installed fglrx packages in the bug-script.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/control	2012-02-16 10:56:06 UTC (rev 852)
@@ -23,6 +23,7 @@
  chrpath,
  automake,
  rpl,
+ dkms (>= 2.1.1.1),
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-driver/trunk
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/
@@ -229,7 +230,7 @@
 Architecture: i386 amd64
 Depends:
  ${misc:Depends},
- dkms,
+ dkms (>= 2.1),
 Suggests:
  fglrx-driver,
 Provides:

Deleted: fglrx-driver/trunk/debian/dkms.conf.in
===================================================================
--- fglrx-driver/trunk/debian/dkms.conf.in	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/dkms.conf.in	2012-02-16 10:56:06 UTC (rev 852)
@@ -1,6 +0,0 @@
-PACKAGE_NAME="fglrx"
-PACKAGE_VERSION="_VERSION_"
-BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
-DEST_MODULE_LOCATION[0]="/updates"
-AUTOINSTALL=yes
-CLEAN="rm -f *.*o"

Copied: fglrx-driver/trunk/debian/fglrx-modules-dkms.dkms (from rev 851, fglrx-driver/trunk/debian/dkms.conf.in)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.dkms	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.dkms	2012-02-16 10:56:06 UTC (rev 852)
@@ -0,0 +1,6 @@
+PACKAGE_NAME="fglrx"
+PACKAGE_VERSION="#MODULE_VERSION#"
+BUILT_MODULE_NAME[0]="$PACKAGE_NAME"
+DEST_MODULE_LOCATION[0]="/updates"
+AUTOINSTALL=yes
+CLEAN="rm -f *.*o"

Modified: fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.install.in	2012-02-16 10:56:06 UTC (rev 852)
@@ -1,5 +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/2.6.x/Makefile	usr/src/fglrx-_VERSION_/
-debian/dkms.conf					usr/src/fglrx-_VERSION_/
 arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a	usr/src/fglrx-_VERSION_/

Deleted: fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst.in	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst.in	2012-02-16 10:56:06 UTC (rev 852)
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-if [ "$1" = "configure" ]; then
-
-	if [ -z "$(dkms status -m fglrx -v _VERSION_)" ]; then
-		dkms add -m fglrx -v _VERSION_
-	fi
-
-	cd /lib/modules
-	ls | while read kversion ; do
-		if [ -e $kversion/build/include/linux/version.h ] ; then
-			dkms build -m fglrx -v _VERSION_ -k $kversion || true
-			dkms install -m fglrx -v _VERSION_ -k $kversion --force || true
-		fi
-	done
-
-fi
-
-#DEBHELPER#

Deleted: fglrx-driver/trunk/debian/fglrx-modules-dkms.prerm.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-modules-dkms.prerm.in	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/fglrx-modules-dkms.prerm.in	2012-02-16 10:56:06 UTC (rev 852)
@@ -1,6 +0,0 @@
-#!/bin/sh
-set -e
-
-dkms remove -m fglrx -v _VERSION_ --all || true
-
-#DEBHELPER#

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-02-15 22:31:38 UTC (rev 851)
+++ fglrx-driver/trunk/debian/rules	2012-02-16 10:56:06 UTC (rev 852)
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-packagename=$(shell dpkg-parsechangelog | sed -nr '/^Source:/s/Source: (.*)/\1/p')
-upstream_version=$(shell dpkg-parsechangelog|grep "^Version:"|cut -d" " -f2|rev|cut -d- -f2-|rev|cut -d':' -f2)
+packagename		:= $(shell dpkg-parsechangelog | sed -nr '/^Source:/s/Source: (.*)/\1/p')
+upstream_version	:= $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
 
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
@@ -31,7 +31,7 @@
 	       < $< > $@
 
 %:
-	dh $@
+	dh $@ --with dkms
 
 override_dh_auto_clean:
 	test ! -f debian/man/Makefile || $(MAKE) -C debian/man maintainer-clean
@@ -95,6 +95,9 @@
 		--owner=root --group=src --remove-files \
 		--directory debian/fglrx-source/usr/src/ modules
 
+override_dh_dkms:
+	dh_dkms -V $(upstream_version)
+
 # Install reportbug files in all binary packages
 override_dh_bugfiles:
 	dh_bugfiles -A