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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-06 21:59:43 +0000 (Sat, 06 Aug 2011)
New Revision: 677

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
Simplify and reorder debian/rules.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-06 21:35:29 UTC (rev 676)
+++ fglrx-driver/trunk/debian/changelog	2011-08-06 21:59:43 UTC (rev 677)
@@ -16,6 +16,7 @@
   * Do not install duplicate copies of the Xorg modules.  (Closes: #636450)
   * Keep upstream's names of fglrx-libGL.so.1.2 and fglrx-libglx.so, add or
     adjust symlinks instead.
+  * Simplify and reorder debian/rules.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 04 Aug 2011 23:42:27 +0200
 

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-06 21:35:29 UTC (rev 676)
+++ fglrx-driver/trunk/debian/rules	2011-08-06 21:59:43 UTC (rev 677)
@@ -36,6 +36,13 @@
 	    --with-xserver=Xorg
 	$(MAKE) -C debian/man
 
+override_dh_install:
+	dh_install
+	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-$(upstream_version)/*
+
 # Install reportbug files in all binary packages
 override_dh_bugfiles:
 	dh_bugfiles -A
@@ -48,13 +55,6 @@
 	test ! -d debian/fglrx-glx-ia32 || \
 	    sed -i -e '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' debian/fglrx-glx-ia32/DEBIAN/shlibs
 
-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-$(upstream_version)/*
-	dh_installdeb
-
 get-orig-source-checks:
 	# This target needs DEB_BUILD_OPTIONS to contain the version specification
 	# in the following form: VER=some.version.number
@@ -89,7 +89,8 @@
 	rm -fr $(packagename)-$(NEW_UPSTREAM_VERSION).orig
 	rm -f $(INSTALLER)
 
-get-orig-source: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2 ;
+.PHONY: get-orig-source
+get-orig-source: ../$(packagename)_$(NEW_UPSTREAM_VERSION).orig.tar.bz2
 
 %:
 	dh ${@}