[Pkg-fglrx-devel] r719 - in fglrx-driver/branches/resurrect-fglrx-source/debian: . module

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-10 11:10:40 +0000 (Wed, 10 Aug 2011)
New Revision: 719

Modified:
   fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
   fglrx-driver/branches/resurrect-fglrx-source/debian/control
   fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template
   fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules
   fglrx-driver/branches/resurrect-fglrx-source/debian/rules
Log:
add virtual provides/recommends fglrx-kernel-UPSTREAMVERSION

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/changelog	2011-08-10 11:02:08 UTC (rev 718)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/changelog	2011-08-10 11:10:40 UTC (rev 719)
@@ -4,6 +4,9 @@
   * Add more copyright statements and licenses to debian/copyright.
   * Let dh_installmodules handle the modprobe blacklist config.
   * 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.
   * Include libfglrx_ip.a for both architectures in the module source.
   * Add patch 04-build-x86_64-on-x86.diff: add support for building the 64-bit
     kernel module in 32-bit userspace, i.e. for linux-image-*-amd64 on i386.

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/control
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/control	2011-08-10 11:02:08 UTC (rev 718)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/control	2011-08-10 11:10:40 UTC (rev 719)
@@ -34,7 +34,7 @@
  xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
  glx-alternative-fglrx (>= 0.1.2)
 Recommends:
- fglrx-modules-dkms (= ${binary:Version}),
+ fglrx-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
  fglrx-glx,
  fglrx-glx-ia32 [amd64],
  fglrx-atieventsd
@@ -103,8 +103,7 @@
 Depends: ${misc:Depends}, debhelper (>= 8), make, bzip2
 Recommends: module-assistant | kernel-package
 Suggests: fglrx-driver
-Replaces: fglrx-kernel-src (<< 1:8-4-2)
-Breaks: fglrx-kernel-src (<< 1:8-4-2)
+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
@@ -117,6 +116,7 @@
  ${misc:Depends},
  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

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template	2011-08-10 11:02:08 UTC (rev 718)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/control.template	2011-08-10 11:10:40 UTC (rev 719)
@@ -12,6 +12,7 @@
 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 is the non-free binary video driver for the ATI/AMD RadeonHD and
  FireGL graphics cards. As an alternative, you may try the newest free

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules	2011-08-10 11:02:08 UTC (rev 718)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/module/rules	2011-08-10 11:10:40 UTC (rev 719)
@@ -9,6 +9,8 @@
 export CCACHE_DISABLE := 1
 
 
+upstream_version	:= $(shell dpkg-parsechangelog | sed -nr '/^Version:/s/Version: (.*:)?(.*)-(.*)/\2/p')
+
 baseepoch := $(shell expr $(KDREV) : '\([0-9]*\):.*' 2>/dev/null )
 ifneq ($(baseepoch),)
       EPOCH=$(baseepoch):
@@ -67,7 +69,7 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- -v$(PKG_VERSION)
+	dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:version=$(upstream_version)'
 	dh_md5sums
 ifdef KPKG_DEST_DIR
 	dh_builddeb --destdir=$(KPKG_DEST_DIR)

Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/rules	2011-08-10 11:02:08 UTC (rev 718)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/rules	2011-08-10 11:10:40 UTC (rev 719)
@@ -76,6 +76,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)'
+
 ############################################################################
 
 ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))