[Pkg-fglrx-devel] r1205 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe
Date: 2013-05-05 15:07:47 +0000 (Sun, 05 May 2013)
New Revision: 1205

Removed:
   fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/control
Log:
drop transitional packages

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2013-05-05 14:58:14 UTC (rev 1204)
+++ fglrx-driver/trunk/debian/changelog	2013-05-05 15:07:47 UTC (rev 1205)
@@ -2,6 +2,7 @@
 
   * Recommend opencl-icd again as preferred alternative.  (Reopens: #695884)
   * Bump glx-alternative-fglrx dependency.
+  * Drop transitional packages.
 
  -- Andreas Beckmann <anbe at debian.org>  Sun, 05 May 2013 16:34:38 +0200
 

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2013-05-05 14:58:14 UTC (rev 1204)
+++ fglrx-driver/trunk/debian/control	2013-05-05 15:07:47 UTC (rev 1205)
@@ -44,7 +44,6 @@
  ${fglrx}-modules-dkms (= ${binary:Version}) | fglrx-kernel-${fglrx:Version},
  libgl1-${fglrx}-glx (= ${binary:Version}),
  libgl1-${fglrx}-glx-i386 [amd64],
- ${fglrx}-glx-ia32 [amd64],
  ${fglrx}-atieventsd,
 Suggests:
  ${fglrx}-control,
@@ -97,12 +96,13 @@
  libfglrx-virtual,
 Conflicts:
  libfglrx-virtual,
- libfglrx-ia32 [i386],
+ libfglrx-ia32,
 Breaks:
  fglrx-driver (<< 1:11-8-2),
 Replaces:
  libfglrx-virtual,
  fglrx-driver (<< 1:11-8-2),
+ libfglrx-ia32,
 Description: non-free ATI/AMD RadeonHD display driver (runtime libraries)${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
@@ -188,7 +188,8 @@
  libgl1-${fglrx}-glx-i386 [i386],
 Conflicts:
  libgl1-fglrx-glx-virtual,
- fglrx-glx-ia32 [i386],
+ fglrx-glx,
+ fglrx-glx-ia32,
 Breaks:
  fglrx-glx (<< 1:11-8-2),
  nvidia-glx (<< 275.09.07-3),
@@ -197,6 +198,8 @@
 Replaces:
  libgl1-fglrx-glx-virtual,
  fglrx-glx (<< 1:11-8-2),
+ fglrx-glx,
+ fglrx-glx-ia32,
 Description: proprietary libGL for the non-free ATI/AMD RadeonHD display driver${fglrx:VariantDescSuffix}
  ${fglrx:Info}
  .
@@ -205,59 +208,6 @@
  .
  This package provides the proprietary libGL shipped by ATI/AMD.
 
-Package: fglrx-glx
-Section: non-free/oldlibs
-Architecture: i386 amd64
-Pre-Depends:
- dpkg (>= 1.15.7.2~),
-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
-Section: non-free/oldlibs
-Architecture: amd64
-Pre-Depends:
- libc6-i386 (>= 2.9-18),
- dpkg (>= 1.15.7.2~),
-Depends:
- ${misc:Depends},
- ${shlibs:Depends},
-Conflicts:
- nvidia-glx-ia32,
- ia32-fglrx-glx,
-Description: please switch to multiarch libgl1-fglrx-glx:i386
- This is an empty transitional package to aid switching to multiarch.
- .
- 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/oldlibs
-Architecture: amd64
-Pre-Depends:
- libc6-i386 (>= 2.9-18),
- dpkg (>= 1.15.7.2~),
-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: please switch to multiarch libfglrx:i386
- This is an empty transitional package to aid switching to multiarch.
- .
- 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
 Architecture: i386 amd64

Deleted: fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst
===================================================================
--- fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst	2013-05-05 14:58:14 UTC (rev 1204)
+++ fglrx-driver/trunk/debian/fglrx-glx-ia32.postinst	2013-05-05 15:07:47 UTC (rev 1205)
@@ -1,29 +0,0 @@
-#!/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>
-
-	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#