[Pkg-fglrx-devel] r707 - fglrx-driver/branches/multiarch/debian
Andreas Beckmann
anbe-guest at alioth.debian.org
Tue Aug 9 12:54:58 UTC 2011
Author: anbe-guest
Date: 2011-08-09 12:54:58 +0000 (Tue, 09 Aug 2011)
New Revision: 707
Added:
fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.install.in
fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.links.in
fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.lintian-overrides.in
Removed:
fglrx-driver/branches/multiarch/debian/fglrx-glx.install.in
fglrx-driver/branches/multiarch/debian/fglrx-glx.links.in
fglrx-driver/branches/multiarch/debian/fglrx-glx.lintian-overrides.in
Modified:
fglrx-driver/branches/multiarch/debian/changelog
fglrx-driver/branches/multiarch/debian/control
fglrx-driver/branches/multiarch/debian/rules
Log:
Rename package fglrx-glx to libgl1-fglrx-glx.
Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog 2011-08-09 12:31:33 UTC (rev 706)
+++ fglrx-driver/branches/multiarch/debian/changelog 2011-08-09 12:54:58 UTC (rev 707)
@@ -15,6 +15,8 @@
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.
* Add instructions for squeeze-backports to README.source and a
prepare-squeeze-backport target to debian/rules that performs the
necessary changes.
Modified: fglrx-driver/branches/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control 2011-08-09 12:31:33 UTC (rev 706)
+++ fglrx-driver/branches/multiarch/debian/control 2011-08-09 12:54:58 UTC (rev 707)
@@ -36,7 +36,7 @@
glx-alternative-fglrx (>= 0.1.2)
Recommends:
fglrx-modules-dkms (= ${binary:Version}),
- fglrx-glx,
+ libgl1-fglrx-glx,
fglrx-glx-ia32 [amd64],
fglrx-atieventsd
Provides: xorg-driver-video
@@ -55,7 +55,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.
@@ -101,7 +101,8 @@
.
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:
@@ -111,8 +112,11 @@
${shlibs:Depends},
glx-alternative-fglrx (>= 0.1.2)
Breaks:
+ fglrx-glx (<< ${fglrx:multiarch}),
nvidia-glx (<< 275.09.07-3),
libgl1-nvidia-glx (<< 275.09.07-3)
+Replaces:
+ fglrx-glx (<< ${fglrx:multiarch}),
Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver
Display driver for the ATI/AMD RadeonHD and FireGL graphics cards.
.
@@ -121,6 +125,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/branches/multiarch/debian/fglrx-glx.install.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx.install.in 2011-08-09 12:31:33 UTC (rev 706)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx.install.in 2011-08-09 12:54:58 UTC (rev 707)
@@ -1 +0,0 @@
-arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/
Deleted: fglrx-driver/branches/multiarch/debian/fglrx-glx.links.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx.links.in 2011-08-09 12:31:33 UTC (rev 706)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx.links.in 2011-08-09 12:54:58 UTC (rev 707)
@@ -1 +0,0 @@
-_LIBDIR_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/libGL.so.1
Deleted: fglrx-driver/branches/multiarch/debian/fglrx-glx.lintian-overrides.in
===================================================================
--- fglrx-driver/branches/multiarch/debian/fglrx-glx.lintian-overrides.in 2011-08-09 12:31:33 UTC (rev 706)
+++ fglrx-driver/branches/multiarch/debian/fglrx-glx.lintian-overrides.in 2011-08-09 12:54:58 UTC (rev 707)
@@ -1,3 +0,0 @@
-no-upstream-changelog
-[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/multiarch/debian/libgl1-fglrx-glx.install.in (from rev 706, fglrx-driver/branches/multiarch/debian/fglrx-glx.install.in)
===================================================================
--- fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.install.in (rev 0)
+++ fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.install.in 2011-08-09 12:54:58 UTC (rev 707)
@@ -0,0 +1 @@
+arch/_ARCH_/usr/X11R6/_LIB_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/
Copied: fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.links.in (from rev 706, fglrx-driver/branches/multiarch/debian/fglrx-glx.links.in)
===================================================================
--- fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.links.in (rev 0)
+++ fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.links.in 2011-08-09 12:54:58 UTC (rev 707)
@@ -0,0 +1 @@
+_LIBDIR_/fglrx/fglrx-libGL.so.1.2 _LIBDIR_/fglrx/libGL.so.1
Copied: fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.lintian-overrides.in (from rev 706, fglrx-driver/branches/multiarch/debian/fglrx-glx.lintian-overrides.in)
===================================================================
--- fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.lintian-overrides.in (rev 0)
+++ fglrx-driver/branches/multiarch/debian/libgl1-fglrx-glx.lintian-overrides.in 2011-08-09 12:54:58 UTC (rev 707)
@@ -0,0 +1,3 @@
+no-upstream-changelog
+[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/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules 2011-08-09 12:31:33 UTC (rev 706)
+++ fglrx-driver/branches/multiarch/debian/rules 2011-08-09 12:54:58 UTC (rev 707)
@@ -71,9 +71,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