[Pkg-fglrx-devel] r731 - fglrx-driver/branches/resurrect-fglrx-source/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Thu Aug 18 08:25:06 UTC 2011
Author: anbe-guest
Date: 2011-08-18 08:25:06 +0000 (Thu, 18 Aug 2011)
New Revision: 731
Removed:
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.preinst
Modified:
fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
fglrx-driver/branches/resurrect-fglrx-source/debian/control
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-control.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.preinst
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in
fglrx-driver/branches/resurrect-fglrx-source/debian/rules
Log:
merge changes from trunk up to r730
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/changelog 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/changelog 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,19 +1,36 @@
-fglrx-driver (1:11-7-5) UNRELEASED; urgency=low
+fglrx-driver (1:11-8-2) UNRELEASED; urgency=low
[ Andreas Beckmann ]
- * Add more copyright statements and licenses to debian/copyright.
- * Let dh_installmodules handle the modprobe blacklist config.
+ * Include libfglrx_ip.a for both architectures in the module source.
+ * 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.
* Resurrect the fglrx-source package.
* Add alternate recomends fglrx-kernel-${fglrx:version} to fglrx-driver,
this virtual package is provided by the dkms package and the module
packages built from fglrx-source.
- * Include libfglrx_ip.a for both architectures in the module source.
- * 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)
- -- Andreas Beckmann <debian at abeckmann.de> Mon, 08 Aug 2011 17:54:32 +0200
+ -- Andreas Beckmann <debian at abeckmann.de> Thu, 18 Aug 2011 09:46:11 +0200
+fglrx-driver (1:11-8-1) unstable; urgency=low
+
+ [ Michael Gilbert ]
+ * New upstream release:
+ - Adjust debian/rules for renamed upstream license file.
+ * Remove permission fixes from debian/rules.
+
+ [ Andreas Beckmann ]
+ * Add more copyright statements and licenses to debian/copyright.
+ * Let dh_installmodules handle the modprobe blacklist config.
+ * Move cleanup of old diversions from preinst to postinst.
+ * Setup ia32 diversions on upgrades, too.
+ * Do not remove the ia32 diversions on purge, again.
+ * fglrx-driver: Add Replaces: fglrx-glx (<< 1:11-7-4) for cleaner updates
+ from fglrx-glx versions that shipped libglx.so.
+
+ -- Michael Gilbert <michael.s.gilbert at gmail.com> Thu, 18 Aug 2011 00:09:15 -0400
+
fglrx-driver (1:11-7-4) unstable; urgency=low
[ Andreas Beckmann ]
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/control
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/control 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/control 2011-08-18 08:25:06 UTC (rev 731)
@@ -41,6 +41,8 @@
Provides: xorg-driver-video
Conflicts: ia32-fglrx-driver
Breaks: nvidia-glx (<< 275.09.07-3)
+Replaces:
+ fglrx-glx (<< 1:11-7-4),
Suggests:
fglrx-control,
xvba-va-driver
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.lintian-overrides 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.lintian-overrides 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,3 +1,4 @@
+no-upstream-changelog
spelling-error-in-binary usr/sbin/atieventsd fuctions functions
spelling-error-in-binary usr/sbin/atieventsd Sucessfully Successfully
spelling-error-in-binary usr/sbin/atieventsd Sucessfully Successfully
@@ -2,2 +3 @@
spelling-error-in-binary usr/sbin/atieventsd Sucessfully Successfully
-no-upstream-changelog
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-control.lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-control.lintian-overrides 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-control.lintian-overrides 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,3 +1,4 @@
+no-upstream-changelog
spelling-error-in-binary usr/bin/amdcccle commited committed
spelling-error-in-binary usr/bin/amdcccle curently currently
spelling-error-in-binary usr/bin/amdcccle fuctions functions
@@ -4,4 +5,3 @@
spelling-error-in-binary usr/bin/amdcccle Sucessfully Successfully
spelling-error-in-binary usr/bin/amdcccle Sucessfully Successfully
spelling-error-in-binary usr/bin/amdcccle Sucessfully Successfully
-no-upstream-changelog
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.lintian-overrides 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.lintian-overrides 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,3 +1,4 @@
+no-upstream-changelog
non-dev-pkg-with-shlib-symlink usr/lib/libXvBAW.so.1.0 usr/lib/libXvBAW.so
package-name-doesnt-match-sonames libAMDXvBA1 libXvBAW1 libatiuki1 libfglrx-dm1.0
spelling-error-in-binary usr/bin/aticonfig dependant dependent
@@ -22,7 +23,6 @@
[i386]: spelling-error-in-binary usr/lib/dri/fglrx_dri.so nam name
[i386]: spelling-error-in-binary usr/lib/libaticalcl.so nam name
[i386]: spelling-error-in-binary usr/lib/libaticalrt.so nam name
-no-upstream-changelog
sharedobject-in-library-directory-missing-soname usr/lib/libatiadlxx.so
sharedobject-in-library-directory-missing-soname usr/lib/libaticalcl.so
sharedobject-in-library-directory-missing-soname usr/lib/libaticaldd.so
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst 2011-08-18 08:25:06 UTC (rev 731)
@@ -4,6 +4,11 @@
case "$1" in
configure)
+ 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."
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.preinst 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.preinst 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- install|upgrade)
- 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
- ;;
-esac
-
-#DEBHELPER#
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.lintian-overrides 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.lintian-overrides 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,8 +1,9 @@
+no-upstream-changelog
spelling-error-in-binary usr/lib32/dri/fglrx_dri.so nam name
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
diversion-for-unknown-file usr/lib32/libGL.so.1.2 preinst:.*
+shlib-calls-exit usr/lib32/fglrx-libGL.so.1.2
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/fglrx-libGL.so.1.2
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm 2011-08-18 08:25:06 UTC (rev 731)
@@ -2,16 +2,12 @@
set -e
-case "$1" in
- remove|purge|disappear)
+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
- ldconfig
rmdir /usr/lib32/fglrx/diversions /usr/lib32/fglrx 2>/dev/null || true
- ;;
- *)
- exit 0
- ;;
-esac
+fi
#DEBHELPER#
+
+exit 0
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.preinst
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.preinst 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.preinst 2011-08-18 08:25:06 UTC (rev 731)
@@ -3,7 +3,7 @@
set -e
case "$1" in
- install)
+ install|upgrade)
mkdir -p /usr/lib32/fglrx/diversions
dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1.2 --rename /usr/lib32/libGL.so.1.2
dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1 --rename /usr/lib32/libGL.so.1
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,3 +1,4 @@
no-upstream-changelog
+shlib-calls-exit usr/lib/fglrx/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/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in 2011-08-18 08:25:06 UTC (rev 731)
@@ -1,3 +1,4 @@
+no-upstream-changelog
[i386]: binary-from-other-architecture usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a
spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a aquired acquired
spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a neccessary necessary
@@ -7,4 +8,3 @@
spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a neccessary necessary
unstripped-binary-or-object usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a
unstripped-binary-or-object usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a
-no-upstream-changelog
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/rules 2011-08-18 08:18:02 UTC (rev 730)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/rules 2011-08-18 08:25:06 UTC (rev 731)
@@ -31,7 +31,7 @@
rm -f $(generated)
# Reformat the LICENSE to the format needed for debian/copyright.
-LICENSE.txt: ATI_LICENSE.TXT
+LICENSE.txt: LICENSE.TXT
sed -e 's/ *$$//; s/^$$/./; s/^/ /;' $< > $@
# Compare the license in debian/copyright with the LICENSE shipped in the archive.
@@ -53,10 +53,6 @@
override_dh_install:
dh_install
chrpath -d -k debian/fglrx-control/usr/bin/amdcccle
- chmod -x debian/fglrx-control/usr/share/icons/*
- chmod -x debian/fglrx-driver/etc/ati/atiogl.xml
- chmod -R a-sx,u=rwX,go=rX debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)
- chmod -R a-sx,u=rwX,go=rX debian/fglrx-source/usr/src/modules/fglrx
chmod a+x debian/fglrx-source/usr/src/modules/fglrx/debian/rules
tar cfj debian/fglrx-source/usr/src/fglrx.tar.bz2 \
--owner=root --group=src --remove-files \
More information about the Pkg-fglrx-devel
mailing list