Summary
Description: The git repository for the ATI/AMD fglrx packaging scripts.
Last Change: Thu 2/4/10 2:40
Recent Commits
>
--git a/Debian/ChangeLog b/Debian/ChangeLog
index 5ee3220..f7246e4 100755
--- a/Debian/ChangeLog
+++ b/Debian/ChangeLog
@@ -1,3 +1,11 @@
+2008-09-17 Aric Cyr <Aric.Cyr@gmail.com>
+
+ * dists/*/fglrx-driver.{preinst,postrm}
+ - Added diversion of libdri.so required by latest driver
+
+ * dists/*/rules
+ - Added extensions directory to package
+
2008-02-08 Mario Limonciello <superm1@uubntu.com>
* dists/lenny/rules
diff --git a/Debian/dists/etch/control b/Debian/dists/etch/control
index b517206..49b131a 100755
--- a/Debian/dists/etch/control
+++ b/Debian/dists/etch/control
@@ -2,7 +2,7 @@ Source: fglrx-installer
Section: non-free/x11
Priority: extra
Maintainer: Aric Cyr <Aric.Cyr@gmail.com>
-Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64]
+Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64], libstdc++5
Standards-Version: 3.6.1
Package: fglrx-driver
diff --git a/Debian/dists/etch/fglrx-driver.postrm b/Debian/dists/etch/fglrx-driver.postrm
index 9a47320..746142a 100755
--- a/Debian/dists/etch/fglrx-driver.postrm
+++ b/Debian/dists/etch/fglrx-driver.postrm
@@ -25,6 +25,9 @@ undivert_libGL ()
dpkg-divert --remove --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1.2"
--rename "$1/libGL.so.1.2"
+ dpkg-divert --remove --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ -d "$1/fglrx/diversions" ]; then
rmdir "$1/fglrx/diversions" || true
diff --git a/Debian/dists/etch/fglrx-driver.preinst b/Debian/dists/etch/fglrx-driver.preinst
index 8f8897f..2bc0cfd 100755
--- a/Debian/dists/etch/fglrx-driver.preinst
+++ b/Debian/dists/etch/fglrx-driver.preinst
@@ -36,6 +36,9 @@ divert_libGL ()
dpkg-divert --add --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1"
--rename "$1/libGL.so.1"
+ dpkg-divert --add --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ "$2" ]; then
# move our libGL back in its place
diff --git a/Debian/dists/etch/rules b/Debian/dists/etch/rules
index 1cd1095..f546bd4 100755
--- a/Debian/dists/etch/rules
+++ b/Debian/dists/etch/rules
@@ -162,6 +162,7 @@ ifeq ($(DEB_BUILD_ARCH),amd64)
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.a" "usr/lib/xorg/modules"
@@ -172,6 +173,7 @@ else
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.a" "usr/lib/xorg/modules"
endif
diff --git a/Debian/dists/experimental/control b/Debian/dists/experimental/control
index b517206..49b131a 100755
--- a/Debian/dists/experimental/control
+++ b/Debian/dists/experimental/control
@@ -2,7 +2,7 @@ Source: fglrx-installer
Section: non-free/x11
Priority: extra
Maintainer: Aric Cyr <Aric.Cyr@gmail.com>
-Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64]
+Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64], libstdc++5
Standards-Version: 3.6.1
Package: fglrx-driver
diff --git a/Debian/dists/experimental/fglrx-driver.postrm b/Debian/dists/experimental/fglrx-driver.postrm
index 9a47320..746142a 100755
--- a/Debian/dists/experimental/fglrx-driver.postrm
+++ b/Debian/dists/experimental/fglrx-driver.postrm
@@ -25,6 +25,9 @@ undivert_libGL ()
dpkg-divert --remove --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1.2"
--rename "$1/libGL.so.1.2"
+ dpkg-divert --remove --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ -d "$1/fglrx/diversions" ]; then
rmdir "$1/fglrx/diversions" || true
diff --git a/Debian/dists/experimental/fglrx-driver.preinst b/Debian/dists/experimental/fglrx-driver.preinst
index 8f8897f..2bc0cfd 100755
--- a/Debian/dists/experimental/fglrx-driver.preinst
+++ b/Debian/dists/experimental/fglrx-driver.preinst
@@ -36,6 +36,9 @@ divert_libGL ()
dpkg-divert --add --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1"
--rename "$1/libGL.so.1"
+ dpkg-divert --add --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ "$2" ]; then
# move our libGL back in its place
diff --git a/Debian/dists/experimental/rules b/Debian/dists/experimental/rules
index b58af16..533e55e 100755
--- a/Debian/dists/experimental/rules
+++ b/Debian/dists/experimental/rules
@@ -162,6 +162,7 @@ ifeq ($(DEB_BUILD_ARCH),amd64)
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.a" "usr/lib/xorg/modules"
@@ -172,6 +173,7 @@ else
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.a" "usr/lib/xorg/modules"
endif
diff --git a/Debian/dists/lenny/control b/Debian/dists/lenny/control
index b517206..49b131a 100755
--- a/Debian/dists/lenny/control
+++ b/Debian/dists/lenny/control
@@ -2,7 +2,7 @@ Source: fglrx-installer
Section: non-free/x11
Priority: extra
Maintainer: Aric Cyr <Aric.Cyr@gmail.com>
-Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64]
+Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64], libstdc++5
Standards-Version: 3.6.1
Package: fglrx-driver
diff --git a/Debian/dists/lenny/fglrx-driver.postrm b/Debian/dists/lenny/fglrx-driver.postrm
index 9a47320..746142a 100755
--- a/Debian/dists/lenny/fglrx-driver.postrm
+++ b/Debian/dists/lenny/fglrx-driver.postrm
@@ -25,6 +25,9 @@ undivert_libGL ()
dpkg-divert --remove --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1.2"
--rename "$1/libGL.so.1.2"
+ dpkg-divert --remove --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ -d "$1/fglrx/diversions" ]; then
rmdir "$1/fglrx/diversions" || true
diff --git a/Debian/dists/lenny/fglrx-driver.preinst b/Debian/dists/lenny/fglrx-driver.preinst
index 8f8897f..2bc0cfd 100755
--- a/Debian/dists/lenny/fglrx-driver.preinst
+++ b/Debian/dists/lenny/fglrx-driver.preinst
@@ -36,6 +36,9 @@ divert_libGL ()
dpkg-divert --add --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1"
--rename "$1/libGL.so.1"
+ dpkg-divert --add --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ "$2" ]; then
# move our libGL back in its place
diff --git a/Debian/dists/lenny/rules b/Debian/dists/lenny/rules
index d1a20cb..b14b5d5 100755
--- a/Debian/dists/lenny/rules
+++ b/Debian/dists/lenny/rules
@@ -163,6 +163,7 @@ ifeq ($(DEB_BUILD_ARCH),amd64)
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.a" "usr/lib/xorg/modules"
@@ -173,6 +174,7 @@ else
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.a" "usr/lib/xorg/modules"
endif
diff --git a/Debian/dists/sarge/control b/Debian/dists/sarge/control
index 3a30fba..a92f581 100755
--- a/Debian/dists/sarge/control
+++ b/Debian/dists/sarge/control
@@ -2,7 +2,7 @@ Source: fglrx-installer
Section: non-free/x11
Priority: extra
Maintainer: Aric Cyr <Aric.Cyr@gmail.com>
-Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64]
+Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64], libstdc++5
Standards-Version: 3.6.1
Package: fglrx-driver
diff --git a/Debian/dists/sarge/fglrx-driver.postrm b/Debian/dists/sarge/fglrx-driver.postrm
index 8d2cc1a..87d5192 100755
--- a/Debian/dists/sarge/fglrx-driver.postrm
+++ b/Debian/dists/sarge/fglrx-driver.postrm
@@ -25,6 +25,9 @@ undivert_libGL ()
dpkg-divert --remove --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1.2"
--rename "$1/libGL.so.1.2"
+ dpkg-divert --remove --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ -d "$1/fglrx/diversions" ]; then
rmdir "$1/fglrx/diversions" || true
diff --git a/Debian/dists/sarge/fglrx-driver.preinst b/Debian/dists/sarge/fglrx-driver.preinst
index 990cfa9..3b3140b 100755
--- a/Debian/dists/sarge/fglrx-driver.preinst
+++ b/Debian/dists/sarge/fglrx-driver.preinst
@@ -36,6 +36,9 @@ divert_libGL ()
dpkg-divert --add --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1"
--rename "$1/libGL.so.1"
+ dpkg-divert --add --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ "$2" ]; then
# move our libGL back in its place
diff --git a/Debian/dists/sid/control b/Debian/dists/sid/control
index e2e601c..967ea98 100755
--- a/Debian/dists/sid/control
+++ b/Debian/dists/sid/control
@@ -2,7 +2,7 @@ Source: fglrx-installer
Section: non-free/x11
Priority: extra
Maintainer: Aric Cyr <Aric.Cyr@gmail.com>
-Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64]
+Build-Depends: debhelper (>= 4.2.11), wget, rpm, bzip2, xserver-xfree86 | xserver-xorg, x-dev, ia32-libs [amd64], libstdc++5
Standards-Version: 3.6.1
Package: fglrx-driver
diff --git a/Debian/dists/sid/fglrx-driver.postrm b/Debian/dists/sid/fglrx-driver.postrm
index 9a47320..746142a 100755
--- a/Debian/dists/sid/fglrx-driver.postrm
+++ b/Debian/dists/sid/fglrx-driver.postrm
@@ -25,6 +25,9 @@ undivert_libGL ()
dpkg-divert --remove --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1.2"
--rename "$1/libGL.so.1.2"
+ dpkg-divert --remove --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ -d "$1/fglrx/diversions" ]; then
rmdir "$1/fglrx/diversions" || true
diff --git a/Debian/dists/sid/fglrx-driver.preinst b/Debian/dists/sid/fglrx-driver.preinst
index 8f8897f..2bc0cfd 100755
--- a/Debian/dists/sid/fglrx-driver.preinst
+++ b/Debian/dists/sid/fglrx-driver.preinst
@@ -36,6 +36,9 @@ divert_libGL ()
dpkg-divert --add --package fglrx-driver
--divert "$1/fglrx/diversions/libGL.so.1"
--rename "$1/libGL.so.1"
+ dpkg-divert --add --package fglrx-driver
+ --divert "$1/fglrx/diversions/libdri.so"
+ --rename "$1/xorg/modules/extensions/libdri.so"
if [ "$2" ]; then
# move our libGL back in its place
diff --git a/Debian/dists/sid/rules b/Debian/dists/sid/rules
index 9c556a8..f906507 100755
--- a/Debian/dists/sid/rules
+++ b/Debian/dists/sid/rules
@@ -163,6 +163,7 @@ ifeq ($(DEB_BUILD_ARCH),amd64)
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*.a" "usr/lib/xorg/modules"
@@ -173,6 +174,7 @@ else
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/dri" "usr/lib"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/linux" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/drivers" "usr/lib/xorg/modules"
+ dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/extensions" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.so" "usr/lib/xorg/modules"
dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*.a" "usr/lib/xorg/modules"
endif
<
Copyright © 2010 by Phoronix Media