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

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-06 20:52:41 +0000 (Sat, 06 Aug 2011)
New Revision: 675

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/fglrx-driver.install.in
   fglrx-driver/trunk/debian/fglrx-glx.install.in
   fglrx-driver/trunk/debian/rules
Log:
* Put libglx.so back into the fglrx-driver package.
* Do not install duplicate copies of the Xorg modules.  (Closes: #636450)


Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-06 20:21:30 UTC (rev 674)
+++ fglrx-driver/trunk/debian/changelog	2011-08-06 20:52:41 UTC (rev 675)
@@ -12,6 +12,8 @@
   * Overhaul get-orig-source target. Fix file permissions while repacking.
   * Simplify lintian overrides.
   * 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)
 
  -- Andreas Beckmann <debian at abeckmann.de>  Thu, 04 Aug 2011 23:42:27 +0200
 

Modified: fglrx-driver/trunk/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.install.in	2011-08-06 20:21:30 UTC (rev 674)
+++ fglrx-driver/trunk/debian/fglrx-driver.install.in	2011-08-06 20:52:41 UTC (rev 675)
@@ -20,5 +20,7 @@
 arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.so.1.0 usr/lib
 arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.so.1.0 usr/lib
 arch/_ARCH_/usr/X11R6/_LIB_/modules/dri usr/lib
-_XPIC_/usr/X11R6/_LIB_/modules usr/lib/xorg
+_XPIC_/usr/X11R6/_LIB_/modules/*.so				usr/lib/xorg/modules/
 _XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx
+_XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so	usr/lib/fglrx/
+_XPIC_/usr/X11R6/_LIB_/modules/linux/*.so			usr/lib/xorg/modules/linux/

Modified: fglrx-driver/trunk/debian/fglrx-glx.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.install.in	2011-08-06 20:21:30 UTC (rev 674)
+++ fglrx-driver/trunk/debian/fglrx-glx.install.in	2011-08-06 20:52:41 UTC (rev 675)
@@ -1,2 +1 @@
 arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 usr/lib/fglrx
-_XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so usr/lib/fglrx

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-06 20:21:30 UTC (rev 674)
+++ fglrx-driver/trunk/debian/rules	2011-08-06 20:52:41 UTC (rev 675)
@@ -53,8 +53,8 @@
 	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-glx/usr/lib/fglrx/fglrx-libglx.so \
-	    debian/fglrx-glx/usr/lib/fglrx/libglx.so
+	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 \