[Pkg-fglrx-devel] r986 - fglrx-driver/trunk/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Wed Jul 18 18:34:23 UTC 2012
Author: anbe-guest
Date: 2012-07-18 18:34:23 +0000 (Wed, 18 Jul 2012)
New Revision: 986
Removed:
fglrx-driver/trunk/debian/fglrx-glx-ia32.install
fglrx-driver/trunk/debian/fglrx-glx-ia32.links
fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
fglrx-driver/trunk/debian/libfglrx-ia32.install
fglrx-driver/trunk/debian/libfglrx-ia32.links
fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
fglrx-driver/trunk/debian/rules
Log:
make *-ia32 transitional packages with multiarch instructions
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/changelog 2012-07-18 18:34:23 UTC (rev 986)
@@ -18,6 +18,9 @@
of the acpi scripts in 1:12-1-2.
* Rename libxvbaw1 to libfglrx-amdxvba1, provide libxvbaw1 as a virtual
package.
+ * Convert *-ia32 into transitional packages due to ia32-libs transition:
+ - Add multiarch instructions to long descriptions.
+ - $pkg-ia32 Recommends: $pkg-i386
[ Patrick Matthäi ]
* Use again the signature file from fglrx itself. The imported one is only
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/control 2012-07-18 18:34:23 UTC (rev 986)
@@ -10,7 +10,6 @@
Build-Depends:
debhelper (>= 9),
bzip2,
- ia32-libs [amd64],
libxrandr2,
libxext6,
libgl1-mesa-glx,
@@ -212,47 +211,43 @@
It can be safely removed from the system once nothing depends on it.
Package: fglrx-glx-ia32
+Section: non-free/oldlibs
Architecture: amd64
Pre-Depends:
libc6-i386 (>= 2.9-18),
Depends:
${misc:Depends},
${shlibs:Depends},
- lib${fglrx}-ia32 (= ${binary:Version}),
- ${fglrx}-driver (= ${binary:Version}),
Conflicts:
nvidia-glx-ia32,
ia32-fglrx-glx,
-Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver (32-bit)${fglrx:VariantDescSuffix}
- ${fglrx:Info}
+Description: please switch to multiarch libgl1-fglrx-glx:i386
+ This is an empty transitional package to aid switching to multiarch.
.
- .
- ${fglrx:Models}
- .
- This package provides the proprietary 32-bit libGL shipped by ATI/AMD for
- emulated userspace on amd64.
+ Run the following commands to install the multiarch library:
+ * dpkg --add-architecture i386 ; apt-get update
+ * apt-get install libgl1-fglrx-glx:i386
Package: libfglrx-ia32
-Section: non-free/libs
+Section: non-free/oldlibs
Architecture: amd64
Pre-Depends:
libc6-i386 (>= 2.9-18),
Depends:
${shlibs:Depends},
${misc:Depends},
+Recommends:
+ libgl1-${fglrx}-glx-i386,
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)${fglrx:VariantDescSuffix}
- ${fglrx:Info}
+Description: please switch to multiarch libfglrx:i386
+ This is an empty transitional package to aid switching to multiarch.
.
- .
- ${fglrx:Models}
- .
- This package contains the 32-bit runtime libraries.
- The proprietary libGL library is shipped in the
- ${fglrx}-glx-ia32 package.
+ Run the following commands to install the multiarch library:
+ * dpkg --add-architecture i386 ; apt-get update
+ * apt-get install libfglrx:i386
Package: fglrx-modules-dkms
Section: non-free/kernel
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.install 2012-07-18 18:34:23 UTC (rev 986)
@@ -1 +0,0 @@
-arch/x86/usr/X11R6/lib/fglrx/fglrx-libGL.so.1.2 usr/lib32
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.links 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.links 2012-07-18 18:34:23 UTC (rev 986)
@@ -1 +0,0 @@
-usr/lib32/fglrx-libGL.so.1.2 usr/lib32/libGL.so.1
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.lintian-overrides 2012-07-18 18:34:23 UTC (rev 986)
@@ -1,8 +0,0 @@
-no-upstream-changelog
-hardening-no-fortify-functions
-hardening-no-relro
-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)
Modified: fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst 2012-07-18 18:34:23 UTC (rev 986)
@@ -20,6 +20,10 @@
fi
# </target: squeeze-backports>
+ 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
#DEBHELPER#
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postrm 2012-07-18 18:34:23 UTC (rev 986)
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-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
-
-fi
-
-#DEBHELPER#
Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.preinst 2012-07-18 18:34:23 UTC (rev 986)
@@ -1,12 +0,0 @@
-#!/bin/sh
-set -e
-
-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
-
-fi
-
-#DEBHELPER#
Deleted: fglrx-driver/trunk/debian/libfglrx-ia32.install
===================================================================
--- fglrx-driver/trunk/debian/libfglrx-ia32.install 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/libfglrx-ia32.install 2012-07-18 18:34:23 UTC (rev 986)
@@ -1,9 +0,0 @@
-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/
Deleted: fglrx-driver/trunk/debian/libfglrx-ia32.links
===================================================================
--- fglrx-driver/trunk/debian/libfglrx-ia32.links 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/libfglrx-ia32.links 2012-07-18 18:34:23 UTC (rev 986)
@@ -1,3 +0,0 @@
-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
Deleted: fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/libfglrx-ia32.lintian-overrides 2012-07-18 18:34:23 UTC (rev 986)
@@ -1,16 +0,0 @@
-no-upstream-changelog
-hardening-no-fortify-functions
-hardening-no-relro
-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
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2012-07-18 17:35:09 UTC (rev 985)
+++ fglrx-driver/trunk/debian/rules 2012-07-18 18:34:23 UTC (rev 986)
@@ -128,10 +128,6 @@
rpl -e '/usr/X11R6/lib/modules/dri\0' \
'$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
debian/libgl1-$(fglrx)-glx/$(libdir)/fglrx/fglrx-libGL.so.1.2
- test ! -f debian/$(fglrx)-glx-ia32/usr/lib32/fglrx-libGL.so.1.2 || \
- rpl -e '/usr/X11R6/lib/modules/dri\0' \
- '$${ORIGIN}/dri\0!!!!!!!!!!!!\0' \
- debian/$(fglrx)-glx-ia32/usr/lib32/fglrx-libGL.so.1.2
rpl -e '/usr/lib64/fglrx' \
'/usr/lib///fglrx' \
$(badlib64files)
@@ -159,9 +155,6 @@
test ! -f debian/libgl1-$(fglrx)-glx/DEBIAN/shlibs || \
sed -i '/^libGL 1 /s/.*/libGL 1 libgl1-mesa-glx | libgl1/' \
debian/libgl1-$(fglrx)-glx/DEBIAN/shlibs
- test ! -f debian/$(fglrx)-glx-ia32/DEBIAN/shlibs || \
- sed -i '/^libGL 1 /s/.*/libGL 1 ia32-libs (>= 20090804)/' \
- debian/$(fglrx)-glx-ia32/DEBIAN/shlibs
test ! -f debian/lib$(fglrx)-amdxvba1/DEBIAN/shlibs || \
sed -i '/^libxvbaw 1 /s/.*/libxvbaw 1 libxvbaw1/' \
debian/lib$(fglrx)-amdxvba1/DEBIAN/shlibs
More information about the Pkg-fglrx-devel
mailing list