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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-06 21:35:29 +0000 (Sat, 06 Aug 2011)
New Revision: 676

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.links
   fglrx-driver/trunk/debian/fglrx-glx-ia32.links
   fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
   fglrx-driver/trunk/debian/fglrx-glx.links
   fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
   fglrx-driver/trunk/debian/rules
Log:
Keep upstream's names of fglrx-libGL.so.1.2 and fglrx-libglx.so, add or adjust symlinks instead.

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/changelog	2011-08-06 21:35:29 UTC (rev 676)
@@ -14,6 +14,8 @@
   * Stop shipping libfglrx_dm.a, there is a shared library available.
   * Put libglx.so back into the fglrx-driver package.
   * 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.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 04 Aug 2011 23:42:27 +0200
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.links	2011-08-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/fglrx-driver.links	2011-08-06 21:35:29 UTC (rev 676)
@@ -2,3 +2,4 @@
 /usr/lib/libXvBAW.so.1.0 /usr/lib/libXvBAW.so.1
 /usr/lib/libXvBAW.so.1 /usr/lib/libXvBAW.so
 /usr/lib/libatiuki.so.1.0 /usr/lib/libatiuki.so.1
+usr/lib/fglrx/fglrx-libglx.so.1		usr/lib/fglrx/libglx.so

Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.links	2011-08-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.links	2011-08-06 21:35:29 UTC (rev 676)
@@ -1,2 +1,2 @@
 /usr/lib32/libatiuki.so.1.0 /usr/lib32/libatiuki.so.1
-/usr/lib32/libGL.so.1.2 /usr/lib32/libGL.so.1
+/usr/lib32/fglrx-libGL.so.1.2 /usr/lib32/libGL.so.1

Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides	2011-08-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides	2011-08-06 21:35:29 UTC (rev 676)
@@ -2,8 +2,9 @@
 spelling-error-in-binary usr/lib32/dri/fglrx_dri.so ouput output
 spelling-error-in-binary usr/lib32/dri/fglrx_dri.so UNKOWN UNKNOWN
 no-upstream-changelog
-shlib-with-non-pic-code usr/lib32/libGL.so.1.2
+diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:.*
+shlib-with-non-pic-code usr/lib32/fglrx-libGL.so.1.2
 no-symbols-control-file usr/lib32/libatiuki.so.1.0
-no-symbols-control-file usr/lib32/libGL.so.1.2
+no-symbols-control-file usr/lib32/fglrx-libGL.so.1.2
 shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
 sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so

Modified: fglrx-driver/trunk/debian/fglrx-glx.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.links	2011-08-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/fglrx-glx.links	2011-08-06 21:35:29 UTC (rev 676)
@@ -1 +1 @@
-/usr/lib/fglrx/libGL.so.1.2 /usr/lib/fglrx/libGL.so.1
+/usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/fglrx/libGL.so.1

Modified: fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides	2011-08-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides	2011-08-06 21:35:29 UTC (rev 676)
@@ -1,3 +1,3 @@
 no-upstream-changelog
-[i386]: shlib-with-non-pic-code usr/lib/fglrx/libGL.so.1.2
+[i386]: shlib-with-non-pic-code usr/lib/fglrx/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-06 20:52:41 UTC (rev 675)
+++ fglrx-driver/trunk/debian/rules	2011-08-06 21:35:29 UTC (rev 676)
@@ -53,12 +53,6 @@
 	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)/*
-	mv debian/fglrx-driver/usr/lib/fglrx/fglrx-libglx.so \
-	    debian/fglrx-driver/usr/lib/fglrx/libglx.so
-	mv debian/fglrx-glx/usr/lib/fglrx/fglrx-libGL.so.1.2 \
-	    debian/fglrx-glx/usr/lib/fglrx/libGL.so.1.2
-	test $(arch) != x86_64 || mv debian/fglrx-glx-ia32/usr/lib32/fglrx-libGL.so.1.2 \
-	    debian/fglrx-glx-ia32/usr/lib32/libGL.so.1.2
 	dh_installdeb
 
 get-orig-source-checks: