[Pkg-fglrx-devel] r766 - in fglrx-driver/branches/resurrect-fglrx-source/debian: . patches
Andreas Beckmann
anbe-guest at alioth.debian.org
Wed Aug 31 23:37:38 UTC 2011
Author: anbe-guest
Date: 2011-08-31 23:37:38 +0000 (Wed, 31 Aug 2011)
New Revision: 766
Added:
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.maintscript
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.postinst
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postinst
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst.in
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.install
fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.links
fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.install.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.links.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.lintian-overrides.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.install.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.links.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.lintian-overrides.in
fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.install
fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.links.in
Removed:
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.links
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.install.in
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.links
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm
fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff
Modified:
fglrx-driver/branches/resurrect-fglrx-source/debian/README.source
fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
fglrx-driver/branches/resurrect-fglrx-source/debian/compat
fglrx-driver/branches/resurrect-fglrx-source/debian/control
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.install.in
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-driver.postrm
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.install
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.links
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-modules-dkms.install.in
fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in
fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series
fglrx-driver/branches/resurrect-fglrx-source/debian/rules
Log:
merge changes from trunk up to r765
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/README.source
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/README.source 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/README.source 2011-08-31 23:37:38 UTC (rev 766)
@@ -9,6 +9,20 @@
ressource, and repackage it under "../".
+Backporting to squeeze
+======================
+
+For squeeze backports the following changes have to be made:
+ - reduce Build-Depends: debhelper and compat level to 8
+ - disable MULTIARCH variable in debian/rules
+ - remove Multi-Arch: lines from debian/control
+These steps and the creation of an initial bpo-changelog entry have been
+automated via
+ debian/rules prepare-squeeze-backport
+
+ -- Andreas Beckmann <debian at abeckmann.de> Tue, 09 Aug 2011 00:06:35 +0200
+
+
Backporting to lenny - xserver < 1.5:
=====================================
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/changelog
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/changelog 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/changelog 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,19 +1,48 @@
fglrx-driver (1:11-8-2) UNRELEASED; urgency=low
[ Andreas Beckmann ]
- * 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)
+ * Bump glx-alternative-fglrx dependency to >= 0.1.92 and drop the libglx.so
+ compatibility symlink.
+ * Install a list of supported PCI IDs as /usr/share/fglrx/fglrx.ids.
+ * Cleanup maintainer scripts.
+ * Enable multiarch build.
+ - Add and use _LIBDIR_ substitution variable.
+ - Add Pre-Depends: ${misc:Pre-Depends}.
+ - Add Multi-Arch: same.
+ - Bump debhelper dependency to 8.1.3 and compat level to 9.
+ * Move shared libraries from fglrx-driver package to new package libfglrx.
+ * Move shared libraries (except for libGL.so.1) from fglrx-glx-ia32 package
+ to new package libfglrx-ia32.
+ * Install the same libraries in libfglrx-ia32 as in libfglrx. E.g. 32-bit
+ OpenCL applications need libatical*.so.
+ * Move AMD XvBA development files from fglrx-driver package to new package
+ libxvbaw-dev.
+ * Rename package fglrx-glx to libgl1-fglrx-glx. Keep old name as
+ transitional package.
+ * Prevent concurrent installation of multiarch packages (lib*:i386) and
+ their corresponding biarch packages (lib*-ia32:amd64).
+ * Ensure no mismatching versions of fglrx-driver and libgl1-fglrx-glx can be
+ installed.
* 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.
* 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.
- -- Andreas Beckmann <debian at abeckmann.de> Thu, 18 Aug 2011 09:46:11 +0200
+ [ Patrick Matthäi ]
+ * Install again the missing libAMDXvBA.cap file. Without it, XvBA will not
+ work.
+ Closes: #639402
+ -- Patrick Matthäi <pmatthaei at debian.org> Sat, 27 Aug 2011 23:41:50 +0200
+
fglrx-driver (1:11-8-1) unstable; urgency=low
[ Michael Gilbert ]
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/compat
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/compat 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/compat 2011-08-31 23:37:38 UTC (rev 766)
@@ -1 +1 @@
-8
+9
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/control
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/control 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/control 2011-08-31 23:37:38 UTC (rev 766)
@@ -2,10 +2,12 @@
Section: non-free/x11
Priority: extra
Maintainer: Fglrx packaging team <pkg-fglrx-devel at lists.alioth.debian.org>
-Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
- Michael Gilbert <michael.s.gilbert at gmail.com>
+Uploaders:
+ Patrick Matthäi <pmatthaei at debian.org>,
+ Michael Gilbert <michael.s.gilbert at gmail.com>,
+DM-Upload-Allowed: yes
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 8.1.3),
bzip2,
ia32-libs [amd64],
libxrandr2,
@@ -18,9 +20,8 @@
docbook-xml,
docbook-xsl,
chrpath,
- automake
+ automake,
Standards-Version: 3.9.2
-DM-Upload-Allowed: yes
Vcs-Svn: svn://svn.debian.org/svn/pkg-fglrx/fglrx-driver/trunk
Vcs-Browser: http://svn.debian.org/wsvn/pkg-fglrx/fglrx-driver/trunk/
XS-Autobuild: yes
@@ -31,21 +32,28 @@
Depends:
${misc:Depends},
${shlibs:Depends},
+ libfglrx (= ${binary:Version}),
xorg-video-abi-10 | xorg-video-abi-8 | xorg-video-abi-6.0,
- glx-alternative-fglrx (>= 0.1.2)
+ glx-alternative-fglrx (>= 0.1.92),
Recommends:
fglrx-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:version},
- fglrx-glx,
+ libgl1-fglrx-glx (= ${binary:Version}),
fglrx-glx-ia32 [amd64],
- fglrx-atieventsd
-Provides: xorg-driver-video
-Conflicts: ia32-fglrx-driver
-Breaks: nvidia-glx (<< 275.09.07-3)
+ fglrx-atieventsd,
+Suggests:
+ fglrx-control,
+ xvba-va-driver,
+Provides:
+ xorg-driver-video,
+ xserver-xorg-video-fglrx,
+Conflicts:
+ ia32-fglrx-driver,
+Breaks:
+ 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
Description: non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -56,22 +64,72 @@
acceleration will be disabled.
.
The driver can work with plain mesa libGL, but some applications may require
- the proprietary libGL. This library is shipped in the fglrx-glx package.
+ the proprietary libGL. This library is shipped in the libgl1-fglrx-glx package.
.
This driver is not free. As an alternative, you may try the newest free
driver xserver-xorg-video-radeon.
.
This driver will replace parts of your X11 and Mesa system.
-Package: fglrx-glx
+Package: libfglrx
+Section: non-free/libs
Architecture: i386 amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
+ ${shlibs:Depends},
${misc:Depends},
+Conflicts:
+ libfglrx-ia32 [i386],
+Breaks:
+ fglrx-driver (<< 1:11-8-2),
+Replaces:
+ fglrx-driver (<< 1:11-8-2),
+Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)
+ Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
+ .
+ This package contains the runtime libraries.
+ .
+ This driver is not free. As an alternative, you may try the newest free
+ driver xserver-xorg-video-radeon.
+
+Package: libxvbaw-dev
+Section: non-free/libdevel
+Architecture: i386 amd64
+Depends:
+ libfglrx (= ${binary:Version}),
+ ${misc:Depends},
+Breaks:
+ fglrx-driver (<< 1:11-8-2),
+Replaces:
+ fglrx-driver (<< 1:11-8-2),
+Description: AMD XvBA (X-Video Bitstream Acceleration) development files
+ X-Video Bitstream Acceleration (XvBA) is an arbitrary extension of the
+ X video extension (Xv) for the X Window System on Linux
+ operating-systems. XvBA API allows video programs to offload portions of the
+ video decoding process to the GPU video-hardware.
+ .
+ This package contains the development files.
+
+Package: libgl1-fglrx-glx
+Section: non-free/libs
+Architecture: i386 amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
+Depends:
+ ${misc:Depends},
${shlibs:Depends},
- glx-alternative-fglrx (>= 0.1.2)
+ glx-alternative-fglrx (>= 0.1.92),
+Conflicts:
+ fglrx-glx-ia32 [i386],
Breaks:
+ fglrx-glx (<< 1:11-8-2),
nvidia-glx (<< 275.09.07-3),
libgl1-nvidia-glx (<< 275.09.07-3)
+Replaces:
+ fglrx-glx (<< 1:11-8-2),
Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -80,16 +138,28 @@
This driver is not free. As an alternative, you may try the newest free
driver xserver-xorg-video-radeon.
+Package: fglrx-glx
+Section: non-free/oldlibs
+Architecture: i386 amd64
+Depends:
+ libgl1-fglrx-glx,
+ ${misc:Depends},
+Description: transitional package, use libgl1-fglrx-glx
+ This is a transitional package to aid migration to libgl1-fglrx-glx.
+ It can be safely removed from the system once nothing depends on it.
+
Package: fglrx-glx-ia32
Architecture: amd64
+Pre-Depends:
+ libc6-i386 (>= 2.9-18),
Depends:
${misc:Depends},
${shlibs:Depends},
- fglrx-driver (= ${binary:Version})
-Pre-Depends: libc6-i386 (>= 2.9-18)
+ libfglrx-ia32 (= ${binary:Version}),
+ fglrx-driver (= ${binary:Version}),
Conflicts:
nvidia-glx-ia32,
- ia32-fglrx-glx
+ ia32-fglrx-glx,
Description: proprietary libGL for the non-free ATI/AMD display driver (ia32 libs)
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -99,25 +169,34 @@
This driver is not free. As an alternative, you may try the newest free
driver xserver-xorg-video-radeon.
-Package: fglrx-source
-Section: non-free/kernel
-Architecture: i386 amd64
-Depends: ${misc:Depends}, debhelper (>= 8), make, bzip2
-Recommends: module-assistant | kernel-package
-Suggests: fglrx-driver
-Conflicts: fglrx-kernel-src
-Description: kernel module source for the non-free ATI/AMD RadeonHD display driver
- This package provides the kernel build environment and the fglrx modules,
- which are necessary to have accelerated 3D support within the ATI/AMD
- proprietary display driver.
+Package: libfglrx-ia32
+Section: non-free/libs
+Architecture: amd64
+Pre-Depends:
+ libc6-i386 (>= 2.9-18),
+Depends:
+ ${shlibs:Depends},
+ ${misc:Depends},
+Breaks:
+ fglrx-glx-ia32 (<< 1:11-8-2),
+Replaces:
+ fglrx-glx-ia32 (<< 1:11-8-2),
+Description: non-free ATI/AMD RadeonHD display driver (32-bit runtime libraries)
+ Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
+ .
+ This package contains the 32-bit runtime libraries.
+ .
+ This driver is not free. As an alternative, you may try the newest free
+ driver xserver-xorg-video-radeon.
Package: fglrx-modules-dkms
Section: non-free/kernel
Architecture: i386 amd64
Depends:
${misc:Depends},
- dkms
-Suggests: fglrx-driver
+ dkms,
+Suggests:
+ fglrx-driver,
Provides: fglrx-kernel-${fglrx:version}
Description: dkms module source for the non-free ATI/AMD RadeonHD display driver
This package provides the kernel build environment and the fglrx modules,
@@ -127,19 +206,32 @@
This package contains the source for the fglrx kernel module, packaged with
appropriate configuration for DKMS to build new modules dynamically.
+Package: fglrx-source
+Section: non-free/kernel
+Architecture: i386 amd64
+Depends: ${misc:Depends}, debhelper (>= 8), make, bzip2
+Recommends: module-assistant | kernel-package
+Suggests: fglrx-driver
+Conflicts: fglrx-kernel-src
+Description: kernel module source for the non-free ATI/AMD RadeonHD display driver
+ This package provides the kernel build environment and the fglrx modules,
+ which are necessary to have accelerated 3D support within the ATI/AMD
+ proprietary display driver.
+
Package: fglrx-control
Architecture: i386 amd64
Depends:
${misc:Depends},
${shlibs:Depends},
- fglrx-driver
-Provides: fglrx-control-qt3
+ fglrx-driver,
+Provides:
+ fglrx-control-qt3,
Replaces:
fglrx-control-qt3,
- fglrx-amdcccle
+ fglrx-amdcccle,
Conflicts:
fglrx-control-qt3,
- fglrx-control-qt2
+ fglrx-control-qt2,
Description: control panel for the non-free ATI/AMD RadeonHD display driver
Control panel for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -149,15 +241,19 @@
Package: fglrx-atieventsd
Architecture: i386 amd64
+Pre-Depends:
+ dpkg (>= 1.15.7.2),
Depends:
${misc:Depends},
${shlibs:Depends},
- lsb-base
+ lsb-base,
Recommends:
fglrx-driver (= ${binary:Version}),
- acpid
-Replaces: fglrx-driver (<< 1:8-4-2)
-Breaks: fglrx-driver (<< 1:8-4-2)
+ acpid,
+Breaks:
+ fglrx-driver (<< 1:8-4-2),
+Replaces:
+ fglrx-driver (<< 1:8-4-2),
Description: external events daemon for the non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
.
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.maintscript (from rev 765, fglrx-driver/trunk/debian/fglrx-atieventsd.maintscript)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.maintscript (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.maintscript 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1 @@
+rm_conffile /etc/init.d/fglrx-driver 1:11-8-2~
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.postinst (from rev 765, fglrx-driver/trunk/debian/fglrx-atieventsd.postinst)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.postinst (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-atieventsd.postinst 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,12 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = "configure" ]; then
+
+ if dpkg --compare-versions "$2" lt-nl 1:11-8-2 ; then
+ update-rc.d fglrx-driver remove || true
+ fi
+
+fi
+
+#DEBHELPER#
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.install.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.install.in 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.install.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,25 +1,17 @@
-common/etc/ati/signature etc/ati/
-common/etc/ati/control etc/ati/
-common/etc/ati/atiogl.xml etc/ati/
-common/etc/ati/amdpcsdb.default etc/ati/
-debian/acpi/*.sh etc/acpi/
-debian/acpi/events/fglrx-* etc/acpi/events/
-debian/import/amdxvba.h usr/include/
-arch/_ARCH_/usr/X11R6/bin/aticonfig usr/bin
-arch/_ARCH_/usr/X11R6/bin/atiodcli usr/bin
-arch/_ARCH_/usr/X11R6/bin/atiode usr/bin
-arch/_ARCH_/usr/X11R6/bin/fgl_glxgears usr/bin
-arch/_ARCH_/usr/X11R6/bin/fglrxinfo usr/bin
-arch/_ARCH_/usr/_LIB_/libatiuki.so.1.0 usr/lib
-arch/_ARCH_/usr/_LIB_/libaticaldd.so usr/lib
-arch/_ARCH_/usr/_LIB_/libaticalcl.so usr/lib
-arch/_ARCH_/usr/_LIB_/libaticalrt.so usr/lib
-arch/_ARCH_/usr/X11R6/_LIB_/libatiadlxx.so usr/lib
-arch/_ARCH_/usr/X11R6/_LIB_/libXvBAW.so.1.0 usr/lib
-arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.so.1.0 usr/lib
-arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.so.1.0 usr/lib
-arch/_ARCH_/usr/X11R6/_LIB_/modules/dri usr/lib
+common/etc/ati/signature etc/ati/
+common/etc/ati/control etc/ati/
+common/etc/ati/atiogl.xml etc/ati/
+common/etc/ati/amdpcsdb.default etc/ati/
+debian/acpi/*.sh etc/acpi/
+debian/acpi/events/fglrx-* etc/acpi/events/
+arch/_ARCH_/usr/X11R6/bin/aticonfig usr/bin/
+arch/_ARCH_/usr/X11R6/bin/atiodcli usr/bin/
+arch/_ARCH_/usr/X11R6/bin/atiode usr/bin/
+arch/_ARCH_/usr/X11R6/bin/fgl_glxgears usr/bin/
+arch/_ARCH_/usr/X11R6/bin/fglrxinfo usr/bin/
+arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.cap usr/lib/
_XPIC_/usr/X11R6/_LIB_/modules/*.so usr/lib/xorg/modules/
-_XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx
+_XPIC_/usr/X11R6/_LIB_/modules/drivers/fglrx_drv.so usr/lib/fglrx/
_XPIC_/usr/X11R6/_LIB_/modules/extensions/fglrx/fglrx-libglx.so usr/lib/fglrx/
_XPIC_/usr/X11R6/_LIB_/modules/linux/*.so usr/lib/xorg/modules/linux/
+fglrx.ids usr/share/fglrx/
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.links
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.links 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.links 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,5 +0,0 @@
-/usr/lib/libAMDXvBA.so.1.0 /usr/lib/libAMDXvBA.so.1
-/usr/lib/libXvBAW.so.1.0 /usr/lib/libXvBAW.so.1
-/usr/lib/libXvBAW.so.1 /usr/lib/libXvBAW.so
-/usr/lib/libatiuki.so.1.0 /usr/lib/libatiuki.so.1
-/usr/lib/fglrx/fglrx-libglx.so /usr/lib/fglrx/libglx.so
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-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.lintian-overrides 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,6 +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
spelling-error-in-binary usr/bin/aticonfig informations information
spelling-error-in-binary usr/bin/aticonfig commited committed
@@ -9,8 +7,6 @@
spelling-error-in-binary usr/bin/aticonfig Sucessfully Successfully
spelling-error-in-binary usr/bin/aticonfig Sucessfully Successfully
spelling-error-in-binary usr/bin/aticonfig Sucessfully Successfully
-spelling-error-in-binary usr/lib/dri/fglrx_dri.so ouput output
-spelling-error-in-binary usr/lib/dri/fglrx_dri.so UNKOWN UNKNOWN
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so avaiable available
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so paramter parameter
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so childs children
@@ -20,14 +16,3 @@
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so recieved received
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so Recieved Received
spelling-error-in-binary usr/lib/fglrx/fglrx_drv.so seperate separate
-[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
-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
-sharedobject-in-library-directory-missing-soname usr/lib/libaticalrt.so
-no-symbols-control-file usr/lib/libXvBAW.so.1.0
-no-symbols-control-file usr/lib/libatiuki.so.1.0
-no-symbols-control-file usr/lib/libAMDXvBA.so.1.0
-no-symbols-control-file usr/lib/libfglrx_dm.so.1.0
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postinst 2011-08-31 23:37:38 UTC (rev 766)
@@ -3,20 +3,20 @@
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 [ -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
+ 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
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postrm
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postrm 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-driver.postrm 2011-08-31 23:37:38 UTC (rev 766)
@@ -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
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.install 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.install 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,4 +1 @@
-arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri
-arch/x86/usr/lib/libatiuki* usr/lib32
-arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 usr/lib32
-arch/x86/usr/X11R6/lib/libatiadlxx.so* usr/lib32
+arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 usr/lib32
Modified: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.links
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.links 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.links 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,2 +1 @@
-/usr/lib32/libatiuki.so.1.0 /usr/lib32/libatiuki.so.1
-/usr/lib32/fglrx-libGL.so.1.2 /usr/lib32/libGL.so.1
+usr/lib32/fglrx-libGL.so.1.2 usr/lib32/libGL.so.1
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-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.lintian-overrides 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,11 +1,6 @@
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
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
shlibs-declares-dependency-on-other-package ia32-libs (>= 20090804)
-sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postinst (from rev 765, fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postinst (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postinst 2011-08-31 23:37:38 UTC (rev 766)
@@ -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/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx-ia32.postrm 2011-08-31 23:37:38 UTC (rev 766)
@@ -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/resurrect-fglrx-source/debian/fglrx-glx.install.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.install.in 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.install.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -1 +0,0 @@
-arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 usr/lib/fglrx
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.links
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.links 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.links 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,2 +0,0 @@
-/usr/lib/fglrx/fglrx-libGL.so.1.2 /usr/lib/fglrx/libGL.so.1.2
-/usr/lib/fglrx/libGL.so.1.2 /usr/lib/fglrx/libGL.so.1
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-glx.lintian-overrides 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,4 +0,0 @@
-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.install.in
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.install.in 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.install.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -2,5 +2,4 @@
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/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/
+arch/_ARCH_/lib/modules/fglrx/build_mod/libfglrx_ip.a usr/src/fglrx-_VERSION_/
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-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.lintian-overrides.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,10 +1,5 @@
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
+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
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst 2011-08-31 23:37:38 UTC (rev 766)
@@ -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/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst.in (from rev 765, fglrx-driver/trunk/debian/fglrx-modules-dkms.postinst.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.postinst.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -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/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm 2011-08-31 23:37:38 UTC (rev 766)
@@ -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/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm.in (from rev 765, fglrx-driver/trunk/debian/fglrx-modules-dkms.prerm.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/fglrx-modules-dkms.prerm.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,6 @@
+#!/bin/sh
+set -e
+
+dkms remove -m fglrx -v _VERSION_ --all || true
+
+#DEBHELPER#
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.install (from rev 765, fglrx-driver/trunk/debian/libfglrx-ia32.install)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.install (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.install 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,9 @@
+arch/x86/usr/lib/libatiuki.so.1.0 usr/lib32/
+arch/x86/usr/lib/libaticaldd.so usr/lib32/
+arch/x86/usr/lib/libaticalcl.so usr/lib32/
+arch/x86/usr/lib/libaticalrt.so usr/lib32/
+arch/x86/usr/X11R6/lib/libatiadlxx.so usr/lib32/
+arch/x86/usr/X11R6/lib/libXvBAW.so.1.0 usr/lib32/
+arch/x86/usr/X11R6/lib/libAMDXvBA.so.1.0 usr/lib32/
+arch/x86/usr/X11R6/lib/libfglrx_dm.so.1.0 usr/lib32/
+arch/x86/usr/X11R6/lib/modules/dri/fglrx_dri.so usr/lib32/dri/
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.links (from rev 765, fglrx-driver/trunk/debian/libfglrx-ia32.links)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.links (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.links 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,3 @@
+usr/lib32/libAMDXvBA.so.1.0 usr/lib32/libAMDXvBA.so.1
+usr/lib32/libXvBAW.so.1.0 usr/lib32/libXvBAW.so.1
+usr/lib32/libatiuki.so.1.0 usr/lib32/libatiuki.so.1
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.lintian-overrides (from rev 765, fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.lintian-overrides (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx-ia32.lintian-overrides 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,14 @@
+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
+spelling-error-in-binary usr/lib32/libaticalcl.so nam name
+spelling-error-in-binary usr/lib32/libaticalrt.so nam name
+sharedobject-in-library-directory-missing-soname usr/lib32/libatiadlxx.so
+sharedobject-in-library-directory-missing-soname usr/lib32/libaticalcl.so
+sharedobject-in-library-directory-missing-soname usr/lib32/libaticaldd.so
+sharedobject-in-library-directory-missing-soname usr/lib32/libaticalrt.so
+no-symbols-control-file usr/lib32/libXvBAW.so.1.0
+no-symbols-control-file usr/lib32/libatiuki.so.1.0
+no-symbols-control-file usr/lib32/libAMDXvBA.so.1.0
+no-symbols-control-file usr/lib32/libfglrx_dm.so.1.0
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.install.in (from rev 765, fglrx-driver/trunk/debian/libfglrx.install.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.install.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.install.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,9 @@
+arch/_ARCH_/usr/_LIB_/libatiuki.so.1.0 _LIBDIR_/
+arch/_ARCH_/usr/_LIB_/libaticaldd.so _LIBDIR_/
+arch/_ARCH_/usr/_LIB_/libaticalcl.so _LIBDIR_/
+arch/_ARCH_/usr/_LIB_/libaticalrt.so _LIBDIR_/
+arch/_ARCH_/usr/X11R6/_LIB_/libatiadlxx.so _LIBDIR_/
+arch/_ARCH_/usr/X11R6/_LIB_/libXvBAW.so.1.0 _LIBDIR_/
+arch/_ARCH_/usr/X11R6/_LIB_/libAMDXvBA.so.1.0 _LIBDIR_/
+arch/_ARCH_/usr/X11R6/_LIB_/libfglrx_dm.so.1.0 _LIBDIR_/
+arch/_ARCH_/usr/X11R6/_LIB_/modules/dri/fglrx_dri.so _LIBDIR_/dri/
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.links.in (from rev 765, fglrx-driver/trunk/debian/libfglrx.links.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.links.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.links.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,3 @@
+_LIBDIR_/libAMDXvBA.so.1.0 _LIBDIR_/libAMDXvBA.so.1
+_LIBDIR_/libXvBAW.so.1.0 _LIBDIR_/libXvBAW.so.1
+_LIBDIR_/libatiuki.so.1.0 _LIBDIR_/libatiuki.so.1
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.lintian-overrides.in (from rev 765, fglrx-driver/trunk/debian/libfglrx.lintian-overrides.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.lintian-overrides.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libfglrx.lintian-overrides.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,15 @@
+no-upstream-changelog
+package-name-doesnt-match-sonames libAMDXvBA1 libXvBAW1 libatiuki1 libfglrx-dm1.0
+spelling-error-in-binary _LIBDIR_/dri/fglrx_dri.so ouput output
+spelling-error-in-binary _LIBDIR_/dri/fglrx_dri.so UNKOWN UNKNOWN
+[i386]: spelling-error-in-binary _LIBDIR_/dri/fglrx_dri.so nam name
+[i386]: spelling-error-in-binary _LIBDIR_/libaticalcl.so nam name
+[i386]: spelling-error-in-binary _LIBDIR_/libaticalrt.so nam name
+sharedobject-in-library-directory-missing-soname _LIBDIR_/libatiadlxx.so
+sharedobject-in-library-directory-missing-soname _LIBDIR_/libaticalcl.so
+sharedobject-in-library-directory-missing-soname _LIBDIR_/libaticaldd.so
+sharedobject-in-library-directory-missing-soname _LIBDIR_/libaticalrt.so
+no-symbols-control-file _LIBDIR_/libXvBAW.so.1.0
+no-symbols-control-file _LIBDIR_/libatiuki.so.1.0
+no-symbols-control-file _LIBDIR_/libAMDXvBA.so.1.0
+no-symbols-control-file _LIBDIR_/libfglrx_dm.so.1.0
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.install.in (from rev 765, fglrx-driver/trunk/debian/libgl1-fglrx-glx.install.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.install.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.install.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1 @@
+arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.links.in (from rev 765, fglrx-driver/trunk/debian/libgl1-fglrx-glx.links.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.links.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.links.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1 @@
+_LIBDIR_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/libGL.so.1
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.lintian-overrides.in (from rev 765, fglrx-driver/trunk/debian/libgl1-fglrx-glx.lintian-overrides.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.lintian-overrides.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libgl1-fglrx-glx.lintian-overrides.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1,4 @@
+no-upstream-changelog
+shlib-calls-exit _LIBDIR_/fglrx/fglrx-libGL.so.1.2
+[i386]: shlib-with-non-pic-code _LIBDIR_/fglrx/fglrx-libGL.so.1.2
+shlibs-declares-dependency-on-other-package libgl1-mesa-glx | libgl1
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.install (from rev 765, fglrx-driver/trunk/debian/libxvbaw-dev.install)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.install (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.install 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1 @@
+debian/import/amdxvba.h usr/include/
Copied: fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.links.in (from rev 765, fglrx-driver/trunk/debian/libxvbaw-dev.links.in)
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.links.in (rev 0)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/libxvbaw-dev.links.in 2011-08-31 23:37:38 UTC (rev 766)
@@ -0,0 +1 @@
+_LIBDIR_/libXvBAW.so.1 _LIBDIR_/libXvBAW.so
Deleted: fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/patches/04-build-x86_64-on-x86.diff 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,19 +0,0 @@
-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/resurrect-fglrx-source/debian/patches/series
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/patches/series 2011-08-31 23:37:38 UTC (rev 766)
@@ -1,4 +1,3 @@
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/resurrect-fglrx-source/debian/rules
===================================================================
--- fglrx-driver/branches/resurrect-fglrx-source/debian/rules 2011-08-31 23:32:29 UTC (rev 765)
+++ fglrx-driver/branches/resurrect-fglrx-source/debian/rules 2011-08-31 23:37:38 UTC (rev 766)
@@ -16,11 +16,19 @@
lib=lib
endif
+MULTIARCH ?= yes
+libdir = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+
generated=$(shell ls debian/*.in | sed s/\.in$$//g)
+generated += fglrx.ids
%: %.in
- sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g \
- -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+ sed -r -e 's%_VERSION_%$(upstream_version)%g' \
+ -e 's%_ARCH_%$(arch)%g' \
+ -e 's%_XPIC_%$(xpic)%g' \
+ -e 's%_LIB_%$(lib)%g' \
+ -e 's%_LIBDIR_%$(libdir)%g' \
+ < $< > $@
%:
dh $@
@@ -42,6 +50,10 @@
diff -w copyright.tmp LICENSE.tmp
rm -f copyright.tmp LICENSE.tmp
+fglrx.ids: common/lib/modules/fglrx/build_mod/fglrxko_pci_ids.h
+ cat $< | sed -n -r -e '/FGL_ASIC_ID/ s/.*\(0x(.{4})\).*/1002\1/p' \
+ | tr a-z A-Z | sort -u > $@
+
override_dh_auto_configure: $(generated) compare-copyright-license
cd debian/man && ./autogen.sh --copy
cd debian/man && ./configure --prefix=/usr --mandir=/usr/share/man \
@@ -65,9 +77,9 @@
# Redirect shlibs for libGL.so.1 to libgl1-mesa-glx | libgl1.
override_dh_makeshlibs:
dh_makeshlibs
- test ! -d debian/fglrx-glx || \
+ test ! -d debian/libgl1-fglrx-glx || \
sed -i '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' \
- debian/fglrx-glx/DEBIAN/shlibs
+ debian/libgl1-fglrx-glx/DEBIAN/shlibs
test ! -d debian/fglrx-glx-ia32 || \
sed -i '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' \
debian/fglrx-glx-ia32/DEBIAN/shlibs
@@ -77,6 +89,16 @@
############################################################################
+prepare-squeeze-backport:
+ echo 8 > debian/compat
+ sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules
+ sed -i -e 's/debhelper (>= .*)/debhelper (>= 8.1.0~)/' \
+ -e '/^Multi-Arch:/ d' debian/control
+ debchange --bpo "Disable multiarch build."
+ debchange "Reduce Build-Depends: debhelper and compat level to 8."
+
+############################################################################
+
ifneq (,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
NEW_UPSTREAM_VERSION=$(patsubst VER=%,%,$(filter VER=%,$(DEB_BUILD_OPTIONS)))
INSTALLER=ati-driver-installer-$(NEW_UPSTREAM_VERSION)-x86.x86_64.run
More information about the Pkg-fglrx-devel
mailing list