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

Andreas Beckmann anbe-guest at alioth.debian.org
Sun Sep 4 16:41:18 UTC 2011 

Author: anbe-guest
Date: 2011-09-04 16:41:18 +0000 (Sun, 04 Sep 2011)
New Revision: 776

Added:
   fglrx-driver/trunk/debian/build-module-packages.sh
   fglrx-driver/trunk/debian/fglrx-source.docs
   fglrx-driver/trunk/debian/fglrx-source.install.in
   fglrx-driver/trunk/debian/fglrx-source.lintian-overrides
   fglrx-driver/trunk/debian/module/
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/rules
Log:
merge the resurrect-fglrx-source branch into trunk

Copied: fglrx-driver/trunk/debian/build-module-packages.sh (from rev 775, fglrx-driver/branches/resurrect-fglrx-source/debian/build-module-packages.sh)
===================================================================
--- fglrx-driver/trunk/debian/build-module-packages.sh	                        (rev 0)
+++ fglrx-driver/trunk/debian/build-module-packages.sh	2011-09-04 16:41:18 UTC (rev 776)
@@ -0,0 +1,19 @@
+set -e
+
+test -x /usr/bin/module-assistant || apt-get install module-assistant
+
+cd /usr/src
+
+kernels="$(ls -d1 linux-headers* | grep -v common | sed -e s/linux-headers-//)"
+modules="$(ls -d1 fglrx.tar.bz2 | sed -e s/.tar.bz2// -e '/-kernel/! s/$/-kernel/')"
+
+module-assistant clean $modules
+module-assistant build --text-mode --force --kvers-list "$kernels" $modules
+
+ls -l *.deb
+for m in $modules ; do
+	for k in $kernels ; do
+		echo "* ${m}-${k}:"
+		ls -l ${m}-${k}_*.deb
+	done
+done

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-09-04 16:28:29 UTC (rev 775)
+++ fglrx-driver/trunk/debian/changelog	2011-09-04 16:41:18 UTC (rev 776)
@@ -32,6 +32,10 @@
   * Ensure no mismatching versions of fglrx-driver and libgl1-fglrx-glx can be
     installed.
   * Override the experimental lintian tag shlib-calls-exit.
+  * Resurrect the fglrx-source package.
+  * Add alternate recomends fglrx-kernel-${fglrx:version} to fglrx-driver,
+    this virtual package is provided by the dkms package and the module
+    packages built from fglrx-source.
   * Prepare support for squeeze-backports:
     - Add instructions for squeeze-backports to README.source and a
       prepare-squeeze-backport target to debian/rules that performs the

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-09-04 16:28:29 UTC (rev 775)
+++ fglrx-driver/trunk/debian/control	2011-09-04 16:41:18 UTC (rev 776)
@@ -38,7 +38,7 @@
  xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
  glx-alternative-fglrx (>= 0.1.92),
 Recommends:
- fglrx-modules-dkms (= ${binary:Version}),
+ fglrx-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
  libgl1-fglrx-glx (= ${binary:Version}),
  fglrx-glx-ia32 [amd64],
  fglrx-atieventsd,
@@ -199,6 +199,7 @@
  dkms,
 Suggests:
  fglrx-driver,
+Provides: fglrx-kernel-${fglrx:version}
 Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
  This package provides the kernel build environment and the fglrx modules,
  which are necessary to have accelerated 3D support within the ATI/AMD
@@ -207,6 +208,18 @@
  This package contains the source for the fglrx kernel module, packaged with
  appropriate configuration for DKMS to build new modules dynamically.
 
+Package: fglrx-source
+Section: non-free/kernel
+Architecture: i386 amd64
+Depends: ${misc:Depends}, debhelper (>= 8), make, bzip2
+Recommends: module-assistant | kernel-package
+Suggests: fglrx-driver
+Conflicts: fglrx-kernel-src
+Description: kernel module source for the non-free ATI/AMD RadeonHD display driver
+ This package provides the kernel build environment and the fglrx modules,
+ which are necessary to have accelerated 3D support within the ATI/AMD
+ proprietary display driver.
+
 Package: fglrx-control
 Architecture: i386 amd64
 Depends:

Copied: fglrx-driver/trunk/debian/fglrx-source.docs (from rev 775, fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.docs)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-source.docs	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-source.docs	2011-09-04 16:41:18 UTC (rev 776)
@@ -0,0 +1 @@
+debian/build-module-packages.sh

Copied: fglrx-driver/trunk/debian/fglrx-source.install.in (from rev 775, fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.install.in)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-source.install.in	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-source.install.in	2011-09-04 16:41:18 UTC (rev 776)
@@ -0,0 +1,9 @@
+common/lib/modules/fglrx/build_mod/*.c usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/*.h usr/src/modules/fglrx/
+common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/modules/fglrx/
+arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/modules/fglrx/
+debian/changelog usr/src/modules/fglrx/debian/
+debian/copyright usr/src/modules/fglrx/debian/
+debian/compat usr/src/modules/fglrx/debian/
+debian/module/* usr/src/modules/fglrx/debian/
+debian/bug-script usr/src/modules/fglrx/debian/

Copied: fglrx-driver/trunk/debian/fglrx-source.lintian-overrides (from rev 775, fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-source.lintian-overrides)
===================================================================
--- fglrx-driver/trunk/debian/fglrx-source.lintian-overrides	                        (rev 0)
+++ fglrx-driver/trunk/debian/fglrx-source.lintian-overrides	2011-09-04 16:41:18 UTC (rev 776)
@@ -0,0 +1 @@
+fglrx-source: no-upstream-changelog

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-09-04 16:28:29 UTC (rev 775)
+++ fglrx-driver/trunk/debian/rules	2011-09-04 16:41:18 UTC (rev 776)
@@ -73,6 +73,10 @@
 		rpl -e	'/usr/X11R6/lib/modules/dri\0' \
 			'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
 			debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2
+	chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
+	tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
+		--owner=root --group=src --remove-files \
+		--directory debian/fglrx-source/usr/src/ modules
 
 # Install reportbug files in all binary packages
 override_dh_bugfiles:
@@ -88,6 +92,9 @@
 	    sed -i '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' \
 	    debian/fglrx-glx-ia32/DEBIAN/shlibs
 
+override_dh_gencontrol:
+	dh_gencontrol -- -V'fglrx:version=$(upstream_version)'
+
 ############################################################################
 
 prepare-squeeze-backport:

More information about the Pkg-fglrx-devel mailing list