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

[Patrick Matthäi]

Author: pmatthaei
Date: 2011-06-18 14:08:48 +0000 (Sat, 18 Jun 2011)
New Revision: 603

Modified:
   fglrx-driver/trunk/debian/fglrx-driver.postrm
   fglrx-driver/trunk/debian/fglrx-driver.preinst
   fglrx-driver/trunk/debian/rules
Log:
Some more work, but glx is still not found.


Modified: fglrx-driver/trunk/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.postrm	2011-06-18 12:33:49 UTC (rev 602)
+++ fglrx-driver/trunk/debian/fglrx-driver.postrm	2011-06-18 14:08:48 UTC (rev 603)
@@ -9,7 +9,8 @@
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi
-		dpkg-divert --package fglrx-driver --rename --remove /usr/lib/$DESTINATION/xorg/modules/extensions/libglx.so
+		dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libglx.so
+		rm -rf /usr/lib/fglrx/diversions-$DESTINATION
 	;;
 	purge)
 		if [ -f /etc/ati/amdpcsdb ]; then

Modified: fglrx-driver/trunk/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-06-18 12:33:49 UTC (rev 602)
+++ fglrx-driver/trunk/debian/fglrx-driver.preinst	2011-06-18 14:08:48 UTC (rev 603)
@@ -10,13 +10,10 @@
 		if [ -f /usr/lib/fglrx/diversions/libdri.so ] ; then
 			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libdri.so || true
 		fi
-		if dpkg --compare-versions "$2" lt "1:11-6"; then
-			dpkg-divert --package fglrx-driver --rename --remove /usr/lib/xorg/modules/extensions/libglx.so
-		fi
 		if [ -d /usr/lib/fglrx/diversions ]; then
 			rm -rf /usr/lib/fglrx/diversions
 		fi
-		dpkg-divert --package fglrx-driver --divert /usr/lib/fglrx/diversions-$DESTINATION/libglx.so --rename /usr/lib/$DESTINATION/xorg/modules/extensions/libglx.so
+		dpkg-divert --package fglrx-driver --divert /usr/lib/fglrx/diversions-$DESTINATION/libglx.so --rename /usr/lib/xorg/modules/extensions/libglx.so
     ;;
 esac
 

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-06-18 12:33:49 UTC (rev 602)
+++ fglrx-driver/trunk/debian/rules	2011-06-18 14:08:48 UTC (rev 603)
@@ -91,11 +91,11 @@
 	dh_install --ignore=debian/$(PKG_daemon).install  -p$(PKG_daemon)  "$(ARCH)/usr/sbin/ati*" "usr/sbin"
 	dh_install --ignore=debian/$(PKG_glx).install     -p$(PKG_glx)     "$(ARCH)/usr/X11R6/$(LIB)/fglrx/fglrx-libGL*" "$(DST)"
 	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/$(LIB)/*" "$(DST)"
-	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "$(DST)"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libfglrx*" "usr/lib"
 	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/libati*" "$(DST)"
-	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "$(DST)/dri"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/modules/dri/*" "usr/lib/dri"
 	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(ARCH)/usr/X11R6/$(LIB)/lib*XvB*" "$(DST)"
-	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "$(DST)/xorg/modules"
+	dh_install --ignore=debian/$(PKG_driver).install  -p$(PKG_driver)  "$(XDIR)/usr/X11R6/$(LIB)/modules/*" "usr/lib//xorg/modules"
 	dh_install --ignore=debian/$(PKG_dkms).install    -p$(PKG_dkms)	   "$(ARCH)/lib/modules/fglrx/build_mod/lib*" "$(DKMSBASE)"
 	dh_install --ignore=debian/$(PKG_control).install -p$(PKG_control) "$(ARCH)/usr/X11R6/bin/amdcccle" "usr/bin"
 	mv "debian/$(PKG_glx)/$(DST)/fglrx-libGL.so.1.2" "debian/$(PKG_glx)/$(DST)/libGL.so.1.2"