[Pkg-fglrx-devel] r734 - in fglrx-driver/branches/multiarch/debian: . patches
Andreas Beckmann
anbe-guest at alioth.debian.org
Thu Aug 18 09:00:54 UTC 2011
Author: anbe-guest
Date: 2011-08-18 09:00:54 +0000 (Thu, 18 Aug 2011)
New Revision: 734
Added:
fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff
Removed:
fglrx-driver/branches/multiarch/debian/fglrx-driver.preinst
fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst
Modified:
fglrx-driver/branches/multiarch/debian/changelog
fglrx-driver/branches/multiarch/debian/control
fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.lintian-overrides
fglrx-driver/branches/multiarch/debian/fglrx-control.lintian-overrides
fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst
fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm
fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides
fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm
fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.preinst
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst
fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm
fglrx-driver/branches/multiarch/debian/patches/series
fglrx-driver/branches/multiarch/debian/rules
Log:
merge changes from trunk up to r732
Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/changelog 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,8 +1,12 @@
-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.
+ * Cleanup maintainer scripts.
* Enable multiarch build.
- Add and use _LIBDIR_ substitution variable.
- Add Pre-Depends: ${misc:Pre-Depends}.
@@ -25,8 +29,26 @@
prepare-squeeze-backport target to debian/rules that performs the
necessary changes.
- -- 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/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/control 2011-08-18 09:00:54 UTC (rev 734)
@@ -45,6 +45,8 @@
libgl1-fglrx-glx (<< ${binary:Version}),
libgl1-fglrx-glx (>> ${binary:Version}),
nvidia-glx (<< 275.09.07-3),
+Replaces:
+ fglrx-glx (<< 1:11-7-4),
Suggests:
fglrx-control,
xvba-va-driver
Modified: fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.lintian-overrides
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.lintian-overrides 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-atieventsd.lintian-overrides 2011-08-18 09:00:54 UTC (rev 734)
@@ -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/multiarch/debian/fglrx-control.lintian-overrides
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-control.lintian-overrides 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-control.lintian-overrides 2011-08-18 09:00:54 UTC (rev 734)
@@ -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/multiarch/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.postinst 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,9 +1,13 @@
#!/bin/sh
-
set -e
-case "$1" in
- configure)
+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 ! 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."
@@ -13,9 +17,7 @@
echo "be sufficient for most use cases."
echo "**********************************************"
fi
- ;;
-esac
+fi
+
#DEBHELPER#
-
-exit 0
Modified: fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.postrm 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,16 +1,12 @@
#!/bin/sh
-
set -e
-case "$1" in
- purge)
+if [ "$1" = "purge" ]; then
+
if [ -f /etc/ati/amdpcsdb ]; then
rm /etc/ati/amdpcsdb
fi
- ;;
- *)
- exit 0
- ;;
-esac
+fi
+
#DEBHELPER#
Deleted: fglrx-driver/branches/multiarch/debian/fglrx-driver.preinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-driver.preinst 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-driver.preinst 2011-08-18 09:00:54 UTC (rev 734)
@@ -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/multiarch/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.lintian-overrides 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,5 +1,6 @@
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/fglrx-libGL.so.1.2
shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
Deleted: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postinst 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "$1" in
- configure)
- ldconfig
- ;;
-esac
-
-#DEBHELPER#
Modified: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.postrm 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,17 +1,12 @@
#!/bin/sh
-
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#
Modified: fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.preinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.preinst 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx-ia32.preinst 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,13 +1,12 @@
#!/bin/sh
-
set -e
-case "$1" in
- install)
+if [ "$1" = "install" ] || [ "$1" = "upgrade" ]; then
+
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
- ;;
-esac
+fi
+
#DEBHELPER#
Modified: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.install.in 2011-08-18 09:00:54 UTC (rev 734)
@@ -2,4 +2,5 @@
common/lib/modules/fglrx/build_mod/*.h usr/src/fglrx-_VERSION_/
common/lib/modules/fglrx/build_mod/2.6.x/Makefile usr/src/fglrx-_VERSION_/
debian/dkms.conf usr/src/fglrx-_VERSION_/
-arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/
+arch/x86/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/x86/
+arch/x86_64/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/x86_64/
Modified: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.lintian-overrides.in 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,5 +1,10 @@
-spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a aquired acquired
-spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
-spelling-error-in-binary usr/src/fglrx-_VERSION_/libfglrx_ip.a neccessary necessary
-unstripped-binary-or-object usr/src/fglrx-_VERSION_/libfglrx_ip.a
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
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86/libfglrx_ip.a neccessary necessary
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a aquired acquired
+spelling-error-in-binary usr/src/fglrx-_VERSION_/x86_64/libfglrx_ip.a neccessary necessary
+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
Modified: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.postinst 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,5 +1,4 @@
#!/bin/sh
-
set -e
package=fglrx-modules-dkms
@@ -24,5 +23,3 @@
fi
#DEBHELPER#
-
-exit 0
Modified: fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/fglrx-modules-dkms.prerm 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,5 +1,4 @@
#!/bin/sh
-
set -e
package=fglrx-modules-dkms
@@ -10,5 +9,3 @@
dkms remove -m fglrx -v "$version" --all || true
#DEBHELPER#
-
-exit 0
Copied: fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff (from rev 732, fglrx-driver/trunk/debian/patches/04-build-x86_64-on-x86.diff)
===================================================================
--- fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff (rev 0)
+++ fglrx-driver/branches/multiarch/debian/patches/04-build-x86_64-on-x86.diff 2011-08-18 09:00:54 UTC (rev 734)
@@ -0,0 +1,19 @@
+Author: Andreas Beckmann <debian at abeckmann.de>
+Description: select the libfglrx_ip.a based on the target kernel architecture
+ Together with shipping libfglrx_ip.a for both architectures, this allows to
+ build the kernel module for linux-image-*-amd64 on i386.
+ No guarantees that the 32-bit userspace driver works on a 64-bit kernel.
+
+Index: b/common/lib/modules/fglrx/build_mod/2.6.x/Makefile
+===================================================================
+--- a/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2011-08-10 02:24:53.439417802 +0200
++++ b/common/lib/modules/fglrx/build_mod/2.6.x/Makefile 2011-08-10 02:28:11.395916634 +0200
+@@ -27,7 +27,7 @@
+ LIBIP_PREFIX ?= ..
+
+ obj-m += fglrx.o
+-fglrx-libs += libfglrx_ip.a
++fglrx-libs += $(if $(filter y,$(CONFIG_X86_64)),x86_64/,x86/)libfglrx_ip.a
+
+ fglrx-c-objs += firegl_public.o \
+ kcl_acpi.o \
Modified: fglrx-driver/branches/multiarch/debian/patches/series
===================================================================
--- fglrx-driver/branches/multiarch/debian/patches/series 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/patches/series 2011-08-18 09:00:54 UTC (rev 734)
@@ -1,3 +1,4 @@
01-CONFIG_X86_XEN.diff
02-dkms-arch_compat.diff
03-authatieventsd.sh.diff
+04-build-x86_64-on-x86.diff
Modified: fglrx-driver/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules 2011-08-18 08:49:07 UTC (rev 733)
+++ fglrx-driver/branches/multiarch/debian/rules 2011-08-18 09:00:54 UTC (rev 734)
@@ -38,7 +38,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.
@@ -60,9 +60,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 -x debian/fglrx-modules-dkms/usr/src/fglrx-$(upstream_version)/*
# Install reportbug files in all binary packages
override_dh_bugfiles:
@@ -80,7 +77,7 @@
# temporary, hardcode the version in debian/control once this branch gets merged into trunk
override_dh_gencontrol:
- dh_gencontrol -- -V'fglrx:multiarch=1:11-7-5'
+ dh_gencontrol -- -V'fglrx:multiarch=1:11-8-2'
############################################################################
More information about the Pkg-fglrx-devel
mailing list