[Pkg-fglrx-devel] r762 - fglrx-driver/trunk/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Wed Aug 31 22:54:07 UTC 2011
Author: anbe-guest
Date: 2011-08-31 22:54:07 +0000 (Wed, 31 Aug 2011)
New Revision: 762
Added:
fglrx-driver/trunk/debian/libgl1-fglrx-glx.install.in
fglrx-driver/trunk/debian/libgl1-fglrx-glx.links.in
fglrx-driver/trunk/debian/libgl1-fglrx-glx.lintian-overrides.in
Removed:
fglrx-driver/trunk/debian/fglrx-glx.install.in
fglrx-driver/trunk/debian/fglrx-glx.links
fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides
Modified:
fglrx-driver/trunk/debian/changelog
fglrx-driver/trunk/debian/control
fglrx-driver/trunk/debian/rules
Log:
Rename package fglrx-glx to libgl1-fglrx-glx. Keep old name as transitional package.
Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog 2011-08-31 22:49:25 UTC (rev 761)
+++ fglrx-driver/trunk/debian/changelog 2011-08-31 22:54:07 UTC (rev 762)
@@ -17,8 +17,12 @@
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.
* Prepare support for squeeze-backports:
- Add instructions for squeeze-backports to README.source and a
Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control 2011-08-31 22:49:25 UTC (rev 761)
+++ fglrx-driver/trunk/debian/control 2011-08-31 22:54:07 UTC (rev 762)
@@ -36,12 +36,14 @@
glx-alternative-fglrx (>= 0.1.92)
Recommends:
fglrx-modules-dkms (= ${binary:Version}),
- fglrx-glx,
+ libgl1-fglrx-glx (= ${binary:Version}),
fglrx-glx-ia32 [amd64],
fglrx-atieventsd
Provides: xorg-driver-video
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),
@@ -58,7 +60,7 @@
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.
@@ -106,8 +108,12 @@
.
This package contains the development files.
-Package: fglrx-glx
+Package: libgl1-fglrx-glx
+Section: non-free/libs
Architecture: i386 amd64
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends},
Depends:
${misc:Depends},
${shlibs:Depends},
@@ -115,8 +121,11 @@
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.
.
@@ -125,6 +134,16 @@
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
Depends:
Deleted: fglrx-driver/trunk/debian/fglrx-glx.install.in
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.install.in 2011-08-31 22:49:25 UTC (rev 761)
+++ fglrx-driver/trunk/debian/fglrx-glx.install.in 2011-08-31 22:54:07 UTC (rev 762)
@@ -1 +0,0 @@
-arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 usr/lib/fglrx
Deleted: fglrx-driver/trunk/debian/fglrx-glx.links
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.links 2011-08-31 22:49:25 UTC (rev 761)
+++ fglrx-driver/trunk/debian/fglrx-glx.links 2011-08-31 22:54:07 UTC (rev 762)
@@ -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/trunk/debian/fglrx-glx.lintian-overrides
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides 2011-08-31 22:49:25 UTC (rev 761)
+++ fglrx-driver/trunk/debian/fglrx-glx.lintian-overrides 2011-08-31 22:54:07 UTC (rev 762)
@@ -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
Copied: fglrx-driver/trunk/debian/libgl1-fglrx-glx.install.in (from rev 757, fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.install.in)
===================================================================
--- fglrx-driver/trunk/debian/libgl1-fglrx-glx.install.in (rev 0)
+++ fglrx-driver/trunk/debian/libgl1-fglrx-glx.install.in 2011-08-31 22:54:07 UTC (rev 762)
@@ -0,0 +1 @@
+arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/
Copied: fglrx-driver/trunk/debian/libgl1-fglrx-glx.links.in (from rev 757, fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.links.in)
===================================================================
--- fglrx-driver/trunk/debian/libgl1-fglrx-glx.links.in (rev 0)
+++ fglrx-driver/trunk/debian/libgl1-fglrx-glx.links.in 2011-08-31 22:54:07 UTC (rev 762)
@@ -0,0 +1 @@
+_LIBDIR_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/libGL.so.1
Copied: fglrx-driver/trunk/debian/libgl1-fglrx-glx.lintian-overrides.in (from rev 757, fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.lintian-overrides.in)
===================================================================
--- fglrx-driver/trunk/debian/libgl1-fglrx-glx.lintian-overrides.in (rev 0)
+++ fglrx-driver/trunk/debian/libgl1-fglrx-glx.lintian-overrides.in 2011-08-31 22:54:07 UTC (rev 762)
@@ -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
Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules 2011-08-31 22:49:25 UTC (rev 761)
+++ fglrx-driver/trunk/debian/rules 2011-08-31 22:54:07 UTC (rev 762)
@@ -73,9 +73,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
More information about the Pkg-fglrx-devel
mailing list