[Pkg-fglrx-devel] r970 - in fglrx-driver/trunk/debian: . module

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-07-08 22:20:02 +0000 (Sun, 08 Jul 2012)
New Revision: 970

Added:
   fglrx-driver/trunk/debian/fglrx-driver.doc-base.in
   fglrx-driver/trunk/debian/module/control.template.in
Removed:
   fglrx-driver/trunk/debian/fglrx-driver.doc-base
   fglrx-driver/trunk/debian/module/control.template
Modified:
   fglrx-driver/trunk/debian/rules
Log:
prepare doc-base and control.template for variable substitution

Deleted: fglrx-driver/trunk/debian/fglrx-driver.doc-base
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.doc-base	2012-07-08 21:36:30 UTC (rev 969)
+++ fglrx-driver/trunk/debian/fglrx-driver.doc-base	2012-07-08 22:20:02 UTC (rev 970)
@@ -1,9 +0,0 @@
-Document: fglrx-driver
-Title: fglrx driver manuals
-Author: AMD
-Abstract: fglrx driver user manuals
-Section: System/Hardware
-
-Format: HTML
-Index: /usr/share/doc/fglrx-driver/user-manual/index.html
-Files: /usr/share/doc/fglrx-driver/*.html

Copied: fglrx-driver/trunk/debian/fglrx-driver.doc-base.in (from rev 969, fglrx-driver/trunk/debian/fglrx-driver.doc-base)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.doc-base.in	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-driver.doc-base.in	2012-07-08 22:20:02 UTC (rev 970)
@@ -0,0 +1,9 @@
+Document: fglrx-driver
+Title: fglrx driver manuals
+Author: AMD
+Abstract: fglrx driver user manuals
+Section: System/Hardware
+
+Format: HTML
+Index: /usr/share/doc/fglrx-driver/user-manual/index.html
+Files: /usr/share/doc/fglrx-driver/*.html

Deleted: fglrx-driver/trunk/debian/module/control.template
===================================================================
--- fglrx-driver/trunk/debian/module/control.template	2012-07-08 21:36:30 UTC (rev 969)
+++ fglrx-driver/trunk/debian/module/control.template	2012-07-08 22:20:02 UTC (rev 970)
@@ -1,25 +0,0 @@
-Source: fglrx-driver
-Section: non-free/kernel
-Priority: extra
-Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
-Uploaders:
- Patrick Matthäi <pmatthaei at debian.org>,
- Michael Gilbert <michael.s.gilbert at gmail.com>,
-Build-Depends: debhelper (>= 8)
-Standards-Version: 3.9.2
-Homepage: http://ati.amd.com/support/drivers/linux/linux-radeon.html
-
-Package: fglrx-kernel-#KVERS#
-Architecture: i386 amd64
-Recommends: linux-image-#KVERS#
-Provides: fglrx-kernel-${fglrx:version}
-Description: FGLRX binary kernel module for Linux #KVERS#
- FGLRX / AMD Catalyst is the non-free proprietary display driver for the
- ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
- the newest free driver xserver-xorg-video-radeon.
- .
- This package provides the non-free FGLRX binary kernel module built for
- the Debian Linux kernel package. This kernel module is necessary to have
- accelerated 3D support within the ATI/AMD proprietary display driver.
- .
- This package is built for linux-image-#KVERS#.

Copied: fglrx-driver/trunk/debian/module/control.template.in (from rev 969, fglrx-driver/trunk/debian/module/control.template)
===================================================================
--- fglrx-driver/trunk/debian/module/control.template.in	                        (rev 0)
+++ fglrx-driver/trunk/debian/module/control.template.in	2012-07-08 22:20:02 UTC (rev 970)
@@ -0,0 +1,25 @@
+Source: fglrx-driver
+Section: non-free/kernel
+Priority: extra
+Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
+Uploaders:
+ Patrick Matthäi <pmatthaei at debian.org>,
+ Michael Gilbert <michael.s.gilbert at gmail.com>,
+Build-Depends: debhelper (>= 8)
+Standards-Version: 3.9.2
+Homepage: http://ati.amd.com/support/drivers/linux/linux-radeon.html
+
+Package: fglrx-kernel-#KVERS#
+Architecture: i386 amd64
+Recommends: linux-image-#KVERS#
+Provides: fglrx-kernel-${fglrx:version}
+Description: FGLRX binary kernel module for Linux #KVERS#
+ FGLRX / AMD Catalyst is the non-free proprietary display driver for the
+ ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try
+ the newest free driver xserver-xorg-video-radeon.
+ .
+ This package provides the non-free FGLRX binary kernel module built for
+ the Debian Linux kernel package. This kernel module is necessary to have
+ accelerated 3D support within the ATI/AMD proprietary display driver.
+ .
+ This package is built for linux-image-#KVERS#.

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-07-08 21:36:30 UTC (rev 969)
+++ fglrx-driver/trunk/debian/rules	2012-07-08 22:20:02 UTC (rev 970)
@@ -34,7 +34,7 @@
 			$(patsubst debian/libgl1-fglrx%,debian/libgl1-fglrx$(legacy)%,\
 			$(patsubst debian/amd-opencl-icd%,debian/amd-opencl-icd$(legacy)%,\
 				$(RENAME_CONTROL)))))
-TEMPLATES	:= $(wildcard debian/*.in)
+TEMPLATES	:= $(wildcard debian/*.in debian/module/*.in)
 AUTOGEN		+= $(patsubst %.in,%,$(TEMPLATES))
 AUTOGEN		+= fglrx.ids
 AUTOGEN		+= debian/switchlibglx
@@ -114,7 +114,7 @@
 badlib64files	+= ./debian/fglrx-driver/usr/bin/aticonfig
 
 override_dh_install:
-	dh_install
+	dh_install -X.in
 	chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
 	test ! -d debian/libgl1-fglrx-glx || \
 		rpl -e	'/usr/X11R6/lib/modules/dri\0' \