[Pkg-fglrx-devel] r744 - fglrx-driver/branches/multiarch/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Thu Aug 25 08:09:18 UTC 2011
Author: anbe-guest
Date: 2011-08-25 08:09:18 +0000 (Thu, 25 Aug 2011)
New Revision: 744
Added:
fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript
fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst.in
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm.in
Removed:
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm
Modified:
fglrx-driver/branches/multiarch/debian/changelog
fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst
fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm
fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm
fglrx-driver/branches/multiarch/debian/rules
Log:
merge changes from trunk up to r743
Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/changelog 2011-08-25 08:09:18 UTC (rev 744)
@@ -5,8 +5,6 @@
* Add patch 04-build-x86_64-on-x86.diff: add support for building the 64-bit
kernel module in 32-bit userspace, i.e. for linux-image-*-amd64 on i386.
(Closes: #636055)
- * Override the experimental lintian tag shlib-calls-exit.
- * Cleanup maintainer scripts.
* Enable multiarch build.
- Add and use _LIBDIR_ substitution variable.
- Add Pre-Depends: ${misc:Pre-Depends}.
@@ -25,9 +23,15 @@
their corresponding biarch packages (lib*-ia32:amd64).
* Ensure no mismatching versions of fglrx-driver and libgl1-fglrx-glx can be
installed.
- * Add instructions for squeeze-backports to README.source and a
- prepare-squeeze-backport target to debian/rules that performs the
- necessary changes.
+ * Override the experimental lintian tag shlib-calls-exit.
+ * Cleanup maintainer scripts.
+ * Prepare support for squeeze-backports:
+ - Add instructions for squeeze-backports to README.source and a
+ prepare-squeeze-backport target to debian/rules that performs the
+ necessary changes.
+ - Readd some maintainer script code to cleanup after the
+ /emul/ia32-linux/usr/lib => /usr/lib32 transition.
+ - Cleanup /etc/init.d/fglrx-driver.
-- Andreas Beckmann <debian at abeckmann.de> Thu, 18 Aug 2011 09:46:11 +0200
Copied: fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript (from rev 743, fglrx-driver/trunk/debian/fglrx-driver.maintscript)
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript (rev 0)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.maintscript 2011-08-25 08:09:18 UTC (rev 744)
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/fglrx-driver 1:11-8-2~
Modified: fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst 2011-08-25 08:09:18 UTC (rev 744)
@@ -3,21 +3,25 @@
if [ "$1" = "configure" ]; then
- 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
- rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
+ if dpkg --compare-versions "$2" lt-nl 1:11-8-2 ; then
+ update-rc.d -f fglrx-driver remove || true
+ fi
- if ! grep -q fglrx /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf 2>/dev/null; then
- echo "**********************************************"
- echo "NOTE: the fglrx driver is not yet configued."
- echo "Please consider /usr/bin/aticonfig to create a"
- echo "working xorg.conf configuration."
- echo "For example, 'sudo aticonfig --initial' should"
- echo "be sufficient for most use cases."
- echo "**********************************************"
- fi
+ 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
+ rmdir /usr/lib/fglrx/diversions 2>/dev/null || true
+ if ! grep -q fglrx /etc/X11/xorg.conf /etc/X11/xorg.conf.d/*.conf 2>/dev/null; then
+ echo "**********************************************"
+ echo "NOTE: the fglrx driver is not yet configued."
+ echo "Please consider /usr/bin/aticonfig to create a"
+ echo "working xorg.conf configuration."
+ echo "For example, 'sudo aticonfig --initial' should"
+ echo "be sufficient for most use cases."
+ echo "**********************************************"
+ fi
+
fi
#DEBHELPER#
Modified: fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm 2011-08-25 08:09:18 UTC (rev 744)
@@ -3,9 +3,9 @@
if [ "$1" = "purge" ]; then
- if [ -f /etc/ati/amdpcsdb ]; then
- rm /etc/ati/amdpcsdb
- fi
+ if [ -f /etc/ati/amdpcsdb ]; then
+ rm /etc/ati/amdpcsdb
+ fi
fi
Copied: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst (from rev 743, fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst)
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst (rev 0)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst 2011-08-25 08:09:18 UTC (rev 744)
@@ -0,0 +1,25 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+ # <target: squeeze-backports>
+ # remove diversion created before the
+ # /emul/ia32-linux/usr/lib => /usr/lib32 transition
+ dpkg-divert --remove --rename --package fglrx-glx-ia32 --divert \
+ /emul/ia32-linux/usr/lib/fglrx/diversions/libGL.so.1 \
+ /emul/ia32-linux/usr/lib/libGL.so.1 > /dev/null
+ dpkg-divert --remove --rename --package fglrx-glx-ia32 --divert \
+ /emul/ia32-linux/usr/lib/fglrx/diversions/libGL.so.1.2 \
+ /emul/ia32-linux/usr/lib/libGL.so.1.2 > /dev/null
+
+ if [ -d /emul/ia32-linux/usr/lib/fglrx ]
+ then
+ rmdir /emul/ia32-linux/usr/lib/fglrx/diversions /emul/ia32-linux/usr/lib/fglrx || true;
+ rmdir /emul/ia32-linux/usr/lib /emul/ia32-linux/usr /emul/ia32-linux /emul 2>/dev/null || true
+ fi
+ # </target: squeeze-backports>
+
+fi
+
+#DEBHELPER#
Modified: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm 2011-08-25 08:09:18 UTC (rev 744)
@@ -3,9 +3,9 @@
if [ "$1" = "remove" ]; then
- dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1.2
- dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1
- rmdir /usr/lib32/fglrx/diversions /usr/lib32/fglrx 2>/dev/null || true
+ dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1.2
+ dpkg-divert --package fglrx-glx-ia32 --rename --remove /usr/lib32/libGL.so.1
+ rmdir /usr/lib32/fglrx/diversions /usr/lib32/fglrx 2>/dev/null || true
fi
Deleted: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst 2011-08-25 08:09:18 UTC (rev 744)
@@ -1,25 +0,0 @@
-#!/bin/sh
-set -e
-
-package=fglrx-modules-dkms
-
-version=`dpkg-query -W -f='${Version}' $package \
- |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"`
-
-isadded=`dkms status -m fglrx -v $version`
-
-if [ "x${isadded}" = "x" ] ; then
- dkms add -m fglrx -v $version
-fi
-
-if [ "$1" = "configure" ] ; then
- cd /lib/modules
- ls | while read kversion ; do
- if [ -e $kversion/build/include/linux/version.h ] ; then
- dkms build -m fglrx -v $version -k $kversion || true
- dkms install -m fglrx -v $version -k $kversion --force || true
- fi
- done
-fi
-
-#DEBHELPER#
Copied: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst.in (from rev 743, fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst.in)
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst.in (rev 0)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst.in 2011-08-25 08:09:18 UTC (rev 744)
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+ if [ -z "$(dkms status -m fglrx -v _VERSION_)" ]; then
+ dkms add -m fglrx -v _VERSION_
+ fi
+
+ cd /lib/modules
+ ls | while read kversion ; do
+ if [ -e $kversion/build/include/linux/version.h ] ; then
+ dkms build -m fglrx -v _VERSION_ -k $kversion || true
+ dkms install -m fglrx -v _VERSION_ -k $kversion --force || true
+ fi
+ done
+
+fi
+
+#DEBHELPER#
Deleted: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm 2011-08-25 08:09:18 UTC (rev 744)
@@ -1,11 +0,0 @@
-#!/bin/sh
-set -e
-
-package=fglrx-modules-dkms
-
-version=`dpkg-query -W -f='${Version}' "$package" \
- |rev|cut -d- -f2-|rev|cut -d':' -f2|tr -d "\n"`
-
-dkms remove -m fglrx -v "$version" --all || true
-
-#DEBHELPER#
Copied: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm.in (from rev 743, fglrx-driver/trunk/debian/fglrx-modules-dkms.prerm.in)
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm.in (rev 0)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm.in 2011-08-25 08:09:18 UTC (rev 744)
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+dkms remove -m fglrx -v _VERSION_ --all || true
+
+#DEBHELPER#
Modified: fglrx-driver/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules 2011-08-25 07:45:27 UTC (rev 743)
+++ fglrx-driver/branches/multiarch/debian/rules 2011-08-25 08:09:18 UTC (rev 744)
@@ -84,7 +84,7 @@
prepare-squeeze-backport:
echo 8 > debian/compat
sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules
- sed -i -e 's/debhelper (>= .*)/debhelper (>= 8)/' \
+ sed -i -e 's/debhelper (>= .*)/debhelper (>= 8.1)/' \
-e '/^Multi-Arch:/ d' debian/control
debchange --bpo "Disable multiarch build."
debchange "Reduce Build-Depends: debhelper and compat level to 8."
More information about the Pkg-fglrx-devel
mailing list