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

[Michael Gilbert]

Author: gilbert-guest
Date: 2011-08-04 06:01:35 +0000 (Thu, 04 Aug 2011)
New Revision: 649

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
   fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
   fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
   fglrx-driver/trunk/debian/rules
Log:
redirect shlibs

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-04 06:01:25 UTC (rev 648)
+++ fglrx-driver/trunk/debian/changelog	2011-08-04 06:01:35 UTC (rev 649)
@@ -5,6 +5,8 @@
   * Minimize B-D, drop B-D versioning if satisfied in oldstable (lenny)
   * Rename debian/reportbug/script to debian/bug-script and use dh_bugfiles -A
     to install it in all packages.
+  * Redirect shlibs dependency of libGL.so.1 from fglrx-glx and fglrx-glx-ia32
+    to libgl1-mesa-glx | libgl1 and ia32-libs.
 
   [ Michael Gilbert ]
   * Handle generated files more robustly.

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-08-04 06:01:25 UTC (rev 648)
+++ fglrx-driver/trunk/debian/control	2011-08-04 06:01:35 UTC (rev 649)
@@ -136,6 +136,7 @@
 Architecture: i386 amd64
 Depends:
  ${misc:Depends},
+ ${shlibs:Depends},
  lsb-base
 Recommends:
  fglrx-driver (= ${binary:Version}),

Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides	2011-08-04 06:01:25 UTC (rev 648)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides	2011-08-04 06:01:35 UTC (rev 649)
@@ -3,6 +3,6 @@
 fglrx-glx-ia32: spelling-error-in-binary usr/lib32/dri/fglrx_dri.so UNKOWN UNKNOWN
 fglrx-glx-ia32: no-upstream-changelog
 fglrx-glx-ia32: shlib-with-non-pic-code usr/lib32/libGL.so.1.2
-fglrx-glx-ia32: shlib-missing-in-control-file libGL 1 for usr/lib32/libGL.so.1.2
 fglrx-glx-ia32: no-symbols-control-file usr/lib32/libatiuki.so.1.0
 fglrx-glx-ia32: no-symbols-control-file usr/lib32/libGL.so.1.2
+fglrx-glx-ia32: shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)

Modified: fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides	2011-08-04 06:01:25 UTC (rev 648)
+++ fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides	2011-08-04 06:01:35 UTC (rev 649)
@@ -1 +1,3 @@
 fglrx-glx: no-upstream-changelog
+[i386]: shlib-with-non-pic-code usr/lib/fglrx/libGL.so.1.2
+shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-04 06:01:25 UTC (rev 648)
+++ fglrx-driver/trunk/debian/rules	2011-08-04 06:01:35 UTC (rev 649)
@@ -37,9 +37,18 @@
 	    --with-xserver=Xorg
 	$(MAKE) -C debian/man
 
+# Install reportbug files in all binary packages
 override_dh_bugfiles:
 	dh_bugfiles -A
 
+# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
+override_dh_makeshlibs:
+	dh_makeshlibs
+	test ! -d debian/fglrx-glx || \
+	    sed -i -e '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' debian/fglrx-glx/DEBIAN/shlibs
+	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/*